CodeFactor

src/easyreflectometry/project.py

@@ -78,13 +78,13 @@ def parameters(self) -> List[Parameter]:
                 parameters.append(vertice_obj)
         return parameters
 
-    def count_free_parameters(self) -> int:
+    def free_parameters_count(self) -> int:
         return sum(1 for parameter in self.parameters if parameter.free)
 
-    def count_fixed_parameters(self) -> int:
+    def fixed_parameters_count(self) -> int:
         return sum(1 for parameter in self.parameters if not parameter.free)
 
-    def count_parameter_user_constraints(self) -> int:
+    def parameter_user_constraints_count(self) -> int:
         return sum(len(parameter.user_constraints.keys()) for parameter in self.parameters if not parameter.free)
 
     @property

src/easyreflectometry/summary/summary.py

@@ -162,12 +162,12 @@ def _experiments_section(self) -> str:
 
     def _refinement_section(self) -> str:
         html_refinement = HTML_REFINEMENT_TEMPLATE
-        num_free_params = self._project.count_free_parameters()
-        num_fixed_params = self._project.count_fixed_parameters()
+        num_free_params = self._project.free_parameters_count()
+        num_fixed_params = self._project.fixed_parameters_count()
         num_params = num_free_params + num_fixed_params
         #        goodness_of_fit = self._project.status.goodnessOfFit
         #        goodness_of_fit = goodness_of_fit.split(' → ')[-1]
-        num_constraints = self._project.count_parameter_user_constraints()
+        num_constraints = self._project.parameter_user_constraints_count()
 
         html_refinement = html_refinement.replace('calculation_engine', f'{self._project._calculator.current_interface_name}')
         html_refinement = html_refinement.replace('minimization_engine', f'{self._project.minimizer.name}')

tests/test_project.py

@@ -642,7 +642,7 @@ def test_count_free_parameters(self):
         project.parameters[0].free = True
 
         # Then
-        count = project.count_free_parameters()
+        count = project.free_parameters_count()
 
         # Expect
         assert count == 1
@@ -654,7 +654,7 @@ def test_count_fixed_parameters(self):
         project.parameters[0].free = True
 
         # Then
-        count = project.count_fixed_parameters()
+        count = project.fixed_parameters_count()
 
         # Expect
         assert count == 13
@@ -666,7 +666,7 @@ def test_count_parameter_user_constraints(self):
         project.parameters[0].user_constraints['name_other_parameter'] = 'constraint'
 
         # Then
-        count = project.count_parameter_user_constraints()
+        count = project.parameter_user_constraints_count()
 
         # Expect
         assert count == 1