Author: bugman
Date: Fri Mar 28 21:55:13 2014
New Revision: 22607
URL: http://svn.gna.org/viewcvs/relax?rev=22607&view=rev
Log:
Merged revisions 22606 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22606 | bugman | 2014-03-28 21:45:33 +0100 (Fri, 28 Mar 2014) | 5 lines
Bug fix for the specific analysis API objects for the recent conversion to
singletons.
The class 'instance' variable needs to be set separately in each class for
reliable behaviour.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/specific_analyses/consistency_tests/api.py
branches/double_rotor/specific_analyses/jw_mapping/api.py
branches/double_rotor/specific_analyses/model_free/api.py
branches/double_rotor/specific_analyses/n_state_model/api.py
branches/double_rotor/specific_analyses/noe/api.py
branches/double_rotor/specific_analyses/relax_disp/api.py
branches/double_rotor/specific_analyses/relax_fit/api.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 28 21:55:13 2014
@@ -1 +1 @@
-/trunk:1-22604
+/trunk:1-22606
Modified: branches/double_rotor/specific_analyses/consistency_tests/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/consistency_tests/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/consistency_tests/api.py
(original)
+++ branches/double_rotor/specific_analyses/consistency_tests/api.py Fri
Mar 28 21:55:13 2014
@@ -41,6 +41,9 @@
class Consistency_tests(API_base, API_common):
"""Class containing functions specific to consistency testing."""
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
+
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
Modified: branches/double_rotor/specific_analyses/jw_mapping/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/jw_mapping/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/jw_mapping/api.py (original)
+++ branches/double_rotor/specific_analyses/jw_mapping/api.py Fri Mar 28
21:55:13 2014
@@ -40,6 +40,9 @@
class Jw_mapping(API_base, API_common):
"""Class containing functions specific to reduced spectral density
mapping."""
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
+
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
Modified: branches/double_rotor/specific_analyses/model_free/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/model_free/api.py (original)
+++ branches/double_rotor/specific_analyses/model_free/api.py Fri Mar 28
21:55:13 2014
@@ -62,6 +62,9 @@
class Model_free(API_base, API_common):
"""Parent class containing all the model-free specific functions."""
+
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
Modified: branches/double_rotor/specific_analyses/n_state_model/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/n_state_model/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/n_state_model/api.py
(original)
+++ branches/double_rotor/specific_analyses/n_state_model/api.py Fri
Mar 28 21:55:13 2014
@@ -51,6 +51,9 @@
class N_state_model(API_base, API_common):
"""Class containing functions for the N-state model."""
+
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
Modified: branches/double_rotor/specific_analyses/noe/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/noe/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/noe/api.py (original)
+++ branches/double_rotor/specific_analyses/noe/api.py Fri Mar 28 21:55:13
2014
@@ -37,6 +37,9 @@
class Noe(API_base, API_common):
"""Specific analysis API class for the steady-state heternuclear NOE
analysis."""
+
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
Modified: branches/double_rotor/specific_analyses/relax_disp/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/relax_disp/api.py (original)
+++ branches/double_rotor/specific_analyses/relax_disp/api.py Fri Mar 28
21:55:13 2014
@@ -46,6 +46,9 @@
class Relax_disp(API_base, API_common):
"""Class containing functions for relaxation dispersion curve fitting."""
+
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
Modified: branches/double_rotor/specific_analyses/relax_fit/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_fit/api.py?rev=22607&r1=22606&r2=22607&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/relax_fit/api.py (original)
+++ branches/double_rotor/specific_analyses/relax_fit/api.py Fri Mar 28
21:55:13 2014
@@ -47,6 +47,9 @@
class Relax_fit(API_base, API_common):
"""Class containing functions for relaxation curve fitting."""
+
+ # Class variable for storing the class instance (for the singleton
design pattern).
+ instance = None
def __init__(self):
"""Initialise the class by placing API_common methods into the
API."""
r22607 - in /branches/double_rotor: ./ specific_analyses/consistency_tests/ specific_analyses/jw_mapping/ specific_analyses/...