...
 
......@@ -156,7 +156,7 @@ class DataModel:
TDBpath="db", # defult search path for thermodynamics databKetzin_initial_mod.phrqases
InitSolFilePath=os.curdir, # initial solution search path
InitSolFile="", # current directory is default for phrq files and if this is empty then the first one found is used
backend="rpb.R", # this can be set to different backend testing branch etc.
backend="rpb_mdl.R", # this can be set to different backend testing branch etc.
PureStates=["0.0 0", "0.0 1","EXCL"],
#Rsession="rpv_sessions/.RData"): # if this is set, then a previously saved session at this path is loaded for all variables,
Rsession="",
......@@ -664,7 +664,7 @@ class LevelPlot(HasTraits):
#self.ORDERED_PARAM_STACK = list(reversed(self.SAprio_list[ self.axclust.index ][:(len(self.prio_methods[self.prio_method_selector])-2)]))
# no need for pre-calculated axis order, as it this is done interactively
self.ORDERED_PARAM_STACK = self.first_parameter_order(first_selection)
print('Starting with parameter stack ' + self.ORDERED_PARAM_STACK)
print('Starting with parameter stack ' + str(self.ORDERED_PARAM_STACK))
self.SetParas(method=self.prio_method_selector)
self.selections()
self.DrawLevels()
......
......@@ -366,7 +366,7 @@ def checkfiles(list_of_paths,verbose=False): # Checks if file paths in the list
out=[ os.path.exists(name) for name in list_of_paths ]
print(zip(out,list_of_paths))
return out
def RConnect(self,load_file='rpb.R',autobind=['restore_session'],load_session='',load_later_data=[]):
def RConnect(self,load_file='rpb_mdl.R',autobind=['restore_session'],load_session='',load_later_data=[]):
# Connect R session to the caller instance
import rpy2.robjects as r #,numpy as np
r.r['options'](warn=-1)
......