Author: bugman
Date: Sun Apr 16 15:47:54 2006
New Revision: 2470
URL: http://svn.gna.org/viewcvs/relax?rev=2470&view=rev
Log:
Added a test of the user function 'relax_data.read()' to the test suite.
Added:
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out
1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out
Modified:
1.2/test_suite/model_free.py
1.2/test_suite/test_suite.py
Added: 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out?rev=2470&view=auto
==============================================================================
--- 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out
(added)
+++ 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.500.out Sun
Apr 16 15:47:54 2006
@@ -1,0 +1,2 @@
+Num Name Value Error
+1 ALA 0.78105687098694854 0.050000000000000003
Added: 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out?rev=2470&view=auto
==============================================================================
--- 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out
(added)
+++ 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/noe.600.out Sun
Apr 16 15:47:54 2006
@@ -1,0 +1,2 @@
+Num Name Value Error
+1 ALA 0.80408892327499626 0.040000000000000001
Added: 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out?rev=2470&view=auto
==============================================================================
--- 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out
(added)
+++ 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.500.out Sun
Apr 16 15:47:54 2006
@@ -1,0 +1,2 @@
+Num Name Value Error
+1 ALA 1.7836568628249123 0.035673137256498247
Added: 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out?rev=2470&view=auto
==============================================================================
--- 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out
(added)
+++ 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r1.600.out Sun
Apr 16 15:47:54 2006
@@ -1,0 +1,2 @@
+Num Name Value Error
+1 ALA 1.3874977659397683 0.027749955318795365
Added: 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out?rev=2470&view=auto
==============================================================================
--- 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out
(added)
+++ 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.500.out Sun
Apr 16 15:47:54 2006
@@ -1,0 +1,2 @@
+Num Name Value Error
+1 ALA 13.40684281033935 0.26813685620678701
Added: 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out?rev=2470&view=auto
==============================================================================
--- 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out
(added)
+++ 1.2/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149/r2.600.out Sun
Apr 16 15:47:54 2006
@@ -1,0 +1,2 @@
+Num Name Value Error
+1 ALA 14.239506503694924 0.28479013007389847
Modified: 1.2/test_suite/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/model_free.py?rev=2470&r1=2469&r2=2470&view=diff
==============================================================================
--- 1.2/test_suite/model_free.py (original)
+++ 1.2/test_suite/model_free.py Sun Apr 16 15:47:54 2006
@@ -29,21 +29,60 @@
self.relax = relax
+ # Relaxation data reading test.
+ if test_name == 'read relaxation data':
+ # The name of the test.
+ self.name = "The user function relax_data.read()"
+
+ # The test.
+ self.test = self.read_relax_data
+
# Results reading test.
- if test_name == 'read':
+ if test_name == 'read results':
# The name of the test.
self.name = "the user function results.read()"
# The test.
- self.test = self.read
-
-
- def read(self, run):
- """The results reading test."""
+ self.test = self.read_results
+
+
+ def read_relax_data(self, run):
+ """The relaxation data reading test."""
# Arguments.
self.run = run
+ # Create the run.
+ self.relax.generic.runs.create(self.run, 'mf')
+
+ # Path of the files.
+ path = sys.path[-1] +
'/test_suite/data/model_free/S2_0.970_te_2048_Rex_0.149'
+
+ # Read the sequence.
+ self.relax.interpreter._Sequence.read(self.run, file='noe.500.out',
dir=path)
+
+ # Read the relaxation data.
+ self.relax.interpreter._Relax_data.read(self.run, 'R1', '600', 600.0
* 1e6, 'r1.600.out', dir=path)
+
+ # Test the data.
+ if self.relax.data.res[self.run][0].relax_data[0] !=
1.3874977659397683:
+ print "The relaxation data does not match."
+ return
+
+ # Test the error.
+ if self.relax.data.res[self.run][0].relax_error[0] !=
0.027749955318795365:
+ print "The relaxation error does not match."
+ return
+
+ return 1
+
+
+ def read_results(self, run):
+ """The results reading test."""
+
+ # Arguments.
+ self.run = run
+
# Load the original state.
self.relax.interpreter._State.load(file='orig_state',
dir=sys.path[-1] + '/test_suite/data/model_free')
@@ -52,19 +91,6 @@
# Read the results.
self.relax.interpreter._Results.read(self.run, dir=sys.path[-1] +
'/test_suite/data/model_free')
-
- # Success.
- return self.test_integrity()
-
-
- def print_error(self, name):
- """Function for printing a residue mismatch."""
-
- print "The " + name + " of " + self.orig_res + " and " +
self.new_res + " do not match."
-
-
- def test_integrity(self):
- """Function for testing the integrity of the model-free data."""
# Print out.
print "\nTesting the integrity of the loaded data.\n"
@@ -223,7 +249,12 @@
self.print_error('relaxation data errors')
return
-
# Success.
print "The data structures have been created successfully."
return 1
+
+
+ def print_error(self, name):
+ """Function for printing a residue mismatch."""
+
+ print "The " + name + " of " + self.orig_res + " and " +
self.new_res + " do not match."
Modified: 1.2/test_suite/test_suite.py
URL:
http://svn.gna.org/viewcvs/relax/1.2/test_suite/test_suite.py?rev=2470&r1=2469&r2=2470&view=diff
==============================================================================
--- 1.2/test_suite/test_suite.py (original)
+++ 1.2/test_suite/test_suite.py Sun Apr 16 15:47:54 2006
@@ -133,7 +133,8 @@
self.mf_test_array = []
# User function results.read() test.
- self.mf_test_array.append(Mf(self.relax, 'read'))
+ self.mf_test_array.append(Mf(self.relax, 'read relaxation data'))
+ self.mf_test_array.append(Mf(self.relax, 'read results'))
# Execute the tests.
self.exec_tests(self.mf_test_array)
r2470 - in /1.2/test_suite: ./ data/model_free/S2_0.970_te_2048_Rex_0.149/