[prev in list] [next in list] [prev in thread] [next in thread]
List: relax-commits
Subject: r2582 - in /1.3: generic_fns/model_selection.py sconstruct specific_fns/model_free.py
From: edward () domain ! hid
Date: 2006-09-30 4:20:18
Message-ID: E1GTWKp-0000qh-RN () subversion ! gna ! org
[Download RAW message or body]
Author: bugman
Date: Sat Sep 30 06:20:04 2006
New Revision: 2582
URL: http://svn.gna.org/viewcvs/relax?rev=2582&view=rev
Log:
Merged r2579 to r2581 of the 1.2 line into the 1.3 line.
The command used was:
svn merge -r2578:2581 svn+ssh://bugman@domain.hid
This includes a fix for bug #7192 and a few other superficial changes.
Modified:
1.3/generic_fns/model_selection.py
1.3/sconstruct
1.3/specific_fns/model_free.py
Modified: 1.3/generic_fns/model_selection.py
URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/model_selection.py?rev=2582&r1=2581&r2=2582&view=diff
==============================================================================
--- 1.3/generic_fns/model_selection.py (original)
+++ 1.3/generic_fns/model_selection.py Sat Sep 30 06:20:04 2006
@@ -148,6 +148,7 @@
if num < self.min_instances:
self.min_instances = num
+ # All other model selection techniques.
else:
# Number of instances.
num = self.count_num_instances[self.runs[i]](self.runs[i])
Modified: 1.3/sconstruct
URL: http://svn.gna.org/viewcvs/relax/1.3/sconstruct?rev=2582&r1=2581&r2=2582&view=diff
==============================================================================
--- 1.3/sconstruct (original)
+++ 1.3/sconstruct Sat Sep 30 06:20:04 2006
@@ -511,18 +511,6 @@
if self.DIST_TYPE == 'tar':
archive.add(name=name, arcname=arcname)
- # Open the file.
- #file = open(path.join(root, files[i]))
-
- # Tar information.
- #tarinfo = archive.gettarinfo(name, arcname)
-
- # Add the file.
- #archive.addfile(tarinfo, file)
-
- # Close the file.
- #file.close()
-
# Close the archive.
archive.close()
Modified: 1.3/specific_fns/model_free.py
URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free.py?rev=2582&r1=2581&r2=2582&view=diff
==============================================================================
--- 1.3/specific_fns/model_free.py (original)
+++ 1.3/specific_fns/model_free.py Sat Sep 30 06:20:04 2006
@@ -1017,8 +1017,9 @@
local_tm = 0
for i in xrange(len(self.relax.data.res[self.run])):
# Skip unselected residues.
- if not self.relax.data.res[self.run][i].select:
- continue
+ # This code causes a bug after model elimination if the model has been \
eliminated (select = 0). + #if not \
self.relax.data.res[self.run][i].select: + # continue
# No params.
if not hasattr(self.relax.data.res[self.run][i], 'params'):
@@ -2588,6 +2589,10 @@
# Other data.
elif self.param_set == 'diff' or self.param_set == 'all':
return 1
+
+ # Should not be here.
+ else:
+ raise RelaxFault
def overfit_deselect(self, run):
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic