Author: bugman
Date: Sat Oct 18 18:19:58 2008
New Revision: 7813
URL: http://svn.gna.org/viewcvs/relax?rev=7813&view=rev
Log:
Renamed print_flag to verbosity to shift to the new 1.3 design.
Modified:
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
Modified:
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Sat
Oct 18 18:19:58 2008
@@ -1125,17 +1125,17 @@
full_grid_info = Grid_info(min_options)
sub_grid_list =
full_grid_info.sub_divide(processor.processor_size())
if constraints:
- super_grid_memo = MF_super_grid_memo(model_free=self,
index=index, sim_index=sim_index, model_type=model_type, scaling=scaling,
scaling_matrix=scaling_matrix, full_output=True, print_flag=print_flag,
print_prefix="", grid_size=self.grid_size, A=A, b=b)
+ super_grid_memo = MF_super_grid_memo(model_free=self,
index=index, sim_index=sim_index, model_type=model_type, scaling=scaling,
scaling_matrix=scaling_matrix, full_output=True, verbosity=verbosity,
print_prefix="", grid_size=self.grid_size, A=A, b=b)
else:
- super_grid_memo = MF_super_grid_memo(model_free=self,
index=index, sim_index=sim_index, model_type=model_type, scaling=scaling,
scaling_matrix=scaling_matrix, full_output=True, print_flag=print_flag,
print_prefix="", grid_size=self.grid_size)
+ super_grid_memo = MF_super_grid_memo(model_free=self,
index=index, sim_index=sim_index, model_type=model_type, scaling=scaling,
scaling_matrix=scaling_matrix, full_output=True, verbosity=verbosity,
print_prefix="", grid_size=self.grid_size)
for sub_grid_index, sub_grid_info in
enumerate(sub_grid_list):
command = MF_grid_command()
command.set_mf(init_params=param_vector,
model_type=model_type, diff_type=diff_type, diff_params=diff_params,
scaling_matrix=scaling_matrix, num_spins=num_spins, equations=equations,
param_types=param_types, param_values=param_values, relax_data=relax_data,
errors=relax_error, bond_length=r, csa=csa, num_frq=num_frq, frq=frq,
num_ri=num_ri, remap_table=remap_table, noe_r1_table=noe_r1_table,
ri_labels=ri_labels, gx=gx, gh=gh, h_bar=h_bar, mu0=mu0,
num_params=num_params, vectors=xh_unit_vectors)
if constraints:
- command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, full_output=True,
print_flag=verbosity)
+ command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, full_output=True,
verbosity=verbosity)
else:
- command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, full_output=True,
print_flag=verbosity)
+ command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, full_output=True,
verbosity=verbosity)
memo = MF_grid_memo(super_grid_memo)
@@ -1150,9 +1150,9 @@
return command.build_mf().calc_ri()
if constraints:
- command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, full_output=True,
print_flag=verbosity)
+ command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, full_output=True,
verbosity=verbosity)
else:
- command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, full_output=True,
print_flag=verbosity)
+ command.set_minimise(args=(), x0=param_vector,
min_algor=min_algor, min_options=min_options, func_tol=func_tol,
grad_tol=grad_tol, maxiter=max_iterations, full_output=True,
verbosity=verbosity)
memo = MF_memo(model_free=self, spin=spin,
sim_index=sim_index, model_type=model_type, scaling=scaling,
scaling_matrix=scaling_matrix)
Modified:
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py?rev=7813&r1=7812&r2=7813&view=diff
==============================================================================
---
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
(original)
+++
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
Sat Oct 18 18:19:58 2008
@@ -107,7 +107,7 @@
#!! 'a0':1.0,'mu':0.0001,'eta':0.1,
self.minimise_map={'args':(), 'x0':None, 'min_algor':None,
'min_options':None, 'func_tol':1e-25, 'grad_tol':None,
'maxiter':1e6, 'A':None, 'b':'None', 'l':None,
'u':None, 'c':None, 'dc':None, 'd2c':None,
- 'dc':None, 'd2c':None, 'full_output':0, 'print_flag':0,
+ 'dc':None, 'd2c':None, 'full_output':0, 'verbosity':0,
'print_prefix':""}
@@ -285,7 +285,7 @@
def pre_command_feed_back(self,processor):
# print_prefix = self.minimise_map['print_prefix']
-# print_flag = self.minimise_map['print_flag']
+# verbosity = self.minimise_map['verbosity']
# grid_step = self.minimise_map['min_options'].start
# grid_size = self.minimise_map['min_options'].steps
# full_output = self.minimise_map['full_output']
@@ -298,8 +298,8 @@
# if grid_step == 0:
# print "Unconstrained grid search size: " + `grid_size` + "
(constraints may decrease this size).\n"
#
-# if print_flag:
-# if print_flag >= 2:
+# if verbosity:
+# if verbosity >= 2:
# print print_prefix
# print print_prefix
# print print_prefix + "Grid search"
@@ -307,7 +307,7 @@
#
# # Linear constraints.
# if A != None and b != None:
-# if print_flag >= 3:
+# if verbosity >= 3:
# print print_prefix + "Linear constraint matrices."
# print print_prefix + "A: " + `A`
# print print_prefix + "b: " + `b`
@@ -341,11 +341,11 @@
self.super_grid_memo.add_result(self,results)
class MF_super_grid_memo(MF_memo):
- def
__init__(self,model_free,index,sim_index,run,param_set,scaling,scaling_matrix,print_prefix,print_flag,full_output,A,b,grid_size):
+ def
__init__(self,model_free,index,sim_index,run,param_set,scaling,scaling_matrix,print_prefix,verbosity,full_output,A,b,grid_size):
super(MF_super_grid_memo,self).__init__(model_free,index,sim_index,run,param_set,scaling,scaling_matrix)
self.full_output=full_output
self.print_prefix = print_prefix
- self.print_flag = print_flag
+ self.verbosity = verbosity
self.sub_memos = []
self.completed = False
@@ -437,7 +437,7 @@
sgm = memo.super_grid_memo
print_prefix = sgm.print_prefix
- print_flag = sgm.print_flag
+ verbosity = sgm.verbosity
full_output = sgm.full_output
A = sgm.A
b = sgm.b
@@ -451,8 +451,8 @@
print
print "Unconstrained grid search size: " + `grid_size` + "
(constraints may decrease this size).\n"
- if print_flag:
- if print_flag >= 2:
+ if verbosity:
+ if verbosity >= 2:
print print_prefix
print print_prefix
print print_prefix + "Grid search"
@@ -460,7 +460,7 @@
# Linear constraints.
if A != None and b != None:
- if print_flag >= 3:
+ if verbosity >= 3:
print print_prefix + "Linear constraint matrices."
print print_prefix + "A: " + `A`
print print_prefix + "b: " + `b`
@@ -472,7 +472,7 @@
if sgm.completed:
- if print_flag and results != None:
+ if verbosity and results != None:
if full_output:
print ''
print ''
r7813 - in /branches/multi_processor_merge/specific_fns/model_free: mf_minimise.py multi_processor_commands.py