summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavor <vorgrimmlerdavid@gmx.de>2012-01-16 18:03:01 +0100
committerdavor <vorgrimmlerdavid@gmx.de>2012-01-16 18:03:01 +0100
commit627105104a86174794b4edc2f93176bff873ba2b (patch)
tree5e6b18ecc55e7275918523b21c66d1512d331cf2
parent8f82a6576a6cb0efc67b63cf4388c01c7b57dca1 (diff)
Updated files
-rw-r--r--5x_cv/datasets_nestle_outl.yaml2
-rw-r--r--5x_cv/factors_config40
2 files changed, 35 insertions, 7 deletions
diff --git a/5x_cv/datasets_nestle_outl.yaml b/5x_cv/datasets_nestle_outl.yaml
index d6308f5..5ef4ea1 100644
--- a/5x_cv/datasets_nestle_outl.yaml
+++ b/5x_cv/datasets_nestle_outl.yaml
@@ -60,7 +60,7 @@
"MOU2": {
"dataset": "http://toxcreate3.in-silico.ch:8086/dataset/4976",
- "electronic,cpsa": "http://toxcreate3.in-silico.ch:8086/dataset/4115",
+ "electronic,cpsa": "http://toxcreate3.in-silico.ch:8086/dataset/5267",
"constitutional": "http://toxcreate3.in-silico.ch:8086/dataset/5264",
"constitutional,electronic,cpsa": "http://toxcreate3.in-silico.ch:8086/dataset/5198"
}
diff --git a/5x_cv/factors_config b/5x_cv/factors_config
index 4e3f4c5..604ca45 100644
--- a/5x_cv/factors_config
+++ b/5x_cv/factors_config
@@ -1,10 +1,38 @@
#Dataset pc_type prop prediction_algorithm
-MOU constitutional false local_svm_regression
-MOU constitutional true local_svm_regression
-MOU electronic,cpsa false local_svm_regression
-MOU electronic,cpsa true local_svm_regression
-MOU constitutional,electronic,cpsa false local_svm_regression
-MOU constitutional,electronic,cpsa true local_svm_regression
+MDD constitutional false local_svm_regression
+MDD constitutional true local_svm_regression
+MDD electronic,cpsa false local_svm_regression
+MDD electronic,cpsa true local_svm_regression
+MDD constitutional,electronic,cpsa false local_svm_regression
+MDD constitutional,electronic,cpsa true local_svm_regression
+#MDD constitutional true local_mlr_prop
+#MDD electronic,cpsa true local_mlr_prop
+#MDD constitutional,electronic,cpsa true local_mlr_prop
+FHM2 constitutional false local_svm_regression
+FHM2 constitutional true local_svm_regression
+FHM2 electronic,cpsa false local_svm_regression
+FHM2 electronic,cpsa true local_svm_regression
+FHM2 constitutional,electronic,cpsa false local_svm_regression
+FHM2 constitutional,electronic,cpsa true local_svm_regression
#MOU constitutional true local_mlr_prop
#MOU electronic,cpsa true local_mlr_prop
#MOU constitutional,electronic,cpsa true local_mlr_prop
+RAT2 constitutional false local_svm_regression
+RAT2 constitutional true local_svm_regression
+RAT2 electronic,cpsa false local_svm_regression
+RAT2 electronic,cpsa true local_svm_regression
+RAT2 constitutional,electronic,cpsa false local_svm_regression
+RAT2 constitutional,electronic,cpsa true local_svm_regression
+#MOU constitutional true local_mlr_prop
+#MOU electronic,cpsa true local_mlr_prop
+#MOU constitutional,electronic,cpsa true local_mlr_prop
+MOU2 constitutional false local_svm_regression
+MOU2 constitutional true local_svm_regression
+MOU2 electronic,cpsa false local_svm_regression
+MOU2 electronic,cpsa true local_svm_regression
+MOU2 constitutional,electronic,cpsa false local_svm_regression
+MOU2 constitutional,electronic,cpsa true local_svm_regression
+#MOU constitutional true local_mlr_prop
+#MOU electronic,cpsa true local_mlr_prop
+#MOU constitutional,electronic,cpsa true local_mlr_prop
+