Author: bugman
Date: Mon Jan 19 19:18:51 2009
New Revision: 8542
URL: http://svn.gna.org/viewcvs/relax?rev=8542&view=rev
Log:
Merged revisions 8492,8501 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r8492 | semor | 2009-01-15 20:10:18 +0100 (Thu, 15 Jan 2009) | 3 lines
Corrected mistakes in English.
........
r8501 | bugman | 2009-01-17 12:36:47 +0100 (Sat, 17 Jan 2009) | 3 lines
Updated the relax intro copyright notice for the relax development team to
2009!
........
Modified:
branches/multi_structure/ (props changed)
branches/multi_structure/generic_fns/minimise.py
branches/multi_structure/relax
branches/multi_structure/specific_fns/model_free/mf_minimise.py
branches/multi_structure/specific_fns/n_state_model.py
branches/multi_structure/specific_fns/relax_fit.py
Propchange: branches/multi_structure/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 19 19:18:51 2009
@@ -1,1 +1,1 @@
-/1.3:1-8471
+/1.3:1-8541
Modified: branches/multi_structure/generic_fns/minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_structure/generic_fns/minimise.py?rev=8542&r1=8541&r2=8542&view=diff
==============================================================================
--- branches/multi_structure/generic_fns/minimise.py (original)
+++ branches/multi_structure/generic_fns/minimise.py Mon Jan 19 19:18:51 2009
@@ -192,10 +192,10 @@
@type min_algor: str
@param min_options: An array of options to be used by the
minimisation algorithm.
@type min_options: array of str
- @param func_tol: The function tolerence which, when reached,
terminates optimisation.
+ @param func_tol: The function tolerance which, when reached,
terminates optimisation.
Setting this to None turns of the check.
@type func_tol: None or float
- @param grad_tol: The gradient tolerence which, when reached,
terminates optimisation.
+ @param grad_tol: The gradient tolerance which, when reached,
terminates optimisation.
Setting this to None turns of the check.
@type grad_tol: None or float
@param max_iterations: The maximum number of iterations for the
algorithm.
Modified: branches/multi_structure/relax
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_structure/relax?rev=8542&r1=8541&r2=8542&view=diff
==============================================================================
--- branches/multi_structure/relax (original)
+++ branches/multi_structure/relax Mon Jan 19 19:18:51 2009
@@ -15,7 +15,7 @@
# relax, a program for relaxation data analysis.
#
#
#
# Copyright (C) 2001-2006 Edward d'Auvergne
#
-# Copyright (C) 2006-2008 the relax development team
#
+# Copyright (C) 2006-2009 the relax development team
#
#
#
# This program is free software; you can redistribute it and/or modify
#
# it under the terms of the GNU General Public License as published by
#
@@ -335,7 +335,7 @@
# Copyright printout.
string = "Copyright (C) 2001-2006 Edward d'Auvergne"
intro_string = intro_string + self.spacing(string, width) + '\n'
- string = "Copyright (C) 2006-2008 the relax development team"
+ string = "Copyright (C) 2006-2009 the relax development team"
intro_string = intro_string + self.spacing(string, width) + '\n\n'
# Program licence and help (80 characters wide).
Modified: branches/multi_structure/specific_fns/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_structure/specific_fns/model_free/mf_minimise.py?rev=8542&r1=8541&r2=8542&view=diff
==============================================================================
--- branches/multi_structure/specific_fns/model_free/mf_minimise.py (original)
+++ branches/multi_structure/specific_fns/model_free/mf_minimise.py Mon Jan
19 19:18:51 2009
@@ -722,10 +722,10 @@
@type min_algor: str
@keyword min_options: An array of options to be used by the
minimisation algorithm.
@type min_options: array of str
- @keyword func_tol: The function tolerence which, when
reached, terminates optimisation.
+ @keyword func_tol: The function tolerance which, when
reached, terminates optimisation.
Setting this to None turns of the check.
@type func_tol: None or float
- @keyword grad_tol: The gradient tolerence which, when
reached, terminates optimisation.
+ @keyword grad_tol: The gradient tolerance which, when
reached, terminates optimisation.
Setting this to None turns of the check.
@type grad_tol: None or float
@keyword max_iterations: The maximum number of iterations for the
algorithm.
Modified: branches/multi_structure/specific_fns/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_structure/specific_fns/n_state_model.py?rev=8542&r1=8541&r2=8542&view=diff
==============================================================================
--- branches/multi_structure/specific_fns/n_state_model.py (original)
+++ branches/multi_structure/specific_fns/n_state_model.py Mon Jan 19
19:18:51 2009
@@ -1187,10 +1187,10 @@
@type min_algor: str
@param min_options: An array of options to be used by the
minimisation algorithm.
@type min_options: array of str
- @param func_tol: The function tolerence which, when reached,
terminates optimisation.
+ @param func_tol: The function tolerance which, when reached,
terminates optimisation.
Setting this to None turns of the check.
@type func_tol: None or float
- @param grad_tol: The gradient tolerence which, when reached,
terminates optimisation.
+ @param grad_tol: The gradient tolerance which, when reached,
terminates optimisation.
Setting this to None turns of the check.
@type grad_tol: None or float
@param max_iterations: The maximum number of iterations for the
algorithm.
Modified: branches/multi_structure/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_structure/specific_fns/relax_fit.py?rev=8542&r1=8541&r2=8542&view=diff
==============================================================================
--- branches/multi_structure/specific_fns/relax_fit.py (original)
+++ branches/multi_structure/specific_fns/relax_fit.py Mon Jan 19 19:18:51
2009
@@ -591,10 +591,10 @@
@type min_algor: str
@keyword min_options: An array of options to be used by the
minimisation algorithm.
@type min_options: array of str
- @keyword func_tol: The function tolerence which, when
reached, terminates optimisation.
+ @keyword func_tol: The function tolerance which, when
reached, terminates optimisation.
Setting this to None turns of the check.
@type func_tol: None or float
- @keyword grad_tol: The gradient tolerence which, when
reached, terminates optimisation.
+ @keyword grad_tol: The gradient tolerance which, when
reached, terminates optimisation.
Setting this to None turns of the check.
@type grad_tol: None or float
@keyword max_iterations: The maximum number of iterations for the
algorithm.
r8542 - in /branches/multi_structure: ./ generic_fns/ specific_fns/ specific_fns/model_free/