From feed4ac946215d55e9b116ae91d7a3fe2f78ca1a Mon Sep 17 00:00:00 2001 From: Joerg Martin <joerg.martin@ptb.de> Date: Thu, 3 Feb 2022 12:06:53 +0000 Subject: [PATCH] Updated training parameters for simulated data --- EIVPackage/EIVData/cubic.py | 4 ++-- EIVPackage/EIVData/linear.py | 4 ++-- EIVPackage/EIVData/quadratic.py | 4 ++-- EIVPackage/EIVData/sine.py | 2 +- Experiments/configurations/eiv_cubic.json | 4 ++-- Experiments/configurations/eiv_linear.json | 4 ++-- Experiments/configurations/eiv_quadratic.json | 4 ++-- Experiments/configurations/eiv_sine.json | 2 +- Experiments/configurations/noneiv_cubic.json | 2 +- Experiments/configurations/noneiv_linear.json | 2 +- Experiments/configurations/noneiv_quadratic.json | 2 +- Experiments/configurations/noneiv_sine.json | 2 +- Experiments/plot_prediction.py | 8 +++----- 13 files changed, 21 insertions(+), 23 deletions(-) diff --git a/EIVPackage/EIVData/cubic.py b/EIVPackage/EIVData/cubic.py index 6b11da7..710ea87 100644 --- a/EIVPackage/EIVData/cubic.py +++ b/EIVPackage/EIVData/cubic.py @@ -5,11 +5,11 @@ from torch.utils.data import TensorDataset from EIVGeneral.manipulate_tensors import add_noise, normalize_tensor,\ unnormalize_tensor -total_number_of_datapoints = 2000 +total_number_of_datapoints = 500 input_range = [-4,4] slope = 1.0 intercept = 0.0 -x_noise_strength = 0.05 * (input_range[1] - input_range[0])/2 +x_noise_strength = 0.2 y_noise_strength = 3 func = lambda true_x: slope * true_x**3 + intercept diff --git a/EIVPackage/EIVData/linear.py b/EIVPackage/EIVData/linear.py index dc2959d..97d2cd9 100644 --- a/EIVPackage/EIVData/linear.py +++ b/EIVPackage/EIVData/linear.py @@ -5,11 +5,11 @@ from torch.utils.data import TensorDataset from EIVGeneral.manipulate_tensors import add_noise, normalize_tensor,\ unnormalize_tensor -total_number_of_datapoints = 2000 +total_number_of_datapoints = 500 input_range = [-1,1] slope = 1.0 intercept = 0.0 -x_noise_strength = 0.05 +x_noise_strength = 0.1 y_noise_strength = 0.1 func = lambda true_x: slope * true_x + intercept diff --git a/EIVPackage/EIVData/quadratic.py b/EIVPackage/EIVData/quadratic.py index 27e83d6..655e6bf 100644 --- a/EIVPackage/EIVData/quadratic.py +++ b/EIVPackage/EIVData/quadratic.py @@ -5,11 +5,11 @@ from torch.utils.data import TensorDataset from EIVGeneral.manipulate_tensors import add_noise, normalize_tensor,\ unnormalize_tensor -total_number_of_datapoints = 2000 +total_number_of_datapoints = 500 input_range = [-1,1] slope = 1.0 intercept = 0.0 -x_noise_strength = 0.05 +x_noise_strength = 0.1 y_noise_strength = 0.1 func = lambda true_x: slope * true_x**2 + intercept diff --git a/EIVPackage/EIVData/sine.py b/EIVPackage/EIVData/sine.py index 308a308..cde80d3 100644 --- a/EIVPackage/EIVData/sine.py +++ b/EIVPackage/EIVData/sine.py @@ -9,7 +9,7 @@ total_number_of_datapoints = 2000 input_range = [-0.2,0.8] intercept = 0.0 x_noise_strength = 0.02 -y_noise_strength = 0.05 +y_noise_strength = 0.02 func = lambda true_x: true_x +\ torch.sin(2 * torch.pi * true_x) +\ torch.sin(4 * torch.pi * true_x) diff --git a/Experiments/configurations/eiv_cubic.json b/Experiments/configurations/eiv_cubic.json index 9f9f7d8..2a3ac2c 100644 --- a/Experiments/configurations/eiv_cubic.json +++ b/Experiments/configurations/eiv_cubic.json @@ -3,7 +3,7 @@ "short_dataname": "cubic", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, @@ -16,7 +16,7 @@ "init_std_y_list": [0.5], "gamma": 0.5, "hidden_layers": [128, 128, 128, 128], - "fixed_std_x": 0.05, + "fixed_std_x": 0.20, "seed_range": [0,10], "gpu_number": 1 } diff --git a/Experiments/configurations/eiv_linear.json b/Experiments/configurations/eiv_linear.json index 5754733..8b7ebe0 100644 --- a/Experiments/configurations/eiv_linear.json +++ b/Experiments/configurations/eiv_linear.json @@ -3,7 +3,7 @@ "short_dataname": "linear", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, @@ -16,7 +16,7 @@ "init_std_y_list": [0.5], "gamma": 0.5, "hidden_layers": [128, 128, 128, 128], - "fixed_std_x": 0.05, + "fixed_std_x": 0.10, "seed_range": [0,10], "gpu_number": 1 } diff --git a/Experiments/configurations/eiv_quadratic.json b/Experiments/configurations/eiv_quadratic.json index 7fd2bad..c774bbe 100644 --- a/Experiments/configurations/eiv_quadratic.json +++ b/Experiments/configurations/eiv_quadratic.json @@ -3,7 +3,7 @@ "short_dataname": "quadratic", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, @@ -16,7 +16,7 @@ "init_std_y_list": [0.5], "gamma": 0.5, "hidden_layers": [128, 128, 128, 128], - "fixed_std_x": 0.05, + "fixed_std_x": 0.10, "seed_range": [0,10], "gpu_number": 1 } diff --git a/Experiments/configurations/eiv_sine.json b/Experiments/configurations/eiv_sine.json index b2cce34..1195ea0 100644 --- a/Experiments/configurations/eiv_sine.json +++ b/Experiments/configurations/eiv_sine.json @@ -3,7 +3,7 @@ "short_dataname": "sine", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, diff --git a/Experiments/configurations/noneiv_cubic.json b/Experiments/configurations/noneiv_cubic.json index 06a1cf3..6f71af1 100644 --- a/Experiments/configurations/noneiv_cubic.json +++ b/Experiments/configurations/noneiv_cubic.json @@ -3,7 +3,7 @@ "short_dataname": "cubic", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, diff --git a/Experiments/configurations/noneiv_linear.json b/Experiments/configurations/noneiv_linear.json index 7e77536..ae3040e 100644 --- a/Experiments/configurations/noneiv_linear.json +++ b/Experiments/configurations/noneiv_linear.json @@ -3,7 +3,7 @@ "short_dataname": "linear", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, diff --git a/Experiments/configurations/noneiv_quadratic.json b/Experiments/configurations/noneiv_quadratic.json index 699cfa7..4052637 100644 --- a/Experiments/configurations/noneiv_quadratic.json +++ b/Experiments/configurations/noneiv_quadratic.json @@ -3,7 +3,7 @@ "short_dataname": "quadratic", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, diff --git a/Experiments/configurations/noneiv_sine.json b/Experiments/configurations/noneiv_sine.json index b7f9e15..cc88919 100644 --- a/Experiments/configurations/noneiv_sine.json +++ b/Experiments/configurations/noneiv_sine.json @@ -3,7 +3,7 @@ "short_dataname": "sine", "normalize": false, "lr": 1e-3, - "batch_size": 64, + "batch_size": 16, "test_batch_size": 800, "number_of_epochs": 100, "unscaled_reg": 10, diff --git a/Experiments/plot_prediction.py b/Experiments/plot_prediction.py index 3d91d48..9ba7fd8 100644 --- a/Experiments/plot_prediction.py +++ b/Experiments/plot_prediction.py @@ -216,9 +216,8 @@ def compute_predictions_and_uncertainties(data, x_range, eiv, number_of_draws, return plotting_dictionary -data_list = ['cubic'] # short datanames -#TODO: Check which ranges are "correct" -list_x_range = [torch.linspace(-2.5,2.5, 50)] +data_list = ['sine'] # short datanames +list_x_range = [torch.linspace(-0.3,0.9, 50)] list_color = [('red','blue')] list_number_of_draws = [((100,5), 100)] for i, (data, x_range, color, number_of_draws) in enumerate(zip(data_list, @@ -258,5 +257,4 @@ for i, (data, x_range, color, number_of_draws) in enumerate(zip(data_list, pass -plt.show() - +plt.show() -- GitLab