Skip to content

Commit

Permalink
0.4.2
Browse files Browse the repository at this point in the history
- debugging
- remove R packages pander, tidyr and dplyr; not needed; R_model and R
- db dataset m^2 -> m2
- requirements.txt
- change R version; 3.3.2 -> 3.5.2 (with gamlss only)
  • Loading branch information
xi2pi committed Jan 25, 2019
1 parent 956cd55 commit cd852f8
Show file tree
Hide file tree
Showing 15 changed files with 468 additions and 533 deletions.
3 changes: 0 additions & 3 deletions src/R_model/perc_model_flexible.R
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
3 changes: 0 additions & 3 deletions src/R_model/perc_opt.R
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/R_model/perc_sens.R
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/R_model/perc_sens_down.R
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/R_model/perc_sens_up.R
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/R_model/perc_val.R
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Binary file modified src/__pycache__/modelselectionBIC.cpython-34.pyc
Binary file not shown.
Binary file modified src/__pycache__/modelselectionCV.cpython-34.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion src/example/db.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"","Age [years]","BMI [kg/]"
"","Age [years]","BMI [kg/m2]"
"1",0.03,13.2352889411417
"2",0.04,12.4387748775498
"3",0.04,14.5417747339652
Expand Down
4 changes: 2 additions & 2 deletions src/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions src/requirements_0.4.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
numpy==1.14.2
scipy==1.1.0
matplotlib==2.2.2
pandas==0.17.1
PyQt4==4.11.4
70 changes: 9 additions & 61 deletions src/tmp/log_model_fitting.txt
Original file line number Diff line number Diff line change
@@ -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)
Binary file modified src/tmp/percentiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
200 changes: 100 additions & 100 deletions src/tmp/percentiles_chart.csv

Large diffs are not rendered by default.

Loading

0 comments on commit cd852f8

Please sign in to comment.