From 57157817a60c159e7410fff5c317b232e6c7a069 Mon Sep 17 00:00:00 2001 From: Michael Harms Date: Tue, 17 Sep 2024 11:48:45 -0700 Subject: [PATCH] renamed organizer -> global_model --- src/linkage/__init__.py | 2 +- src/linkage/global_model/__init__.py | 1 + src/linkage/{organizer => global_model}/global_model.py | 4 ++-- src/linkage/{organizer => global_model}/point/__init__.py | 0 .../{organizer => global_model}/point/experimental_point.py | 0 src/linkage/{organizer => global_model}/point/itc_point.py | 2 +- src/linkage/{organizer => global_model}/point/spec_point.py | 0 src/linkage/organizer/__init__.py | 1 - .../point/test_experimental_point.py | 2 +- .../{organizer => global_model}/point/test_itc_point.py | 2 +- .../{organizer => global_model}/point/test_spec_point.py | 2 +- .../{organizer => global_model}/test_global_model.py | 6 +++--- 12 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/linkage/global_model/__init__.py rename src/linkage/{organizer => global_model}/global_model.py (99%) rename src/linkage/{organizer => global_model}/point/__init__.py (100%) rename src/linkage/{organizer => global_model}/point/experimental_point.py (100%) rename src/linkage/{organizer => global_model}/point/itc_point.py (98%) rename src/linkage/{organizer => global_model}/point/spec_point.py (100%) delete mode 100644 src/linkage/organizer/__init__.py rename tests/linkage/{organizer => global_model}/point/test_experimental_point.py (93%) rename tests/linkage/{organizer => global_model}/point/test_itc_point.py (98%) rename tests/linkage/{organizer => global_model}/point/test_spec_point.py (98%) rename tests/linkage/{organizer => global_model}/test_global_model.py (98%) diff --git a/src/linkage/__init__.py b/src/linkage/__init__.py index 8d73d49..1ad538c 100644 --- a/src/linkage/__init__.py +++ b/src/linkage/__init__.py @@ -1,6 +1,6 @@ import linkage from linkage.experiment import Experiment -from linkage.organizer import GlobalModel +from linkage.global_model import GlobalModel # Make a list of all classes in linkage.models diff --git a/src/linkage/global_model/__init__.py b/src/linkage/global_model/__init__.py new file mode 100644 index 0000000..40fbe81 --- /dev/null +++ b/src/linkage/global_model/__init__.py @@ -0,0 +1 @@ +from linkage.global_model.global_model import GlobalModel \ No newline at end of file diff --git a/src/linkage/organizer/global_model.py b/src/linkage/global_model/global_model.py similarity index 99% rename from src/linkage/organizer/global_model.py rename to src/linkage/global_model/global_model.py index 3b3f825..d409f8c 100644 --- a/src/linkage/organizer/global_model.py +++ b/src/linkage/global_model/global_model.py @@ -1,6 +1,6 @@ import linkage.models -from linkage.organizer.point.spec_point import SpecPoint -from linkage.organizer.point.itc_point import ITCPoint +from linkage.global_model.point.spec_point import SpecPoint +from linkage.global_model.point.itc_point import ITCPoint import numpy as np import pandas as pd diff --git a/src/linkage/organizer/point/__init__.py b/src/linkage/global_model/point/__init__.py similarity index 100% rename from src/linkage/organizer/point/__init__.py rename to src/linkage/global_model/point/__init__.py diff --git a/src/linkage/organizer/point/experimental_point.py b/src/linkage/global_model/point/experimental_point.py similarity index 100% rename from src/linkage/organizer/point/experimental_point.py rename to src/linkage/global_model/point/experimental_point.py diff --git a/src/linkage/organizer/point/itc_point.py b/src/linkage/global_model/point/itc_point.py similarity index 98% rename from src/linkage/organizer/point/itc_point.py rename to src/linkage/global_model/point/itc_point.py index d8fda8f..4298e83 100644 --- a/src/linkage/organizer/point/itc_point.py +++ b/src/linkage/global_model/point/itc_point.py @@ -1,5 +1,5 @@ -from linkage.organizer.point.experimental_point import ExperimentalPoint +from linkage.global_model.point.experimental_point import ExperimentalPoint import numpy as np diff --git a/src/linkage/organizer/point/spec_point.py b/src/linkage/global_model/point/spec_point.py similarity index 100% rename from src/linkage/organizer/point/spec_point.py rename to src/linkage/global_model/point/spec_point.py diff --git a/src/linkage/organizer/__init__.py b/src/linkage/organizer/__init__.py deleted file mode 100644 index 691a4b0..0000000 --- a/src/linkage/organizer/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from linkage.organizer.global_model import GlobalModel \ No newline at end of file diff --git a/tests/linkage/organizer/point/test_experimental_point.py b/tests/linkage/global_model/point/test_experimental_point.py similarity index 93% rename from tests/linkage/organizer/point/test_experimental_point.py rename to tests/linkage/global_model/point/test_experimental_point.py index b2aee13..5cf5245 100644 --- a/tests/linkage/organizer/point/test_experimental_point.py +++ b/tests/linkage/global_model/point/test_experimental_point.py @@ -1,5 +1,5 @@ -from linkage.organizer.point.experimental_point import ExperimentalPoint +from linkage.global_model.point.experimental_point import ExperimentalPoint import numpy as np diff --git a/tests/linkage/organizer/point/test_itc_point.py b/tests/linkage/global_model/point/test_itc_point.py similarity index 98% rename from tests/linkage/organizer/point/test_itc_point.py rename to tests/linkage/global_model/point/test_itc_point.py index 2a30b2e..06b93b6 100644 --- a/tests/linkage/organizer/point/test_itc_point.py +++ b/tests/linkage/global_model/point/test_itc_point.py @@ -1,5 +1,5 @@ -from linkage.organizer.point.itc_point import ITCPoint +from linkage.global_model.point.itc_point import ITCPoint import numpy as np diff --git a/tests/linkage/organizer/point/test_spec_point.py b/tests/linkage/global_model/point/test_spec_point.py similarity index 98% rename from tests/linkage/organizer/point/test_spec_point.py rename to tests/linkage/global_model/point/test_spec_point.py index f50e324..4f38f13 100644 --- a/tests/linkage/organizer/point/test_spec_point.py +++ b/tests/linkage/global_model/point/test_spec_point.py @@ -1,5 +1,5 @@ -from linkage.organizer.point.spec_point import SpecPoint +from linkage.global_model.point.spec_point import SpecPoint import numpy as np diff --git a/tests/linkage/organizer/test_global_model.py b/tests/linkage/global_model/test_global_model.py similarity index 98% rename from tests/linkage/organizer/test_global_model.py rename to tests/linkage/global_model/test_global_model.py index 24175e6..2242743 100644 --- a/tests/linkage/organizer/test_global_model.py +++ b/tests/linkage/global_model/test_global_model.py @@ -3,9 +3,9 @@ import pytest import linkage -from linkage.organizer.global_model import GlobalModel -from linkage.organizer.point.spec_point import SpecPoint -from linkage.organizer.point.itc_point import ITCPoint +from linkage.global_model.global_model import GlobalModel +from linkage.global_model.point.spec_point import SpecPoint +from linkage.global_model.point.itc_point import ITCPoint from linkage.experiment.experiment import Experiment