0.4.2

- R path in BIC mdeol selection fixed
xi2pi · Jan 10, 2019 · dbe68ff · dbe68ff
1 parent 30b1dac
commit dbe68ff
Show file tree

Hide file tree

Showing 29 changed files with 1,749 additions and 1,665 deletions.
diff --git a/src/__pycache__/ZPconverter.cpython-34.pyc b/src/__pycache__/ZPconverter.cpython-34.pyc
diff --git a/src/__pycache__/advanced_modelfitting.cpython-34.pyc b/src/__pycache__/advanced_modelfitting.cpython-34.pyc
diff --git a/src/__pycache__/helprefcurv.cpython-34.pyc b/src/__pycache__/helprefcurv.cpython-34.pyc
diff --git a/src/__pycache__/main_window.cpython-34.pyc b/src/__pycache__/main_window.cpython-34.pyc
diff --git a/src/__pycache__/modelcomparison.cpython-34.pyc b/src/__pycache__/modelcomparison.cpython-34.pyc
diff --git a/src/__pycache__/modelfitting.cpython-34.pyc b/src/__pycache__/modelfitting.cpython-34.pyc
diff --git a/src/__pycache__/modelselectionBIC.cpython-34.pyc b/src/__pycache__/modelselectionBIC.cpython-34.pyc
diff --git a/src/__pycache__/modelselectionCV.cpython-34.pyc b/src/__pycache__/modelselectionCV.cpython-34.pyc
diff --git a/src/__pycache__/monte_carlo.cpython-34.pyc b/src/__pycache__/monte_carlo.cpython-34.pyc
diff --git a/src/__pycache__/reverse_computation.cpython-34.pyc b/src/__pycache__/reverse_computation.cpython-34.pyc
diff --git a/src/__pycache__/rpath.cpython-34.pyc b/src/__pycache__/rpath.cpython-34.pyc
diff --git a/src/__pycache__/sensitivityanalysis.cpython-34.pyc b/src/__pycache__/sensitivityanalysis.cpython-34.pyc
diff --git a/src/__pycache__/settings.cpython-34.pyc b/src/__pycache__/settings.cpython-34.pyc
diff --git a/src/__pycache__/settings_outliers.cpython-34.pyc b/src/__pycache__/settings_outliers.cpython-34.pyc
diff --git a/src/__pycache__/taskbar_top.cpython-34.pyc b/src/__pycache__/taskbar_top.cpython-34.pyc
diff --git a/src/__pycache__/treeitems.cpython-34.pyc b/src/__pycache__/treeitems.cpython-34.pyc
diff --git a/src/__pycache__/zscore_calculator.cpython-34.pyc b/src/__pycache__/zscore_calculator.cpython-34.pyc
diff --git a/src/modelselectionBIC.py b/src/modelselectionBIC.py
@@ -105,6 +105,7 @@ def center(self):
 
 
     def run_optimization(self):
+        print(self.command)
 
         self.table.clear()
         self.table.setSortingEnabled(False)
@@ -119,6 +120,7 @@ def run_optimization(self):
         self.L_Max = int(self.LambdaTextMax.text()) + 1
 
         manager = TaskManager()
+        manager.command = self.command
         manager.x_axis = self.x_value
         manager.y_axis = self.y_value
         manager.start_process(self.M_Min,self.M_Max, self.S_Min,self.S_Max, self.L_Min,self.L_Max)
@@ -228,7 +230,7 @@ def run_queue_2(self, command, command_arg_list):
             print("wait")
 
     def run_queue(self, command, command_arg_list):
-                    
+        print(command)
         self.length_queue = len(command_arg_list)
         print(self.length_queue)
 
@@ -238,7 +240,7 @@ def run_queue(self, command, command_arg_list):
             print(self.process_id)
             process = QtCore.QProcess(self)
             process.readyReadStandardOutput.connect(partial(self.onReadyReadStandardOutput_queue, self.process_id, cur_process))
-            process.start(command,cur_process, QtCore.QIODevice.ReadOnly)
+            process.start(command, cur_process, QtCore.QIODevice.ReadOnly)
             self.m_processes.append(process)
 
         else:

diff --git a/src/rpath.py b/src/rpath.py
@@ -23,6 +23,7 @@ class r_path(QtGui.QMainWindow):
 
     def __init__(self, mainWindow, modelFitter, modelselect, modelselectCV, sensiti, adfitting):
         super(r_path, self).__init__() 
+        self.program_path = mainWindow.program_path
 
         self.fitter = modelFitter
         self.modelselect = modelselect
@@ -59,7 +60,16 @@ def __init__(self, mainWindow, modelFitter, modelselect, modelselectCV, sensiti,
         self.mainLayout.addWidget(self.formGroupBox)
         self.mainLayout.addWidget(self.widget_btns)
 
-
+        self.init_path()
+
+    def init_path(self):
+        R_path = self.program_path + '/R-3.3.2/bin/Rscript'
+        self.fitter.command = R_path
+        self.modelselect.command = R_path
+        self.modelselectCV.command = R_path
+        self.adfitter.command = R_path
+        self.sensiti.command = R_path
+
 
     def init_createFormGroupBox(self):
         self.formGroupBox = QtGui.QGroupBox("R Path")

diff --git a/src/tmp/log_model_fitting.txt b/src/tmp/log_model_fitting.txt
@@ -30,5 +30,35 @@ The following objects are masked from 'package:base':
 
     intersect, setdiff, setequal, union
 
-Es gab 47 Warnungen (Anzeige mit warnings())
+Warnmeldungen:
+1: In additive.fit(x = X, y = wv, w = wt * w, s = s, who = who, smooth.frame,  :
+  additive.fit convergence not obtained in  30  iterations
+2: In additive.fit(x = X, y = wv, w = wt * w, s = s, who = who, smooth.frame,  :
+  additive.fit convergence not obtained in  30  iterations
+3: In additive.fit(x = X, y = wv, w = wt * w, s = s, who = who, smooth.frame,  :
+  additive.fit convergence not obtained in  30  iterations
+4: In additive.fit(x = X, y = wv, w = wt * w, s = s, who = who, smooth.frame,  :
+  additive.fit convergence not obtained in  30  iterations
+5: In additive.fit(x = X, y = wv, w = wt * w, s = s, who = who, smooth.frame,  :
+  additive.fit convergence not obtained in  30  iterations
+Warnmeldung:
+In predict.gamlss(obj, what = "mu", newdata = newx, type = "response",  :
+  There is a discrepancy  between the original and the re-fit 
+ used to achieve 'safe' predictions 
+
 Es gab 18 Warnungen (Anzeige mit warnings())
+Warnmeldung:
+In predict.gamlss(object, newdata = newdata, what = "mu", type = type,  :
+  There is a discrepancy  between the original and the re-fit 
+ used to achieve 'safe' predictions 
+
+Warnmeldung:
+In predict.gamlss(obj, what = "mu", newdata = newx, type = "response",  :
+  There is a discrepancy  between the original and the re-fit 
+ used to achieve 'safe' predictions 
+
+Warnmeldung:
+In predict.gamlss(obj, what = "mu", newdata = newx, type = "response",  :
+  There is a discrepancy  between the original and the re-fit 
+ used to achieve 'safe' predictions 
+
diff --git a/src/tmp/percentiles.png b/src/tmp/percentiles.png
diff --git a/src/tmp/percentiles_chart.csv b/src/tmp/percentiles_chart.csv