From 98ffa49b008cd92444be3fc1aef5187d4dee13a5 Mon Sep 17 00:00:00 2001
From: Joerg Martin <joerg.martin@ptb.de>
Date: Wed, 15 Dec 2021 14:30:45 +0100
Subject: [PATCH] Updated JSON files

Corrected eiv_prediction_number_of_draws in JSON configuration files
and updated the intervals of std_y updating for some of the datasets.
---
 Experiments/configurations/eiv_california.json  | 2 +-
 Experiments/configurations/eiv_concrete.json    | 6 +++---
 Experiments/configurations/eiv_energy.json      | 4 ++--
 Experiments/configurations/eiv_kin8nm.json      | 4 ++--
 Experiments/configurations/eiv_msd.json         | 2 +-
 Experiments/configurations/eiv_naval.json       | 4 ++--
 Experiments/configurations/eiv_power.json       | 2 +-
 Experiments/configurations/eiv_protein.json     | 2 +-
 Experiments/configurations/eiv_wine.json        | 2 +-
 Experiments/configurations/eiv_yacht.json       | 2 +-
 Experiments/configurations/noneiv_concrete.json | 4 ++--
 Experiments/configurations/noneiv_energy.json   | 2 +-
 Experiments/configurations/noneiv_kin8nm.json   | 2 +-
 Experiments/configurations/noneiv_naval.json    | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Experiments/configurations/eiv_california.json b/Experiments/configurations/eiv_california.json
index 6cfa57f..53feee2 100644
--- a/Experiments/configurations/eiv_california.json
+++ b/Experiments/configurations/eiv_california.json
@@ -10,7 +10,7 @@
 	"p": 0.1,
 	"lr_update": 20,
 	"std_y_update_points": [10,5],
-	"eiv_prediction_number_of_draws": 100,
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_concrete.json b/Experiments/configurations/eiv_concrete.json
index 0e23434..0997d65 100644
--- a/Experiments/configurations/eiv_concrete.json
+++ b/Experiments/configurations/eiv_concrete.json
@@ -9,9 +9,9 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 20,
-	"std_y_update_points": 10,
-	"eiv_prediction_number_of_draws": 100,
-	"eiv_prediction_number_of_batches": 10,
+	"std_y_update_points": [10, 40],
+	"eiv_prediction_number_of_draws": [100,5],
+	"eiv_prediction_number_of_batches": 20,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
 	"hidden_layers": [1024, 1024, 1024, 1024],
diff --git a/Experiments/configurations/eiv_energy.json b/Experiments/configurations/eiv_energy.json
index f13ab1b..ee42198 100644
--- a/Experiments/configurations/eiv_energy.json
+++ b/Experiments/configurations/eiv_energy.json
@@ -9,8 +9,8 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 100,
-	"std_y_update_points": 100,
-	"eiv_prediction_number_of_draws": 100,
+	"std_y_update_points": [100, 250],
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_kin8nm.json b/Experiments/configurations/eiv_kin8nm.json
index df2e4ba..65ba9a2 100644
--- a/Experiments/configurations/eiv_kin8nm.json
+++ b/Experiments/configurations/eiv_kin8nm.json
@@ -9,8 +9,8 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 20,
-	"std_y_update_points": 19,
-	"eiv_prediction_number_of_draws": 100,
+	"std_y_update_points": [1,14],
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_msd.json b/Experiments/configurations/eiv_msd.json
index a738f2e..a971f4b 100644
--- a/Experiments/configurations/eiv_msd.json
+++ b/Experiments/configurations/eiv_msd.json
@@ -10,7 +10,7 @@
 	"p": 0.2,
 	"lr_update": 4,
 	"std_y_update_points": 4,
-	"eiv_prediction_number_of_draws": 100,
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_naval.json b/Experiments/configurations/eiv_naval.json
index 092f4f8..8975c95 100644
--- a/Experiments/configurations/eiv_naval.json
+++ b/Experiments/configurations/eiv_naval.json
@@ -9,8 +9,8 @@
         "report_point": 5,
         "p": 0.2,
         "lr_update": 20,
-        "std_y_update_points": 20,
-	"eiv_prediction_number_of_draws": 100,
+        "std_y_update_points": [1,14],
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
         "init_std_y_list": [0.5],
         "gamma": 0.5,
diff --git a/Experiments/configurations/eiv_power.json b/Experiments/configurations/eiv_power.json
index ab5649f..c7517c3 100644
--- a/Experiments/configurations/eiv_power.json
+++ b/Experiments/configurations/eiv_power.json
@@ -10,7 +10,7 @@
 	"p": 0.2,
 	"lr_update": 10,
 	"std_y_update_points": 15,
-	"eiv_prediction_number_of_draws": 100,
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_protein.json b/Experiments/configurations/eiv_protein.json
index 9623799..04ffb85 100644
--- a/Experiments/configurations/eiv_protein.json
+++ b/Experiments/configurations/eiv_protein.json
@@ -10,7 +10,7 @@
 	"p": 0.2,
 	"lr_update": 10,
 	"std_y_update_points": 10,
-	"eiv_prediction_number_of_draws": 100,
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_wine.json b/Experiments/configurations/eiv_wine.json
index f0beaf4..0246c03 100644
--- a/Experiments/configurations/eiv_wine.json
+++ b/Experiments/configurations/eiv_wine.json
@@ -10,7 +10,7 @@
 	"p": 0.2,
 	"lr_update": 30,
 	"std_y_update_points": 50,
-	"eiv_prediction_number_of_draws": 100,
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/eiv_yacht.json b/Experiments/configurations/eiv_yacht.json
index 7617289..25b6457 100644
--- a/Experiments/configurations/eiv_yacht.json
+++ b/Experiments/configurations/eiv_yacht.json
@@ -10,7 +10,7 @@
 	"p": 0.2,
 	"lr_update": 200,
 	"std_y_update_points": [1,500],
-	"eiv_prediction_number_of_draws": 100,
+	"eiv_prediction_number_of_draws": [100,5],
 	"eiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
diff --git a/Experiments/configurations/noneiv_concrete.json b/Experiments/configurations/noneiv_concrete.json
index 15e28c5..911817e 100644
--- a/Experiments/configurations/noneiv_concrete.json
+++ b/Experiments/configurations/noneiv_concrete.json
@@ -9,9 +9,9 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 20,
-	"std_y_update_points": 10,
+	"std_y_update_points": [10,40],
 	"noneiv_prediction_number_of_draws": 100,
-	"noneiv_prediction_number_of_batches": 10,
+	"noneiv_prediction_number_of_batches": 20,
 	"init_std_y_list": [0.5],
 	"gamma": 0.5,
 	"hidden_layers": [1024, 1024, 1024, 1024],
diff --git a/Experiments/configurations/noneiv_energy.json b/Experiments/configurations/noneiv_energy.json
index 18c068e..003877a 100644
--- a/Experiments/configurations/noneiv_energy.json
+++ b/Experiments/configurations/noneiv_energy.json
@@ -9,7 +9,7 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 100,
-	"std_y_update_points": 100,
+	"std_y_update_points": [100, 250],
 	"noneiv_prediction_number_of_draws": 100,
 	"noneiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
diff --git a/Experiments/configurations/noneiv_kin8nm.json b/Experiments/configurations/noneiv_kin8nm.json
index 8ecf817..fdc5ec5 100644
--- a/Experiments/configurations/noneiv_kin8nm.json
+++ b/Experiments/configurations/noneiv_kin8nm.json
@@ -9,7 +9,7 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 20,
-	"std_y_update_points": 19,
+	"std_y_update_points": [1,16],
 	"noneiv_prediction_number_of_draws": 100,
 	"noneiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
diff --git a/Experiments/configurations/noneiv_naval.json b/Experiments/configurations/noneiv_naval.json
index 2da83b7..2562b1c 100644
--- a/Experiments/configurations/noneiv_naval.json
+++ b/Experiments/configurations/noneiv_naval.json
@@ -9,7 +9,7 @@
 	"report_point": 5,
 	"p": 0.2,
 	"lr_update": 20,
-	"std_y_update_points": 20,
+	"std_y_update_points": [1,14],
 	"noneiv_prediction_number_of_draws": 100,
 	"noneiv_prediction_number_of_batches": 10,
 	"init_std_y_list": [0.5],
-- 
GitLab