r3389 - in /1.3/prompt: interpreter.py molecule.py -- November 03, 2007 - 17:46

Author: bugman
Date: Sat Nov  3 17:46:41 2007
New Revision: 3389

URL: http://svn.gna.org/viewcvs/relax?rev=3389&view=rev
Log:
Added the rudimentary beginnings of the molecule user function class.


Modified:
    1.3/prompt/interpreter.py
    1.3/prompt/molecule.py

Modified: 1.3/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=3389&r1=3388&r2=3389&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Sat Nov  3 17:46:41 2007
@@ -57,6 +57,7 @@
 from jw_mapping import Jw_mapping
 from model_free import Model_free
 from molmol import Molmol
+from molecule import Molecule
 from monte_carlo import Monte_carlo
 from noe import Noe
 from palmer import Palmer
@@ -116,6 +117,7 @@
         self._Jw_mapping = Jw_mapping(relax)
         self._Model_free = Model_free(relax)
         self._Molmol = Molmol(relax)
+        self._Molecule = Molecule(relax)
         self._Monte_carlo = Monte_carlo(relax)
         self._Noe = Noe(relax)
         self._Palmer = Palmer(relax)
@@ -175,6 +177,7 @@
         jw_mapping = self._Jw_mapping
         model_free = self._Model_free
         molmol = self._Molmol
+        molecule = self._Molecule
         monte_carlo = self._Monte_carlo
         noe = self._Noe
         palmer = self._Palmer

Modified: 1.3/prompt/molecule.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/molecule.py?rev=3389&r1=3388&r2=3389&view=diff
==============================================================================
--- 1.3/prompt/molecule.py (original)
+++ 1.3/prompt/molecule.py Sat Nov  3 17:46:41 2007
@@ -25,11 +25,11 @@
 
 # relax module imports.
 import help
-from generic_fns import residue
+from generic_fns import molecule
 from relax_errors import RelaxBinError, RelaxIntError, RelaxNoneStrError, 
RelaxStrError
 
 
-class Residue:
+class Molecule:
     def __init__(self, relax):
         # Help.
         self.__relax_help__ = \