Projects/laydi
Projects
/
laydi
Archived
7
0
Fork 0

whitespace

This commit is contained in:
Arnar Flatberg 2007-03-14 16:30:18 +00:00
parent 818dc0b2b0
commit 22f6e3284c
1 changed files with 7 additions and 4 deletions

View File

@ -21,8 +21,8 @@ import blmplots
class Model(Function): class Model(Function):
"""Base class of bilinear models. """Base class of bilinear models.
""" """
def __init__(self,id='johndoe',name='JohnDoe'): def __init__(self, id='johndoe', name='JohnDoe'):
Function.__init__(self,id,name) Function.__init__(self, id, name)
self.name = name self.name = name
self._options = None self._options = None
self._data = {} self._data = {}
@ -39,8 +39,8 @@ class Model(Function):
class PCA(Model): class PCA(Model):
def __init__(self,id='pca',name='PCA'): def __init__(self, id='pca', name='PCA'):
Model.__init__(self,id,name) Model.__init__(self, id, name)
self._options = PcaOptions() self._options = PcaOptions()
def validation(self, amax, cv_val_sets, pert_val_sets, cv_val_method, pert_val_method): def validation(self, amax, cv_val_sets, pert_val_sets, cv_val_method, pert_val_method):
@ -63,6 +63,7 @@ class PCA(Model):
if self._options['auto_aopt']: if self._options['auto_aopt']:
logger.log("notice", "Auto aopt: " + str(aopt)) logger.log("notice", "Auto aopt: " + str(aopt))
self._options['aopt'] = aopt self._options['aopt'] = aopt
if aopt==1: if aopt==1:
logger.log('notice', 'Aopt at first component!') logger.log('notice', 'Aopt at first component!')
@ -70,6 +71,8 @@ class PCA(Model):
crot, strict, cov_center ): crot, strict, cov_center ):
"""Returns a confidence measure for model parameters. """Returns a confidence measure for model parameters.
Based on aopt. Based on aopt.
Added model parts: p_tsq
""" """
if aopt<2: if aopt<2:
aopt = 2 aopt = 2