From dd715b5c9b35fc78c8a7a52bb0bc50c4fd7a7df2 Mon Sep 17 00:00:00 2001 From: George Simmons Date: Mon, 15 Jan 2024 21:15:32 +0000 Subject: [PATCH] rename src directory --- examples/examples.py | 4 ++-- examples/system_sim_example.py | 4 ++-- {models => psymple}/__init__.py | 0 {models => psymple}/abstract.py | 2 +- {models => psymple}/continuous/__init__.py | 0 {models => psymple}/continuous/cohorts.py | 0 {models => psymple}/continuous/equation.py | 0 {models => psymple}/continuous/examples1.py | 0 {models => psymple}/continuous/examples2.py | 0 {models => psymple}/continuous/examples3.py | 0 {models => psymple}/continuous/parameters.py | 0 {models => psymple}/continuous/system.py | 0 {models => psymple}/custom_functions.py | 0 {models => psymple}/globals.py | 2 +- {models => psymple}/populations.py | 4 ++-- {models => psymple}/system.py | 4 ++-- {models => psymple}/variables.py | 4 ++-- tests/test_basic.py | 4 ++-- tests/test_system.py | 8 ++++---- 19 files changed, 18 insertions(+), 18 deletions(-) rename {models => psymple}/__init__.py (100%) rename {models => psymple}/abstract.py (98%) rename {models => psymple}/continuous/__init__.py (100%) rename {models => psymple}/continuous/cohorts.py (100%) rename {models => psymple}/continuous/equation.py (100%) rename {models => psymple}/continuous/examples1.py (100%) rename {models => psymple}/continuous/examples2.py (100%) rename {models => psymple}/continuous/examples3.py (100%) rename {models => psymple}/continuous/parameters.py (100%) rename {models => psymple}/continuous/system.py (100%) rename {models => psymple}/custom_functions.py (100%) rename {models => psymple}/globals.py (83%) rename {models => psymple}/populations.py (97%) rename {models => psymple}/system.py (99%) rename {models => psymple}/variables.py (99%) diff --git a/examples/examples.py b/examples/examples.py index 1894396..2700b65 100644 --- a/examples/examples.py +++ b/examples/examples.py @@ -2,8 +2,8 @@ import sys sys.path.append(os.path.join(os.path.dirname(__file__),'../')) -from models.populations import IndexedPopulation, Population -from models.variables import Parameter +from psymple.populations import IndexedPopulation, Population +from psymple.variables import Parameter FlyEggs1 = Population("flyeggs1") FlyEggs2 = Population("flyeggs2") diff --git a/examples/system_sim_example.py b/examples/system_sim_example.py index a92a168..7e59651 100644 --- a/examples/system_sim_example.py +++ b/examples/system_sim_example.py @@ -3,8 +3,8 @@ sys.path.append(os.path.join(os.path.dirname(__file__),'../')) # import matplotlib.pyplot as plt -from models.populations import Population -from models.system import System +from psymple.populations import Population +from psymple.system import System A = Population("A", initial_value=100) B = Population("B", initial_value=1) diff --git a/models/__init__.py b/psymple/__init__.py similarity index 100% rename from models/__init__.py rename to psymple/__init__.py diff --git a/models/abstract.py b/psymple/abstract.py similarity index 98% rename from models/abstract.py rename to psymple/abstract.py index 9ad38fa..9078c7e 100644 --- a/models/abstract.py +++ b/psymple/abstract.py @@ -2,7 +2,7 @@ import sympy as sym -from models.globals import sym_custom_ns +from psymple.globals import sym_custom_ns class DependencyError(Exception): diff --git a/models/continuous/__init__.py b/psymple/continuous/__init__.py similarity index 100% rename from models/continuous/__init__.py rename to psymple/continuous/__init__.py diff --git a/models/continuous/cohorts.py b/psymple/continuous/cohorts.py similarity index 100% rename from models/continuous/cohorts.py rename to psymple/continuous/cohorts.py diff --git a/models/continuous/equation.py b/psymple/continuous/equation.py similarity index 100% rename from models/continuous/equation.py rename to psymple/continuous/equation.py diff --git a/models/continuous/examples1.py b/psymple/continuous/examples1.py similarity index 100% rename from models/continuous/examples1.py rename to psymple/continuous/examples1.py diff --git a/models/continuous/examples2.py b/psymple/continuous/examples2.py similarity index 100% rename from models/continuous/examples2.py rename to psymple/continuous/examples2.py diff --git a/models/continuous/examples3.py b/psymple/continuous/examples3.py similarity index 100% rename from models/continuous/examples3.py rename to psymple/continuous/examples3.py diff --git a/models/continuous/parameters.py b/psymple/continuous/parameters.py similarity index 100% rename from models/continuous/parameters.py rename to psymple/continuous/parameters.py diff --git a/models/continuous/system.py b/psymple/continuous/system.py similarity index 100% rename from models/continuous/system.py rename to psymple/continuous/system.py diff --git a/models/custom_functions.py b/psymple/custom_functions.py similarity index 100% rename from models/custom_functions.py rename to psymple/custom_functions.py diff --git a/models/globals.py b/psymple/globals.py similarity index 83% rename from models/globals.py rename to psymple/globals.py index 45d910d..0792191 100644 --- a/models/globals.py +++ b/psymple/globals.py @@ -1,5 +1,5 @@ import sympy as sym -from models.custom_functions import DegreeDays, FFTemperature +from psymple.custom_functions import DegreeDays, FFTemperature # from custom_functions import DegreeDays, FFTemperature diff --git a/models/populations.py b/psymple/populations.py similarity index 97% rename from models/populations.py rename to psymple/populations.py index d7044b2..a2aa12f 100644 --- a/models/populations.py +++ b/psymple/populations.py @@ -1,7 +1,7 @@ import numpy as np -from models.abstract import Container -from models.variables import ( +from psymple.abstract import Container +from psymple.variables import ( Parameter, Parameters, UpdateRule, diff --git a/models/system.py b/psymple/system.py similarity index 99% rename from models/system.py rename to psymple/system.py index 7da8f6b..08c6db1 100644 --- a/models/system.py +++ b/psymple/system.py @@ -4,8 +4,8 @@ import matplotlib.pyplot as plt import networkx as nx -from models.globals import T -from models.variables import ( +from psymple.globals import T +from psymple.variables import ( Parameters, SimParameter, SimUpdateRule, diff --git a/models/variables.py b/psymple/variables.py similarity index 99% rename from models/variables.py rename to psymple/variables.py index 892fd41..3ab7d08 100644 --- a/models/variables.py +++ b/psymple/variables.py @@ -4,8 +4,8 @@ import sympy as sym -from models.abstract import Container, DependencyError, SymbolWrapper -from models.globals import T, sym_custom_ns +from psymple.abstract import Container, DependencyError, SymbolWrapper +from psymple.globals import T, sym_custom_ns class Variable(SymbolWrapper): diff --git a/tests/test_basic.py b/tests/test_basic.py index 4536259..b75316c 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -1,6 +1,6 @@ import unittest -from models.populations import Population -from models.custom_functions import DegreeDays +from psymple.populations import Population +from psymple.custom_functions import DegreeDays # Note: these classes are mostly for structuring tests. diff --git a/tests/test_system.py b/tests/test_system.py index a8b738a..b2b33e2 100644 --- a/tests/test_system.py +++ b/tests/test_system.py @@ -1,10 +1,10 @@ import unittest import sympy as sym -from models.abstract import DependencyError -from models.populations import Population -from models.variables import SimVariable, SimParameter, SimUpdateRule -from models.system import PopulationSystemError, System +from psymple.abstract import DependencyError +from psymple.populations import Population +from psymple.variables import SimVariable, SimParameter, SimUpdateRule +from psymple.system import PopulationSystemError, System class TestInitialization(unittest.TestCase):