all classes are condensed

pyiron · Jan 5, 2024 · 59a49ae · 59a49ae
1 parent 9a98d35
commit 59a49ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/atomistics/shared/thermal_expansion.py b/atomistics/shared/thermal_expansion.py
@@ -6,14 +6,16 @@ def __init__(self, temperatures_lst, volumes_lst):
         self._temperatures_lst = temperatures_lst
         self._volumes_lst = volumes_lst
 
-    def get_volumes(self):
+    def volumes(self):
         return self._volumes_lst
 
-    def get_temperatures(self):
+    def temperatures(self):
         return self._temperatures_lst
 
 
 OutputThermalExpansionProperties = OutputThermalExpansion(
-    temperatures=ThermalExpansionProperties.get_temperatures,
-    volumes=ThermalExpansionProperties.get_volumes,
+    **{
+        k: getattr(ThermalExpansionProperties, k)
+        for k in OutputThermalExpansion.fields()
+    }
 )
diff --git a/atomistics/workflows/evcurve/workflow.py b/atomistics/workflows/evcurve/workflow.py
@@ -101,25 +101,25 @@ class EnergyVolumeCurveProperties:
     def __init__(self, fit_module):
         self._fit_module = fit_module
 
-    def get_volume_eq(self):
+    def volume_eq(self):
         return self._fit_module.fit_dict["volume_eq"]
 
-    def get_energy_eq(self):
+    def energy_eq(self):
         return self._fit_module.fit_dict["energy_eq"]
 
-    def get_bulkmodul_eq(self):
+    def bulkmodul_eq(self):
         return self._fit_module.fit_dict["bulkmodul_eq"]
 
-    def get_bulkmodul_pressure_derivative_eq(self):
+    def b_prime_eq(self):
         return self._fit_module.fit_dict["b_prime_eq"]
 
-    def get_volumes(self):
+    def volume(self):
         return self._fit_module.fit_dict["volume"]
 
-    def get_energies(self):
+    def energy(self):
         return self._fit_module.fit_dict["energy"]
 
-    def get_fit_dict(self):
+    def fit_dict(self):
         return {
             k: self._fit_module.fit_dict[k]
             for k in ["fit_type", "least_square_error", "poly_fit", "fit_order"]
@@ -128,13 +128,10 @@ def get_fit_dict(self):
 
 
 EnergyVolumeCurveOutputEnergyVolumeCurve = OutputEnergyVolumeCurve(
-    fit_dict=EnergyVolumeCurveProperties.get_fit_dict,
-    energy=EnergyVolumeCurveProperties.get_energies,
-    volume=EnergyVolumeCurveProperties.get_volumes,
-    b_prime_eq=EnergyVolumeCurveProperties.get_bulkmodul_pressure_derivative_eq,
-    bulkmodul_eq=EnergyVolumeCurveProperties.get_bulkmodul_eq,
-    energy_eq=EnergyVolumeCurveProperties.get_energy_eq,
-    volume_eq=EnergyVolumeCurveProperties.get_volume_eq,
+    **{
+        k: getattr(EnergyVolumeCurveProperties, k)
+        for k in OutputEnergyVolumeCurve.fields()
+    }
 )