diff --git a/districtgenerator/EHDO/__init__.py b/districtgenerator/EHDO/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/districtgenerator/EHDO/clustering_medoid.py b/districtgenerator/EHDO/clustering_medoid.py index 440609d..632327c 100644 --- a/districtgenerator/EHDO/clustering_medoid.py +++ b/districtgenerator/EHDO/clustering_medoid.py @@ -18,7 +18,8 @@ from __future__ import division import numpy as np import math -import EHDO.k_medoids as k_medoids +import districtgenerator.EHDO.k_medoids as k_medoids + def _distances(values, norm=2): """ diff --git a/districtgenerator/EHDO/load_params.py b/districtgenerator/EHDO/load_params.py index a84fa37..8bba39f 100644 --- a/districtgenerator/EHDO/load_params.py +++ b/districtgenerator/EHDO/load_params.py @@ -16,14 +16,14 @@ import numpy as np import math -import EHDO.clustering_medoid as clustering +import districtgenerator.EHDO.clustering_medoid as clustering import time import os import csv import json import copy import sys -import EHDO.solar_modeling as solar_modeling +import districtgenerator.EHDO.solar_modeling as solar_modeling def load_params(data): diff --git a/districtgenerator/classes/participants/aggregator.py b/districtgenerator/classes/participants/aggregator.py index 83086a2..ef12690 100644 --- a/districtgenerator/classes/participants/aggregator.py +++ b/districtgenerator/classes/participants/aggregator.py @@ -1,6 +1,5 @@ import gurobipy as gp -from .device import Device - +from districtgenerator.classes.participants.device import Device class Aggregator(Device): """ Switch Unit model """ diff --git a/districtgenerator/classes/participants/centralEnergyUnit.py b/districtgenerator/classes/participants/centralEnergyUnit.py index 428a196..0ebabf2 100644 --- a/districtgenerator/classes/participants/centralEnergyUnit.py +++ b/districtgenerator/classes/participants/centralEnergyUnit.py @@ -1,5 +1,5 @@ import gurobipy as gp -from .device import Device +from districtgenerator.classes.participants.device import Device class CentralEnergyUnit(Device): diff --git a/districtgenerator/classes/participants/house.py b/districtgenerator/classes/participants/house.py index dd96dc9..64f9264 100644 --- a/districtgenerator/classes/participants/house.py +++ b/districtgenerator/classes/participants/house.py @@ -1,5 +1,5 @@ import gurobipy as gp -from .device import Device +from districtgenerator.classes.participants.device import Device class House(Device): diff --git a/districtgenerator/functions/__init__.py b/districtgenerator/functions/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/districtgenerator/functions/clustering_medoid.py b/districtgenerator/functions/clustering_medoid.py index 2360def..cf5db9a 100644 --- a/districtgenerator/functions/clustering_medoid.py +++ b/districtgenerator/functions/clustering_medoid.py @@ -3,7 +3,7 @@ from __future__ import division import numpy as np import math -import functions.k_medoids as k_medoids +import districtgenerator.functions.k_medoids as k_medoids def _distances(values, norm=2): diff --git a/districtgenerator/functions/dhw_stochastical.py b/districtgenerator/functions/dhw_stochastical.py index 5be6717..2499311 100644 --- a/districtgenerator/functions/dhw_stochastical.py +++ b/districtgenerator/functions/dhw_stochastical.py @@ -11,7 +11,7 @@ import numpy as np import math import random -import functions.change_resolution as chres +import districtgenerator.functions.change_resolution as chres import pylightxl as xl def load_profiles(filename): diff --git a/districtgenerator/functions/load_params_central_devices.py b/districtgenerator/functions/load_params_central_devices.py index e6b50da..1355825 100644 --- a/districtgenerator/functions/load_params_central_devices.py +++ b/districtgenerator/functions/load_params_central_devices.py @@ -16,14 +16,14 @@ import numpy as np import math -import EHDO.clustering_medoid as clustering +import districtgenerator.EHDO.clustering_medoid as clustering import time import os import csv import json import copy import sys -import EHDO.solar_modeling as solar_modeling +import districtgenerator.EHDO.solar_modeling as solar_modeling def load_params(data):