Renaming dataclasses folder.

src/adler/__init__.py

@@ -1,4 +1,4 @@
-from . import dataclasses
+from . import objectdata
 from . import science
 from . import utilities
 from . import lasair

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

src/adler/dataclasses/AdlerPlanetoid.py → 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__)
 

src/adler/dataclasses/MPCORB.py → 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,

src/adler/dataclasses/Observations.py → 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,

src/adler/dataclasses/SSObject.py → 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,

src/adler/dataclasses/__init__.py → 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

tests/adler/dataclasses/test_AdlerData.py → 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

tests/adler/dataclasses/test_AdlerPlanetoid.py → 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

tests/adler/dataclasses/test_MPCORB.py → 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
 
 

tests/adler/dataclasses/test_Observations.py → 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
 
 

tests/adler/dataclasses/test_SSObject.py → 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():

tests/adler/dataclasses/test_dataclass_utilities.py → 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
 
 

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