Author: bugman
Date: Mon Oct 5 09:46:22 2015
New Revision: 27977
URL: http://svn.gna.org/viewcvs/relax?rev=27977&view=rev
Log:
Unused import clean up in the
test_suite/shared_data/curve_fitting/numeric_topology directory.
All the scripts in this directory have been cleaned up to remove unused
imports. In one case,
commented out code was replaced with an 'if 0:' statement to silence the
unused import warnings from
the devel_scripts/find_unused_imports.py script.
Modified:
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian.py
trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian_chi2.py
Modified:
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py?rev=27977&r1=27976&r2=27977&view=diff
==============================================================================
---
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
(original)
+++
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
Mon Oct 5 09:46:22 2015
@@ -188,8 +188,9 @@
t_chi2 = 1e100
else:
t_chi2 = sum((1.0 / errors * (data - back_calc))**2)
- #fix_invalid(t_chi2, copy=False, fill_value=1e100)
- #t_chi2 = nan_to_num( t_chi2 )
+ if 0:
+ fix_invalid(t_chi2, copy=False, fill_value=1e100)
+ t_chi2 = nan_to_num( t_chi2 )
if not isfinite(t_chi2):
t_chi2_2 = nan_to_num( t_chi2 )
#print "Oppps. np=%i, sim=%i, R2=%3.2f, I0=%3.2f %s %s" % (np_i,
sim_j, params[0], params[1], t_chi2, t_chi2_2)
Modified:
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py?rev=27977&r1=27976&r2=27977&view=diff
==============================================================================
---
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
(original)
+++
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
Mon Oct 5 09:46:22 2015
@@ -3,7 +3,7 @@
# Python module imports.
from collections import OrderedDict
-from numpy import array, asarray, diag, ones, std, sqrt
+from numpy import asarray, diag, std, sqrt
from os import getcwd, makedirs, path, sep
# relax module imports.
@@ -30,7 +30,7 @@
make_peak_lists = True
if make_plots:
- from pylab import show, plot, legend, figure, title, subplots
+ from pylab import show, figure, title
from matplotlib.font_manager import FontProperties
fontP = FontProperties()
fontP.set_size('small')
Modified:
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py?rev=27977&r1=27976&r2=27977&view=diff
==============================================================================
---
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
(original)
+++
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
Mon Oct 5 09:46:22 2015
@@ -1,11 +1,11 @@
# Python module imports.
from collections import OrderedDict
-from numpy import array, asarray, diag, ones, std, sqrt
+from numpy import asarray, std
from numpy.random import normal
from minfx.generic import generic_minimise
-from os import getcwd, makedirs, path, sep
+from os import path, sep
from random import gauss
-from tempfile import mkdtemp, NamedTemporaryFile
+from tempfile import NamedTemporaryFile
# relax module imports.
from lib.compat import pickle
@@ -14,14 +14,14 @@
from status import Status; status = Status()
import dep_check
from lib.dispersion.variables import MODEL_R2EFF
-from pipe_control.mol_res_spin import generate_spin_string, return_spin,
spin_loop
-from specific_analyses.relax_disp.data import average_intensity,
check_intensity_errors, generate_r20_key, get_curve_type,
has_exponential_exp_type, has_r1rho_exp_type, loop_exp_frq,
loop_exp_frq_offset_point, loop_exp_frq_offset_point_time, loop_time,
return_grace_file_name_ini, return_param_key_from_data
+from pipe_control.mol_res_spin import generate_spin_string, spin_loop
+from specific_analyses.relax_disp.data import average_intensity,
check_intensity_errors, loop_exp_frq_offset_point, loop_time,
return_param_key_from_data
from specific_analyses.relax_disp.data import check_intensity_errors
# C modules.
if dep_check.C_module_exp_fn:
from specific_analyses.relax_fit.optimisation import func_wrapper,
dfunc_wrapper, d2func_wrapper
- from target_functions.relax_fit import jacobian, jacobian_chi2, setup
+ from target_functions.relax_fit import setup
# Call the python wrapper function to help with list to numpy array
conversion.
func = func_wrapper
dfunc = dfunc_wrapper
@@ -49,7 +49,7 @@
make_peak_lists = True
if make_plots:
- from pylab import show, plot, legend, figure, title, subplots
+ from pylab import show, figure
from matplotlib.font_manager import FontProperties
fontP = FontProperties()
fontP.set_size('small')
Modified:
trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian.py?rev=27977&r1=27976&r2=27977&view=diff
==============================================================================
--- trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian.py
(original)
+++ trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian.py
Mon Oct 5 09:46:22 2015
@@ -2,7 +2,7 @@
# Python module imports.
from math import exp
-from numpy import array, float64
+from numpy import array
from numdifftools import Jacobian
Modified:
trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian_chi2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian_chi2.py?rev=27977&r1=27976&r2=27977&view=diff
==============================================================================
---
trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian_chi2.py
(original)
+++
trunk/test_suite/shared_data/curve_fitting/numeric_topology/jacobian_chi2.py
Mon Oct 5 09:46:22 2015
@@ -2,7 +2,7 @@
# Python module imports.
from math import exp
-from numpy import array, float64
+from numpy import array
from numdifftools import Jacobian
r27977 - /trunk/test_suite/shared_data/curve_fitting/numeric_topology/