From ca8269b5388a2e095ac1282befb47f3764fe7938 Mon Sep 17 00:00:00 2001 From: Deepak Date: Mon, 6 Sep 2021 11:46:11 -0500 Subject: [PATCH] Moves static model to its own module --- pathfinder/model/__init__.py | 5 --- pathfinder/model/static/__init__.py | 5 +++ pathfinder/model/{ => static}/dot.py | 0 pathfinder/model/{ => static}/model.py | 2 +- pathfinder/model/{ => static}/staticdipole.py | 2 +- tests/model/{ => static}/test_dot.py | 2 +- tests/model/{ => static}/test_model.py | 2 +- tests/model/{ => static}/test_model_sol.py | 40 +++++++++---------- tests/model/{ => static}/test_staticdipole.py | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 pathfinder/model/static/__init__.py rename pathfinder/model/{ => static}/dot.py (100%) rename pathfinder/model/{ => static}/model.py (96%) rename pathfinder/model/{ => static}/staticdipole.py (96%) rename tests/model/{ => static}/test_dot.py (97%) rename tests/model/{ => static}/test_model.py (98%) rename tests/model/{ => static}/test_model_sol.py (73%) rename tests/model/{ => static}/test_staticdipole.py (95%) diff --git a/pathfinder/model/__init__.py b/pathfinder/model/__init__.py index 1425108..e69de29 100644 --- a/pathfinder/model/__init__.py +++ b/pathfinder/model/__init__.py @@ -1,5 +0,0 @@ -from pathfinder.model.dot import DotMeasurement -from pathfinder.model.model import DotDipoleModel -from pathfinder.model.staticdipole import StaticDipoleArrangement, StaticDipole - -__all__ = ['DotMeasurement', 'DotDipoleModel', 'StaticDipoleArrangement', 'StaticDipole'] diff --git a/pathfinder/model/static/__init__.py b/pathfinder/model/static/__init__.py new file mode 100644 index 0000000..f0076ee --- /dev/null +++ b/pathfinder/model/static/__init__.py @@ -0,0 +1,5 @@ +from pathfinder.model.static.dot import DotMeasurement +from pathfinder.model.static.model import DotDipoleModel +from pathfinder.model.static.staticdipole import StaticDipoleArrangement, StaticDipole + +__all__ = ['DotMeasurement', 'DotDipoleModel', 'StaticDipoleArrangement', 'StaticDipole'] diff --git a/pathfinder/model/dot.py b/pathfinder/model/static/dot.py similarity index 100% rename from pathfinder/model/dot.py rename to pathfinder/model/static/dot.py diff --git a/pathfinder/model/model.py b/pathfinder/model/static/model.py similarity index 96% rename from pathfinder/model/model.py rename to pathfinder/model/static/model.py index 7c49b1c..01c2356 100644 --- a/pathfinder/model/model.py +++ b/pathfinder/model/static/model.py @@ -1,7 +1,7 @@ from typing import Callable, Sequence import numpy import scipy.optimize -from pathfinder.model.dot import DotMeasurement +from pathfinder.model.static.dot import DotMeasurement class DotDipoleModel(): diff --git a/pathfinder/model/staticdipole.py b/pathfinder/model/static/staticdipole.py similarity index 96% rename from pathfinder/model/staticdipole.py rename to pathfinder/model/static/staticdipole.py index 14f12be..622ae8c 100644 --- a/pathfinder/model/staticdipole.py +++ b/pathfinder/model/static/staticdipole.py @@ -2,7 +2,7 @@ from dataclasses import dataclass import numpy import numpy.typing from typing import Sequence, List -from pathfinder.model.dot import DotMeasurement +from pathfinder.model.static.dot import DotMeasurement @dataclass diff --git a/tests/model/test_dot.py b/tests/model/static/test_dot.py similarity index 97% rename from tests/model/test_dot.py rename to tests/model/static/test_dot.py index 837fc49..5b460f5 100644 --- a/tests/model/test_dot.py +++ b/tests/model/static/test_dot.py @@ -1,7 +1,7 @@ import numpy import numpy.testing -import pathfinder.model as model +import pathfinder.model.static as model def test_dot(): diff --git a/tests/model/test_model.py b/tests/model/static/test_model.py similarity index 98% rename from tests/model/test_model.py rename to tests/model/static/test_model.py index 64ec1b5..6ac3265 100644 --- a/tests/model/test_model.py +++ b/tests/model/static/test_model.py @@ -1,5 +1,5 @@ import numpy -import pathfinder.model as model +import pathfinder.model.static as model def test_dotdipolemodel_repr(): diff --git a/tests/model/test_model_sol.py b/tests/model/static/test_model_sol.py similarity index 73% rename from tests/model/test_model_sol.py rename to tests/model/static/test_model_sol.py index 9c0c6a6..0317460 100644 --- a/tests/model/test_model_sol.py +++ b/tests/model/static/test_model_sol.py @@ -1,5 +1,5 @@ import numpy -import pathfinder.model +import pathfinder.model.static import pytest @@ -28,12 +28,12 @@ def print_result(msg, result): def test_one_dipole_six_dot(): # setup dot_positions = [[0, 0, 0], [-1, 0, 0], [-2, 0, 0], [-1, -1, 0], [-1, -1, 1], [0, -2, 0]] - dipole = pathfinder.model.StaticDipole([1, 2, 3], [0, 4, 0]) + dipole = pathfinder.model.static.StaticDipole([1, 2, 3], [0, 4, 0]) expected_result = numpy.array([1, 2, 3, 0, 4, 0]) - dipole_arrangement = pathfinder.model.StaticDipoleArrangement([dipole]) + dipole_arrangement = pathfinder.model.static.StaticDipoleArrangement([dipole]) dot_measurements = dipole_arrangement.get_dot_measurements(dot_positions) - model = pathfinder.model.DotDipoleModel(dot_measurements, 1) + model = pathfinder.model.static.DotDipoleModel(dot_measurements, 1) res = model.sol() print_result("one dipole six dots", res) @@ -46,13 +46,13 @@ def test_two_dipole_thirteen_dot(): dot_positions = [[x, y, 0] for x in (-4, -1, 1, 4) for y in (-1, -5, -9)] dot_positions.append((1, -1, 2)) # dot_positions.append((-1, -1, -2)) - dipole = pathfinder.model.StaticDipole([0, 8, 0], [0, 5, 0]) - dipole2 = pathfinder.model.StaticDipole([8, 1, 1], [2, 2, -2]) + dipole = pathfinder.model.static.StaticDipole([0, 8, 0], [0, 5, 0]) + dipole2 = pathfinder.model.static.StaticDipole([8, 1, 1], [2, 2, -2]) expected_result = numpy.array([0, 8, 0, 0, 5, 0, 8, 1, 1, 2, 2, -2]) - dipole_arrangement = pathfinder.model.StaticDipoleArrangement([dipole, dipole2]) + dipole_arrangement = pathfinder.model.static.StaticDipoleArrangement([dipole, dipole2]) dot_measurements = dipole_arrangement.get_dot_measurements(dot_positions) - model = pathfinder.model.DotDipoleModel(dot_measurements, 2) + model = pathfinder.model.static.DotDipoleModel(dot_measurements, 2) res = model.sol(initial_dipole=(2, 2, 0), initial_position=(0, 3, 0)) print(model.costs()(res.x)) print(res.x) @@ -66,13 +66,13 @@ def test_two_dipole_twelve_dot(): dot_positions = [[x, y, 0] for x in (-4, -1, 1, 4) for y in (-1, -5, -9)][:-1] dot_positions.append((1, -1, 2)) # dot_positions.append((-1, -1, -2)) - dipole = pathfinder.model.StaticDipole([0, 8, 0], [0, 5, 0]) - dipole2 = pathfinder.model.StaticDipole([8, 1, 1], [2, 2, -2]) + dipole = pathfinder.model.static.StaticDipole([0, 8, 0], [0, 5, 0]) + dipole2 = pathfinder.model.static.StaticDipole([8, 1, 1], [2, 2, -2]) expected_result = numpy.array([0, 8, 0, 0, 5, 0, 8, 1, 1, 2, 2, -2]) - dipole_arrangement = pathfinder.model.StaticDipoleArrangement([dipole, dipole2]) + dipole_arrangement = pathfinder.model.static.StaticDipoleArrangement([dipole, dipole2]) dot_measurements = dipole_arrangement.get_dot_measurements(dot_positions) - model = pathfinder.model.DotDipoleModel(dot_measurements, 2) + model = pathfinder.model.static.DotDipoleModel(dot_measurements, 2) res = model.sol(initial_dipole=(2, 2, 0), initial_position=(0, 3, 0), use_root=False) print(model.costs()(res.x)) print(res.x) @@ -86,13 +86,13 @@ def test_two_dipole_twelve_dot_smallguy(): dot_positions = [[x, y, 0] for x in (-4, -1, 1, 4) for y in (-1, -5, -9)][:-1] dot_positions.append((1, -1, 2)) # dot_positions.append((-1, -1, -2)) - dipole = pathfinder.model.StaticDipole([0, 1, 0], [0, 5, 0]) - dipole2 = pathfinder.model.StaticDipole([8, 1, 1], [2, 2, -2]) + dipole = pathfinder.model.static.StaticDipole([0, 1, 0], [0, 5, 0]) + dipole2 = pathfinder.model.static.StaticDipole([8, 1, 1], [2, 2, -2]) expected_result = numpy.array([0, 1, 0, 0, 5, 0, 8, 1, 1, 2, 2, -2]) - dipole_arrangement = pathfinder.model.StaticDipoleArrangement([dipole, dipole2]) + dipole_arrangement = pathfinder.model.static.StaticDipoleArrangement([dipole, dipole2]) dot_measurements = dipole_arrangement.get_dot_measurements(dot_positions) - model = pathfinder.model.DotDipoleModel(dot_measurements, 2) + model = pathfinder.model.static.DotDipoleModel(dot_measurements, 2) res = model.sol(initial_dipole=(2, 2, 0), initial_position=(0, 3, 0), use_root=False) print(model.costs()(res.x)) print(res.x) @@ -105,13 +105,13 @@ def test_two_dipole_twelve_dot_2(): dot_positions = [[x, y, 0] for x in (-4, -1, 1, 4) for y in (-1, -5, -9)] dot_positions.append((1, -1, 2)) dot_positions.append((-1, -1, -2)) - dipole = pathfinder.model.StaticDipole([0, 8, 0], [0, 5, 0]) - dipole2 = pathfinder.model.StaticDipole([8, 1, 1], [2, 2, -2]) + dipole = pathfinder.model.static.StaticDipole([0, 8, 0], [0, 5, 0]) + dipole2 = pathfinder.model.static.StaticDipole([8, 1, 1], [2, 2, -2]) expected_result = numpy.array([0, 8, 0, 0, 5, 0, 8, 1, 1, 2, 2, -2]) - dipole_arrangement = pathfinder.model.StaticDipoleArrangement([dipole, dipole2]) + dipole_arrangement = pathfinder.model.static.StaticDipoleArrangement([dipole, dipole2]) dot_measurements = dipole_arrangement.get_dot_measurements(dot_positions) - model = pathfinder.model.DotDipoleModel(dot_measurements, 2) + model = pathfinder.model.static.DotDipoleModel(dot_measurements, 2) res = model.sol() print(model.costs()(res.x)) diff --git a/tests/model/test_staticdipole.py b/tests/model/static/test_staticdipole.py similarity index 95% rename from tests/model/test_staticdipole.py rename to tests/model/static/test_staticdipole.py index 3ee1298..96e9c92 100644 --- a/tests/model/test_staticdipole.py +++ b/tests/model/static/test_staticdipole.py @@ -1,5 +1,5 @@ import numpy -import pathfinder.model as model +import pathfinder.model.static as model def test_static_dipole():