diff --git a/src/adler/__init__.py b/src/adler/__init__.py index 6d46c05..827ef62 100644 --- a/src/adler/__init__.py +++ b/src/adler/__init__.py @@ -1,4 +1,4 @@ -from . import dataclasses +from . import objectdata from . import science from . import utilities from . import lasair diff --git a/src/adler/adler.py b/src/adler/adler.py index 3622867..e0eb551 100644 --- a/src/adler/adler.py +++ b/src/adler/adler.py @@ -7,8 +7,8 @@ import matplotlib.gridspec as gridspec import os -from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid -from adler.dataclasses.AdlerData import AdlerData +from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid +from adler.objectdata.AdlerData import AdlerData from adler.science.PhaseCurve import PhaseCurve from adler.science.Colour import col_obs_ref from adler.utilities.AdlerCLIArguments import AdlerCLIArguments diff --git a/src/adler/dataclasses/AdlerData.py b/src/adler/objectdata/AdlerData.py similarity index 100% rename from src/adler/dataclasses/AdlerData.py rename to src/adler/objectdata/AdlerData.py diff --git a/src/adler/dataclasses/AdlerPlanetoid.py b/src/adler/objectdata/AdlerPlanetoid.py similarity index 98% rename from src/adler/dataclasses/AdlerPlanetoid.py rename to src/adler/objectdata/AdlerPlanetoid.py index 162af1b..0095099 100644 --- a/src/adler/dataclasses/AdlerPlanetoid.py +++ b/src/adler/objectdata/AdlerPlanetoid.py @@ -4,11 +4,11 @@ import logging import json -from adler.dataclasses.Observations import Observations -from adler.dataclasses.MPCORB import MPCORB -from adler.dataclasses.SSObject import SSObject -from adler.dataclasses.AdlerData import AdlerData -from adler.dataclasses.dataclass_utilities import get_data_table +from adler.objectdata.Observations import Observations +from adler.objectdata.MPCORB import MPCORB +from adler.objectdata.SSObject import SSObject +from adler.objectdata.AdlerData import AdlerData +from adler.objectdata.objectdata_utilities import get_data_table logger = logging.getLogger(__name__) diff --git a/src/adler/dataclasses/MPCORB.py b/src/adler/objectdata/MPCORB.py similarity index 98% rename from src/adler/dataclasses/MPCORB.py rename to src/adler/objectdata/MPCORB.py index 237df1d..d4a7880 100644 --- a/src/adler/dataclasses/MPCORB.py +++ b/src/adler/objectdata/MPCORB.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from adler.dataclasses.dataclass_utilities import get_from_table, get_from_dictionary +from adler.objectdata.objectdata_utilities import get_from_table, get_from_dictionary MPCORB_KEYS = { "mpcDesignation": str, diff --git a/src/adler/dataclasses/Observations.py b/src/adler/objectdata/Observations.py similarity index 99% rename from src/adler/dataclasses/Observations.py rename to src/adler/objectdata/Observations.py index a76a472..0961b2a 100644 --- a/src/adler/dataclasses/Observations.py +++ b/src/adler/objectdata/Observations.py @@ -1,7 +1,7 @@ from dataclasses import dataclass, field import numpy as np -from adler.dataclasses.dataclass_utilities import get_from_table, get_from_dictionary +from adler.objectdata.objectdata_utilities import get_from_table, get_from_dictionary OBSERVATIONS_KEYS = { "diaSourceId": np.ndarray, diff --git a/src/adler/dataclasses/SSObject.py b/src/adler/objectdata/SSObject.py similarity index 98% rename from src/adler/dataclasses/SSObject.py rename to src/adler/objectdata/SSObject.py index c0ba468..2388889 100644 --- a/src/adler/dataclasses/SSObject.py +++ b/src/adler/objectdata/SSObject.py @@ -1,7 +1,7 @@ from dataclasses import dataclass, field import numpy as np -from adler.dataclasses.dataclass_utilities import get_from_table, get_from_dictionary +from adler.objectdata.objectdata_utilities import get_from_table, get_from_dictionary SSO_KEYS = { "discoverySubmissionDate": float, diff --git a/src/adler/dataclasses/__init__.py b/src/adler/objectdata/__init__.py similarity index 77% rename from src/adler/dataclasses/__init__.py rename to src/adler/objectdata/__init__.py index 9b7a7df..9e2f367 100644 --- a/src/adler/dataclasses/__init__.py +++ b/src/adler/objectdata/__init__.py @@ -1,6 +1,6 @@ from . import AdlerData from . import Observations -from . import dataclass_utilities +from . import objectdata_utilities from . import MPCORB from . import AdlerPlanetoid from . import SSObject diff --git a/src/adler/dataclasses/dataclass_utilities.py b/src/adler/objectdata/objectdata_utilities.py similarity index 100% rename from src/adler/dataclasses/dataclass_utilities.py rename to src/adler/objectdata/objectdata_utilities.py diff --git a/tests/adler/dataclasses/test_AdlerData.py b/tests/adler/objectdata/test_AdlerData.py similarity index 99% rename from tests/adler/dataclasses/test_AdlerData.py rename to tests/adler/objectdata/test_AdlerData.py index 6c1e1e2..dd4af55 100644 --- a/tests/adler/dataclasses/test_AdlerData.py +++ b/tests/adler/objectdata/test_AdlerData.py @@ -6,7 +6,7 @@ from numpy.testing import assert_array_equal -from adler.dataclasses.AdlerData import AdlerData +from adler.objectdata.AdlerData import AdlerData from adler.utilities.tests_utilities import get_test_data_filepath # setting up the AdlerData object to be used for testing diff --git a/tests/adler/dataclasses/test_AdlerPlanetoid.py b/tests/adler/objectdata/test_AdlerPlanetoid.py similarity index 99% rename from tests/adler/dataclasses/test_AdlerPlanetoid.py rename to tests/adler/objectdata/test_AdlerPlanetoid.py index 992925a..4716b64 100644 --- a/tests/adler/dataclasses/test_AdlerPlanetoid.py +++ b/tests/adler/objectdata/test_AdlerPlanetoid.py @@ -3,7 +3,7 @@ from numpy.testing import assert_almost_equal from adler.utilities.tests_utilities import get_test_data_filepath -from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid +from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid ssoid = 8268570668335894776 diff --git a/tests/adler/dataclasses/test_MPCORB.py b/tests/adler/objectdata/test_MPCORB.py similarity index 94% rename from tests/adler/dataclasses/test_MPCORB.py rename to tests/adler/objectdata/test_MPCORB.py index ee43b3d..10591d1 100644 --- a/tests/adler/dataclasses/test_MPCORB.py +++ b/tests/adler/objectdata/test_MPCORB.py @@ -1,8 +1,8 @@ from numpy.testing import assert_almost_equal import numpy as np -from adler.dataclasses.MPCORB import MPCORB -from adler.dataclasses.dataclass_utilities import get_data_table +from adler.objectdata.MPCORB import MPCORB +from adler.objectdata.objectdata_utilities import get_data_table from adler.utilities.tests_utilities import get_test_data_filepath diff --git a/tests/adler/dataclasses/test_Observations.py b/tests/adler/objectdata/test_Observations.py similarity index 97% rename from tests/adler/dataclasses/test_Observations.py rename to tests/adler/objectdata/test_Observations.py index 72edd4d..830011e 100644 --- a/tests/adler/dataclasses/test_Observations.py +++ b/tests/adler/objectdata/test_Observations.py @@ -1,8 +1,8 @@ from numpy.testing import assert_almost_equal import numpy as np -from adler.dataclasses.Observations import Observations -from adler.dataclasses.dataclass_utilities import get_data_table +from adler.objectdata.Observations import Observations +from adler.objectdata.objectdata_utilities import get_data_table from adler.utilities.tests_utilities import get_test_data_filepath diff --git a/tests/adler/dataclasses/test_SSObject.py b/tests/adler/objectdata/test_SSObject.py similarity index 95% rename from tests/adler/dataclasses/test_SSObject.py rename to tests/adler/objectdata/test_SSObject.py index b6cb05b..f99eb78 100644 --- a/tests/adler/dataclasses/test_SSObject.py +++ b/tests/adler/objectdata/test_SSObject.py @@ -3,8 +3,8 @@ import numpy as np from adler.utilities.tests_utilities import get_test_data_filepath -from adler.dataclasses.dataclass_utilities import get_data_table -from adler.dataclasses.SSObject import SSObject +from adler.objectdata.objectdata_utilities import get_data_table +from adler.objectdata.SSObject import SSObject def test_construct_SSObject_from_data_table(): diff --git a/tests/adler/dataclasses/test_dataclass_utilities.py b/tests/adler/objectdata/test_objectdata_utilities.py similarity index 93% rename from tests/adler/dataclasses/test_dataclass_utilities.py rename to tests/adler/objectdata/test_objectdata_utilities.py index b087e0e..25fdb04 100644 --- a/tests/adler/dataclasses/test_dataclass_utilities.py +++ b/tests/adler/objectdata/test_objectdata_utilities.py @@ -4,9 +4,9 @@ from pandas.testing import assert_frame_equal from numpy.testing import assert_equal -from adler.dataclasses.dataclass_utilities import get_data_table -from adler.dataclasses.dataclass_utilities import get_from_table -from adler.dataclasses.dataclass_utilities import check_value_populated +from adler.objectdata.objectdata_utilities import get_data_table +from adler.objectdata.objectdata_utilities import get_from_table +from adler.objectdata.objectdata_utilities import check_value_populated from adler.utilities.tests_utilities import get_test_data_filepath diff --git a/tests/adler/science/test_Colour.py b/tests/adler/science/test_Colour.py index 89813f3..307eb68 100644 --- a/tests/adler/science/test_Colour.py +++ b/tests/adler/science/test_Colour.py @@ -7,8 +7,8 @@ from adler.science.Colour import col_obs_ref from adler.utilities.tests_utilities import get_test_data_filepath -from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid -from adler.dataclasses.AdlerData import AdlerData +from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid +from adler.objectdata.AdlerData import AdlerData from adler.science.PhaseCurve import PhaseCurve from adler.utilities.science_utilities import get_df_obs_filt