renamed organizer -> global_model

harmslab · Sep 17, 2024 · 5715781 · 5715781
1 parent ce72fd9
commit 5715781
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -0,0 +1 @@
+from linkage.global_model.global_model import GlobalModel
diff --git a/src/linkage/organizer/global_model.py → src/linkage/global_model/global_model.py b/src/linkage/organizer/global_model.py → 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 → src/linkage/global_model/point/__init__.py b/src/linkage/organizer/point/__init__.py → src/linkage/global_model/point/__init__.py
diff --git a/...age/organizer/point/experimental_point.py → .../global_model/point/experimental_point.py b/...age/organizer/point/experimental_point.py → .../global_model/point/experimental_point.py
diff --git a/src/linkage/organizer/point/itc_point.py → src/linkage/global_model/point/itc_point.py b/src/linkage/organizer/point/itc_point.py → 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 → src/linkage/global_model/point/spec_point.py b/src/linkage/organizer/point/spec_point.py → src/linkage/global_model/point/spec_point.py
diff --git a/src/linkage/organizer/__init__.py b/src/linkage/organizer/__init__.py
diff --git a/...rganizer/point/test_experimental_point.py → ...al_model/point/test_experimental_point.py b/...rganizer/point/test_experimental_point.py → ...al_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/...linkage/organizer/point/test_itc_point.py → ...kage/global_model/point/test_itc_point.py b/...linkage/organizer/point/test_itc_point.py → ...kage/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/...inkage/organizer/point/test_spec_point.py → ...age/global_model/point/test_spec_point.py b/...inkage/organizer/point/test_spec_point.py → ...age/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 → ...linkage/global_model/test_global_model.py b/tests/linkage/organizer/test_global_model.py → ...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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from linkage.global_model.global_model import GlobalModel