General: Added missing imports

aimat-lab · Jun 22, 2024 · 26adad3 · 26adad3
1 parent c88bf49
commit 26adad3
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/CrystalStructure/__init__.py b/CrystalStructure/__init__.py
@@ -0,0 +1,2 @@
+from .crystal import *
+from .atomic_constants import *
diff --git a/CrystalStructure/atomic_constants/__init__.py b/CrystalStructure/atomic_constants/__init__.py
@@ -0,0 +1 @@
+from .atomic_constants import ElementSymbol, AtomicConstants
diff --git a/CrystalStructure/crystal/__init__.py b/CrystalStructure/crystal/__init__.py
@@ -0,0 +1,3 @@
+from .crystal import CrystalStructure, CrystalSystem
+from .base import CrystalBase, AtomicSite
+from .lattice import Lengths, Angles
diff --git a/CrystalStructure/atomic_site.py → CrystalStructure/crystal/atomic_site.py b/CrystalStructure/atomic_site.py → CrystalStructure/crystal/atomic_site.py
diff --git a/CrystalStructure/base.py → CrystalStructure/crystal/base.py b/CrystalStructure/base.py → CrystalStructure/crystal/base.py
@@ -1,14 +1,13 @@
 from __future__ import annotations
 
+import math
 import json
 from typing import Optional
 
 from holytools.abstract import Serializable
 
-import math
-
-from CrystalStructure.atomic_constants.atomic_constants import ElementSymbol, AtomicConstants
-from CrystalStructure.atomic_site import AtomicSite
+from CrystalStructure.atomic_constants import ElementSymbol, AtomicConstants
+from .atomic_site import AtomicSite
 
 
 # ---------------------------------------------------------

diff --git a/CrystalStructure/crystal.py → CrystalStructure/crystal/crystal.py b/CrystalStructure/crystal.py → CrystalStructure/crystal/crystal.py
diff --git a/CrystalStructure/examples.py → CrystalStructure/crystal/examples.py b/CrystalStructure/examples.py → CrystalStructure/crystal/examples.py
@@ -1,23 +1,23 @@
 import os
 
-from CrystalStructure.base import CrystalBase
+
 from CrystalStructure.crystal import CrystalStructure
+from .base import CrystalBase
 
 cif1_fpath = os.path.join(os.path.dirname(__file__), 'cifs', "test1.cif")
 cif2_fpath = os.path.join(os.path.dirname(__file__), 'cifs', 'test2.cif')
 
 # ---------------------------------------------------------
 
-class LabelExamples:
-
+class CrystalExamples:
     @staticmethod
     def get_base(mute : bool = True) -> CrystalBase:
-        crystal_stucture = LabelExamples.get_crystal(mute=mute)
+        crystal_stucture = CrystalExamples.get_crystal(mute=mute)
         return crystal_stucture.base
 
     @staticmethod
     def get_crystal(mute : bool = False):
-        cif_content = LabelExamples.get_cif_content()
+        cif_content = CrystalExamples.get_cif_content()
         crystal_structure = CrystalStructure.from_cif(cif_content=cif_content)
         if not mute:
             print(f'--> Cif content:\n {open(cif1_fpath).read()}')

diff --git a/CrystalStructure/lattice.py → CrystalStructure/crystal/lattice.py b/CrystalStructure/lattice.py → CrystalStructure/crystal/lattice.py