markusro/qdsfit
1
0
Fork 0
Code Issues Pull Requests Releases Activity

function registry with fixed container order

Browse Source
This commit is contained in:
Markus Rosenstihl
2014-09-25 17:14:50 +02:00
parent 582019d7cb
commit 1a1066a07e
4 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libmath/BDSlib.py
View File

@ -159,7 +159,32 @@ class FunctionRegister:
#print "FR: ",self.registry
def get_registered_functions( self ):
return self.registry
# returns functions, peaks sorted by tau
sorted_functions = list()
tau_comp = 0
for i_fcn, fcn in enumerate(self.registry):
if fcn.id_string == "hn":
for i, varname in enumerate(fcn.widget.names):
if varname == "tau":
if fcn._beta[i] <= tau_comp:
sorted_functions.append(fcn)
else:
sorted_functions.insert(0, fcn)
tau_comp = fcn._beta[i]
# eps_infty to the front
elif fcn.id_string == "eps_infty":
sorted_functions.insert(0, fcn)
# sort the rest lexigraphically
elif fcn.id_string == "pwr":
sorted_functions.append(fcn)
elif fcn.id_string == "cond":
sorted_functions.append(fcn)
elif fcn.id_string == "yaff":
sorted_functions.append(fcn)
else:
sorted_functions.append(fcn)
return sorted_functions
# ############# deprecated #####################