Formatted as a Python library

NISL-MSU · Mar 21, 2024 · 5c7642e · 5c7642e
1 parent 9d336ea
commit 5c7642e
Show file tree

Hide file tree

Showing 23 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 /StatisticsandPlots.py
-/src/DualAQD/models/temp_weights/
+/src/PredictionIntervals/models/temp_weights/
diff --git a/PIGenerator.py b/PIGenerator.py
@@ -7,12 +7,12 @@
 import itertools
 import numpy as np
 import matplotlib.pyplot as plt
-from src.DualAQD.models.NNModel import NNModel
+from src.PredictionIntervals.models.NNModel import NNModel
 from sklearn.model_selection import KFold
-from src.DualAQD.Datasets.GenerateDatasets import DataLoader
+from src.PredictionIntervals.Datasets.GenerateDatasets import DataLoader
 from sklearn.model_selection import train_test_split
 # Functions needed for QD+
-from src.DualAQD.models.aggregation_functions import _split_normal_aggregator  # You can comment it if you only want to test DualAQD
+from src.PredictionIntervals.models.aggregation_functions import _split_normal_aggregator  # You can comment it if you only want to test DualAQD
 
 
 class PIGenerator:

diff --git a/src/DualAQD/Datasets/GenerateDatasets.py → ...ionIntervals/Datasets/GenerateDatasets.py b/src/DualAQD/Datasets/GenerateDatasets.py → ...ionIntervals/Datasets/GenerateDatasets.py
diff --git a/src/DualAQD/Datasets/__init__.py → src/PredictionIntervals/Datasets/__init__.py b/src/DualAQD/Datasets/__init__.py → src/PredictionIntervals/Datasets/__init__.py
diff --git a/src/DualAQD/Datasets/boston_housing_data.csv → ...ntervals/Datasets/boston_housing_data.csv b/src/DualAQD/Datasets/boston_housing_data.csv → ...ntervals/Datasets/boston_housing_data.csv
diff --git a/src/DualAQD/Datasets/concrete_data.csv → ...ctionIntervals/Datasets/concrete_data.csv b/src/DualAQD/Datasets/concrete_data.csv → ...ctionIntervals/Datasets/concrete_data.csv
diff --git a/src/DualAQD/Datasets/energy_data.csv → ...dictionIntervals/Datasets/energy_data.csv b/src/DualAQD/Datasets/energy_data.csv → ...dictionIntervals/Datasets/energy_data.csv
diff --git a/src/DualAQD/Datasets/kin8nm_data.csv → ...dictionIntervals/Datasets/kin8nm_data.csv b/src/DualAQD/Datasets/kin8nm_data.csv → ...dictionIntervals/Datasets/kin8nm_data.csv
diff --git a/src/DualAQD/Datasets/naval_data.csv → ...edictionIntervals/Datasets/naval_data.csv b/src/DualAQD/Datasets/naval_data.csv → ...edictionIntervals/Datasets/naval_data.csv
diff --git a/src/DualAQD/Datasets/power_data.csv → ...edictionIntervals/Datasets/power_data.csv b/src/DualAQD/Datasets/power_data.csv → ...edictionIntervals/Datasets/power_data.csv
diff --git a/src/DualAQD/Datasets/protein_data.csv → ...ictionIntervals/Datasets/protein_data.csv b/src/DualAQD/Datasets/protein_data.csv → ...ictionIntervals/Datasets/protein_data.csv
diff --git a/src/DualAQD/Datasets/winequality-red.csv → ...ionIntervals/Datasets/winequality-red.csv b/src/DualAQD/Datasets/winequality-red.csv → ...ionIntervals/Datasets/winequality-red.csv
diff --git a/src/DualAQD/Datasets/yacht_data.csv → ...edictionIntervals/Datasets/yacht_data.csv b/src/DualAQD/Datasets/yacht_data.csv → ...edictionIntervals/Datasets/yacht_data.csv
diff --git a/src/DualAQD/Datasets/yearMSD_data.csv → ...ictionIntervals/Datasets/yearMSD_data.csv b/src/DualAQD/Datasets/yearMSD_data.csv → ...ictionIntervals/Datasets/yearMSD_data.csv
diff --git a/src/DualAQD/Trainer/TrainNN.py → src/PredictionIntervals/Trainer/TrainNN.py b/src/DualAQD/Trainer/TrainNN.py → src/PredictionIntervals/Trainer/TrainNN.py
@@ -2,7 +2,7 @@
 import pickle
 from src.utils import *
 from sklearn.model_selection import KFold
-from src.DualAQD.models.NNModel import NNModel
+from src.PredictionIntervals.models.NNModel import NNModel
 
 
 class Trainer:
@@ -46,9 +46,9 @@ def train(self, batch_size=32, epochs=500, eta_=0.01, printProcess=True, normDat
         """
         # If the temp folder does not exist, create it
         root = get_project_root()
-        folder = os.path.join(root, "src//DualAQD//models//temp_weights")
-        if not os.path.exists(os.path.join(root, "src//DualAQD//models//temp_weights")):
-            os.mkdir(os.path.join(root, "src//DualAQD//models//temp_weights"))
+        folder = os.path.join(root, "src//PredictionIntervals//models//temp_weights")
+        if not os.path.exists(os.path.join(root, "src//PredictionIntervals//models//temp_weights")):
+            os.mkdir(os.path.join(root, "src//PredictionIntervals//models//temp_weights"))
         if not os.path.exists(folder):
             os.mkdir(folder)
 

diff --git a/src/DualAQD/Trainer/__init__.py → src/PredictionIntervals/Trainer/__init__.py b/src/DualAQD/Trainer/__init__.py → src/PredictionIntervals/Trainer/__init__.py
diff --git a/src/DualAQD/__init__.py → src/PredictionIntervals/__init__.py b/src/DualAQD/__init__.py → src/PredictionIntervals/__init__.py
diff --git a/src/DualAQD/models/NNModel.py → src/PredictionIntervals/models/NNModel.py b/src/DualAQD/models/NNModel.py → src/PredictionIntervals/models/NNModel.py
@@ -7,7 +7,7 @@
 from src import utils
 from tqdm import trange
 from torch import optim
-from src.DualAQD.models.network import *
+from src.PredictionIntervals.models.network import *
 
 
 # import matplotlib.pyplot as plt

diff --git a/src/DualAQD/models/QD_toy_example.ipynb → ...tionIntervals/models/QD_toy_example.ipynb b/src/DualAQD/models/QD_toy_example.ipynb → ...tionIntervals/models/QD_toy_example.ipynb
diff --git a/src/DualAQD/models/__init__.py → src/PredictionIntervals/models/__init__.py b/src/DualAQD/models/__init__.py → src/PredictionIntervals/models/__init__.py
diff --git a/src/DualAQD/models/aggregation_functions.py → ...Intervals/models/aggregation_functions.py b/src/DualAQD/models/aggregation_functions.py → ...Intervals/models/aggregation_functions.py
diff --git a/src/DualAQD/models/network.py → src/PredictionIntervals/models/network.py b/src/DualAQD/models/network.py → src/PredictionIntervals/models/network.py
diff --git a/src/DualAQD/models/split_normal.py → ...redictionIntervals/models/split_normal.py b/src/DualAQD/models/split_normal.py → ...redictionIntervals/models/split_normal.py