Author: bugman Date: Wed Nov 15 09:41:37 2006 New Revision: 2851 URL: http://svn.gna.org/viewcvs/relax?rev=2851&view=rev Log: Renaming of the user function 'init_data()' to 'reset()'. For more details see https://mail.gna.org/public/relax-devel/2006-11/msg00145.html (Message-id: <7f080ed10611102042q55068c56l42aa691764f18d66@xxxxxxxxxxxxxx>). Added: 1.3/prompt/reset.py - copied, changed from r2847, 1.3/prompt/init_data.py Removed: 1.3/prompt/init_data.py Modified: 1.3/prompt/__init__.py 1.3/prompt/interpreter.py Modified: 1.3/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/__init__.py?rev=2851&r1=2850&r2=2851&view=diff ============================================================================== --- 1.3/prompt/__init__.py (original) +++ 1.3/prompt/__init__.py Wed Nov 15 09:41:37 2006 @@ -31,7 +31,6 @@ 'gpl', 'grace', 'help', - 'init_data' 'interpreter', 'jw_mapping', 'minimisation', @@ -45,6 +44,7 @@ 'pymol', 'relax_data', 'relax_fit', + 'reset', 'run', 'rw', 'select', Modified: 1.3/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=2851&r1=2850&r2=2851&view=diff ============================================================================== --- 1.3/prompt/interpreter.py (original) +++ 1.3/prompt/interpreter.py Wed Nov 15 09:41:37 2006 @@ -43,7 +43,7 @@ from eliminate import Eliminate from fix import Fix from gpl import GPL -from init_data import Init_data +from reset import Reset from minimisation import Minimisation from model_selection import Modsel from nuclei import Nuclei @@ -98,7 +98,7 @@ self._Eliminate = Eliminate(relax) self._Fix = Fix(relax) self._GPL = GPL - self._Init_data = Init_data(relax) + self._Reset = Reset(relax) self._Minimisation = Minimisation(relax) self._Modsel = Modsel(relax) self._Nuclei = Nuclei(relax) @@ -158,7 +158,7 @@ eliminate = self._Eliminate.eliminate fix = self._Fix.fix grid_search = self._Minimisation.grid_search - init_data = self._Init_data.init + reset = self._Reset.reset minimise = self._Minimisation.minimise model_selection = self._Modsel.model_selection nuclei = self._Nuclei.nuclei Copied: 1.3/prompt/reset.py (from r2847, 1.3/prompt/init_data.py) URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/reset.py?p2=1.3/prompt/reset.py&p1=1.3/prompt/init_data.py&r1=2847&r2=2851&rev=2851&view=diff ============================================================================== --- 1.3/prompt/init_data.py (original) +++ 1.3/prompt/reset.py Wed Nov 15 09:41:37 2006 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2003, 2004 Edward d'Auvergne # +# Copyright (C) 2003, 2004, 2006 Edward d'Auvergne # # # # This file is part of the program relax. # # # @@ -24,14 +24,18 @@ from data.main import Data -class Init_data: +class Reset: def __init__(self, relax): """Class containing the function for reinitialising self.relax.data""" self.relax = relax - def init(self): - """Function for reinitialising self.relax.data""" + def reset(self): + """Reset relax. + + All of the data stored in self.relax.data will be erased and hence relax will return to its + initial state. + """ self.relax.data = Data()