0.4.2

xi2pi · xi2pi · commit cd852f839f1a · 2019-01-25T11:34:39.000+01:00
- debugging
- remove R packages pander, tidyr and dplyr; not needed; R_model and R
- db dataset m^2 -&gt; m2
- requirements.txt
- change R version; 3.3.2 -&gt; 3.5.2 (with gamlss only)
diff --git a/src/R_model/perc_model_flexible.R b/src/R_model/perc_model_flexible.R
@@ -9,9 +9,6 @@ sink(logfile, type="message")
 
 # Load packages
 library(gamlss)
-library(pander)
-library(dplyr)
-library(tidyr)
 
 # Convert to numerics
 nums = as.numeric(myArgs[1:3])
diff --git a/src/R_model/perc_opt.R b/src/R_model/perc_opt.R
@@ -1,9 +1,6 @@
 # perc_opt.R
 # Load packages
 library(gamlss)
-library(pander)
-library(dplyr)
-library(tidyr)
 
 # Fetch command line arguments
 myArgs <- commandArgs(trailingOnly = TRUE)
diff --git a/src/R_model/perc_sens.R b/src/R_model/perc_sens.R
@@ -1,9 +1,6 @@
 # perc_model.R
 # Load packages
 library(gamlss)
-library(pander)
-library(dplyr)
-library(tidyr)
 
 # Fetch command line arguments
 myArgs <- commandArgs(trailingOnly = TRUE)
diff --git a/src/R_model/perc_sens_down.R b/src/R_model/perc_sens_down.R
@@ -1,9 +1,6 @@
 # perc_model.R
 # Load packages
 library(gamlss)
-library(pander)
-library(dplyr)
-library(tidyr)
 
 # Fetch command line arguments
 myArgs <- commandArgs(trailingOnly = TRUE)
diff --git a/src/R_model/perc_sens_up.R b/src/R_model/perc_sens_up.R
@@ -1,9 +1,6 @@
 # perc_model.R
 # Load packages
 library(gamlss)
-library(pander)
-library(dplyr)
-library(tidyr)
 
 # Fetch command line arguments
 myArgs <- commandArgs(trailingOnly = TRUE)
diff --git a/src/R_model/perc_val.R b/src/R_model/perc_val.R
@@ -1,9 +1,6 @@
 # perc_val.R
 # Load packages
 library(gamlss)
-library(pander)
-library(dplyr)
-library(tidyr)
 
 # Fetch command line arguments
 myArgs <- commandArgs(trailingOnly = TRUE)
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/example/db.csv b/src/example/db.csv
@@ -1,4 +1,4 @@
-"","Age [years]","BMI [kg/m²]"
+"","Age [years]","BMI [kg/m2]"
 "1",0.03,13.2352889411417
 "2",0.04,12.4387748775498
 "3",0.04,14.5417747339652
diff --git a/src/requirements.txt b/src/requirements.txt
@@ -1,5 +1,5 @@
-numpy==1.14.2
 scipy==1.1.0
+numpy==1.14.2
+pandas==0.22.0
 matplotlib==2.2.2
-pandas==0.17.1
 PyQt4==4.11.4
diff --git a/src/requirements_0.4.1.txt b/src/requirements_0.4.1.txt
@@ -0,0 +1,5 @@
+numpy==1.14.2
+scipy==1.1.0
+matplotlib==2.2.2
+pandas==0.17.1
+PyQt4==4.11.4
diff --git a/src/tmp/log_model_fitting.txt b/src/tmp/log_model_fitting.txt
@@ -1,64 +1,12 @@
-Lade n�tiges Paket: splines
-Lade n�tiges Paket: gamlss.data
-Lade n�tiges Paket: gamlss.dist
-Lade n�tiges Paket: MASS
-Lade n�tiges Paket: methods
-Lade n�tiges Paket: nlme
-Lade n�tiges Paket: parallel
- **********   GAMLSS Version 5.0-6  ********** 
+Loading required package: splines
+Loading required package: gamlss.data
+Loading required package: gamlss.dist
+Loading required package: MASS
+Loading required package: nlme
+Loading required package: parallel
+ **********   GAMLSS Version 5.1-2  ********** 
 For more on GAMLSS look at http://www.gamlss.org/
 Type gamlssNews() to see new features/changes/bug fixes.
 
-Warnmeldung:
-Paket 'gamlss' wurde unter R Version 3.3.3 erstellt 
-
-Attache Paket: 'dplyr'
-
-The following object is masked from 'package:nlme':
-
-    collapse
-
-The following object is masked from 'package:MASS':
-
-    select
-
-The following objects are masked from 'package:stats':
-
-    filter, lag
-
-The following objects are masked from 'package:base':
-
-    intersect, setdiff, setequal, union
-
-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 
- 
+There were 47 warnings (use warnings() to see them)
+There were 18 warnings (use warnings() to see them)
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
diff --git a/src/tmp/res_chart.csv b/src/tmp/res_chart.csv

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-"","Age [years]","BMI [kg/m²]"`
	`1`	`+"","Age [years]","BMI [kg/m2]"`
`2`	`2`	`"1",0.03,13.2352889411417`
`3`	`3`	`"2",0.04,12.4387748775498`
`4`	`4`	`"3",0.04,14.5417747339652`