Added jsons for replin and repquad

EIVPackage/EIVData/repeated_sampling.py

@@ -34,7 +34,6 @@ class repeated_sampling():
         _, _, true_trainset, true_testset\
                 = self.dataclass.load_data(
                         seed=self.fixed_seed, splitting_part=splitting_part,
-                        normalize=normalize,
                         return_ground_truth=True)
         true_train_x, true_train_y = true_trainset.tensors[:2]
         true_test_x, true_test_y = true_testset.tensors[:2]
@@ -45,13 +44,14 @@ class repeated_sampling():
         (noisy_train_x, noisy_train_y), (true_train_x, true_train_y) =\
                 add_noise((true_train_x, true_train_y),
                         (self.x_noise_strength, self.y_noise_strength), seeds,
-                        normalize=True,
+                        normalize=normalize,
                         normalization_list=true_trainset.tensors[2:])
         (noisy_test_x, noisy_test_y), (true_test_x, true_test_y) =\
                 add_noise((true_test_x, true_test_y),
                         (self.x_noise_strength, self.y_noise_strength), seeds,
-                        normalize=True,
-                        normalization_list=true_testset.tensors[2:])
+                        normalize=normalize,
+                        # normalize both datasets with train set
+                        normalization_list=true_trainset.tensors[2:])
         trainset = TensorDataset(noisy_train_x, noisy_train_y)
         testset = TensorDataset(noisy_test_x, noisy_test_y)
         true_trainset = TensorDataset(true_train_x, true_train_y,

EIVPackage/EIVGeneral/manipulate_tensors.py

@@ -40,7 +40,6 @@ def add_noise(tensor_list, noise_strength_list, seed_list, normalize=True,
     noisy_t_list = []
     unnoisy_t_list = []
     if normalization_list is not None:
-        assert normalize
         assert len(normalization_list) == len(tensor_list)
     for i, (t,noise,seed) in enumerate(zip(tensor_list, noise_strength_list,\
             seed_list)):

Experiments/configurations/eiv_replin.json

+{
+	"long_dataname": "repeated_linear",
+	"short_dataname": "replin",
+	"lr": 1e-3,
+	"batch_size": 64,
+	"test_batch_size": 800,
+	"number_of_epochs": 100,
+	"unscaled_reg": 10,
+	"report_point": 5,
+	"p": 0.1,
+	"lr_update": 20,
+	"std_y_update_points": [1,40],
+	"eiv_prediction_number_of_draws": [100,5],
+	"eiv_prediction_number_of_batches": 10,
+	"init_std_y_list": [0.5],
+	"gamma": 0.5,
+	"hidden_layers": [128, 128, 128, 128],
+	"fixed_std_x": 0.05,
+	"seed_range": [0,10],
+	"gpu_number": 1
+}

Experiments/configurations/eiv_repquad.json

+{
+	"long_dataname": "repeated_quadratic",
+	"short_dataname": "repquad",
+	"lr": 1e-3,
+	"batch_size": 64,
+	"test_batch_size": 800,
+	"number_of_epochs": 100,
+	"unscaled_reg": 10,
+	"report_point": 5,
+	"p": 0.1,
+	"lr_update": 20,
+	"std_y_update_points": [1,40],
+	"eiv_prediction_number_of_draws": [100,5],
+	"eiv_prediction_number_of_batches": 10,
+	"init_std_y_list": [0.5],
+	"gamma": 0.5,
+	"hidden_layers": [128, 128, 128, 128],
+	"fixed_std_x": 0.05,
+	"seed_range": [0,10],
+	"gpu_number": 1
+}

Experiments/configurations/noneiv_replin.json

+{
+	"long_dataname": "repeated_linear",
+	"short_dataname": "replin",
+	"lr": 1e-3,
+	"batch_size": 64,
+	"test_batch_size": 800,
+	"number_of_epochs": 100,
+	"unscaled_reg": 10,
+	"report_point": 5,
+	"p": 0.1,
+	"lr_update": 20,
+	"std_y_update_points": [1,40] ,
+	"noneiv_prediction_number_of_draws": 100,
+	"noneiv_prediction_number_of_batches": 10,
+	"init_std_y_list": [0.5],
+	"gamma": 0.5,
+	"hidden_layers": [128, 128, 128, 128],
+	"seed_range": [0,10],
+	"gpu_number": 1
+}

Experiments/configurations/noneiv_repquad.json

+{
+	"long_dataname": "repeated_quadratic",
+	"short_dataname": "repquad",
+	"lr": 1e-3,
+	"batch_size": 64,
+	"test_batch_size": 800,
+	"number_of_epochs": 100,
+	"unscaled_reg": 10,
+	"report_point": 5,
+	"p": 0.1,
+	"lr_update": 20,
+	"std_y_update_points": [1,40] ,
+	"noneiv_prediction_number_of_draws": 100,
+	"noneiv_prediction_number_of_batches": 10,
+	"init_std_y_list": [0.5],
+	"gamma": 0.5,
+	"hidden_layers": [128, 128, 128, 128],
+	"seed_range": [0,10],
+	"gpu_number": 1
+}