Merge pull request #39 from saroad2/support_polynomials

Support polynomials

Author: saroad2

pyproject.toml

@@ -19,7 +19,7 @@ requires = [
     '--pre',
     'toga-chart>=0.1.0',
     'openpyxl>=3.0.4',
-    'eddington>=0.0.16',
+    'eddington>=0.0.17',
 ]
 
 

src/eddington_gui/app.py

@@ -43,7 +43,7 @@ class EddingtonGUI(toga.App):  # pylint: disable=too-many-instance-attributes
     main_window: toga.Window
 
     __a0: np.ndarray = None
-    __fit_result: FittingResult = None
+    __fitting_result: FittingResult = None
 
     def startup(self):
         """
@@ -57,29 +57,35 @@ def startup(self):
         main_box.add(HeaderBox())
 
         self.input_file_box = InputFileBox(flex=1)
-        self.input_file_box.add_handler(self.reset_fit_data)
+        self.input_file_box.add_handler(self.reset_fitting_data)
         main_box.add(self.input_file_box)
 
         self.fitting_function_box = FittingFunctionBox(flex=1)
-        self.fitting_function_box.add_handler(lambda fit_func: self.reset_fit_result())
+        self.fitting_function_box.add_handler(
+            lambda fit_func: self.reset_fitting_result()
+        )
         main_box.add(self.fitting_function_box)
 
         self.initial_guess_box = InitialGuessBox()
-        self.initial_guess_box.add_handler(lambda a0: self.reset_fit_result())
+        self.initial_guess_box.add_handler(lambda a0: self.reset_fitting_result())
         self.fitting_function_box.add_handler(self.set_parameters_number)
         main_box.add(self.initial_guess_box)
 
         self.data_columns_box = DataColumnsBox(flex=5)
-        self.data_columns_box.add_handler(lambda fit_data: self.reset_fit_result())
+        self.data_columns_box.add_handler(
+            lambda fitting_data: self.reset_fitting_result()
+        )
         self.input_file_box.on_csv_read = self.read_csv
         self.input_file_box.on_excel_read = self.read_excel
         self.input_file_box.on_select_file = self.select_default_sheet
 
         self.plot_configuration_box = PlotConfigurationBox(flex=5)
         self.fitting_function_box.add_handler(
-            self.plot_configuration_box.on_fit_function_load
+            self.plot_configuration_box.on_fitting_function_load
+        )
+        self.data_columns_box.add_handler(
+            self.plot_configuration_box.on_fitting_data_load
         )
-        self.data_columns_box.add_handler(self.plot_configuration_box.on_fit_data_load)
 
         main_box.add(
             toga.Box(
@@ -160,16 +166,16 @@ def startup(self):
         self.main_window.show()
 
     @property
-    def fit_result(self):
+    def fitting_result(self):
         """Getter of the fit result."""
-        if self.__fit_result is None:
-            self.__calculate_fit_result()
-        return self.__fit_result
+        if self.__fitting_result is None:
+            self.__calculate_fitting_result()
+        return self.__fitting_result
 
-    @fit_result.setter
-    def fit_result(self, fit_result):
+    @fitting_result.setter
+    def fitting_result(self, fitting_result):
         """Setter of the fit result."""
-        self.__fit_result = fit_result
+        self.__fitting_result = fitting_result
 
     def read_csv(self, filepath):
         """
@@ -183,7 +189,7 @@ def read_csv(self, filepath):
             self.data_columns_box.read_csv(filepath)
         except FittingDataError as error:
             self.main_window.error_dialog(title="Input data error", message=str(error))
-            self.data_columns_box.fit_data = None
+            self.data_columns_box.fitting_data = None
             self.input_file_box.file_path = None
 
     def read_excel(self, filepath, sheet):
@@ -199,57 +205,59 @@ def read_excel(self, filepath, sheet):
             self.data_columns_box.read_excel(filepath, sheet)
         except FittingDataError as error:
             self.main_window.error_dialog(title="Input data error", message=str(error))
-            self.data_columns_box.fit_data = None
+            self.data_columns_box.fitting_data = None
             self.input_file_box.selected_sheet = None
 
     def choose_records(self, widget):  # pylint: disable=unused-argument
         """Open the choose records window."""
-        if self.data_columns_box.fit_data is None:
+        if self.data_columns_box.fitting_data is None:
             self.main_window.info_dialog(
                 title="Choose Records", message="No data been given yet"
             )
             return
-        window = RecordsChoiceWindow(fit_data=self.data_columns_box.fit_data)
+        window = RecordsChoiceWindow(fitting_data=self.data_columns_box.fitting_data)
         window.show()
-        self.reset_fit_result()
+        self.reset_fitting_result()
         self.initial_guess_box.reset_initial_guess()
 
     def fit(self, widget):  # pylint: disable=unused-argument
         """Handler for the "fit" button."""
         try:
-            if self.fit_result is None:
+            if self.fitting_result is None:
                 self.main_window.info_dialog(
                     title="Fit Result", message="Nothing to fit yet"
                 )
                 return
         except EddingtonException:
             return
-        self.main_window.info_dialog(title="Fit Result", message=str(self.fit_result))
+        self.main_window.info_dialog(
+            title="Fit Result", message=str(self.fitting_result)
+        )
 
     def plot_data(self, widget):  # pylint: disable=unused-argument
         """Handler for the "plot data" button."""
-        if self.data_columns_box.fit_data is None:
+        if self.data_columns_box.fitting_data is None:
             self.show_nothing_to_plot()
         else:
             self.show_figure_window(
                 self.plot_configuration_box.plot_data(
-                    data=self.data_columns_box.fit_data
+                    data=self.data_columns_box.fitting_data
                 )
             )
 
     def plot_initial_guess(self, widget):  # pylint: disable=unused-argument
         """Handler for the "plot initial guess" button."""
         try:
             if (
-                self.data_columns_box.fit_data is None
+                self.data_columns_box.fitting_data is None
                 or self.initial_guess_box.a0 is None  # noqa: W503
             ):
                 self.show_nothing_to_plot()
                 return
             self.show_figure_window(
                 self.plot_configuration_box.plot_fitting(
-                    func=self.fitting_function_box.fit_function,
-                    data=self.data_columns_box.fit_data,
+                    func=self.fitting_function_box.fitting_function,
+                    data=self.data_columns_box.fitting_data,
                     a=self.initial_guess_box.a0,
                 )
             )
@@ -261,14 +269,14 @@ def plot_initial_guess(self, widget):  # pylint: disable=unused-argument
     def plot(self, widget):  # pylint: disable=unused-argument
         """Handler for the "plot fitting" button."""
         try:
-            if self.fit_result is None:
+            if self.fitting_result is None:
                 self.show_nothing_to_plot()
                 return
             self.show_figure_window(
                 self.plot_configuration_box.plot_fitting(
-                    func=self.fitting_function_box.fit_function,
-                    data=self.data_columns_box.fit_data,
-                    a=self.fit_result.a,
+                    func=self.fitting_function_box.fitting_function,
+                    data=self.data_columns_box.fitting_data,
+                    a=self.fitting_result.a,
                 )
             )
         except EddingtonException as error:
@@ -279,14 +287,14 @@ def plot(self, widget):  # pylint: disable=unused-argument
     def residuals(self, widget):  # pylint: disable=unused-argument
         """Handler for the "residuals" button."""
         try:
-            if self.fit_result is None:
+            if self.fitting_result is None:
                 self.show_nothing_to_plot()
                 return
             self.show_figure_window(
                 self.plot_configuration_box.plot_residuals(
-                    func=self.fitting_function_box.fit_function,
-                    data=self.data_columns_box.fit_data,
-                    a=self.fit_result.a,
+                    func=self.fitting_function_box.fitting_function,
+                    data=self.data_columns_box.fitting_data,
+                    a=self.fitting_result.a,
                 )
             )
         except EddingtonException as error:
@@ -307,7 +315,7 @@ def choose_output_dir(self, widget):  # pylint: disable=unused-argument
     def save_to_output_dir(self, widget):  # pylint: disable=unused-argument
         """Handler for the "save to output directory" button."""
         try:
-            if self.fit_result is None:
+            if self.fitting_result is None:
                 self.show_nothing_to_plot()
                 return
         except EddingtonException:
@@ -321,17 +329,17 @@ def save_to_output_dir(self, widget):  # pylint: disable=unused-argument
         output_dir = Path(self.output_directory_input.value)
         if not output_dir.exists():
             output_dir.mkdir()
-        func_name = self.fitting_function_box.fit_function.name
-        self.fit_result.save_txt(output_dir / f"{func_name}_result.txt")
+        func_name = self.fitting_function_box.fitting_function.name
+        self.fitting_result.save_txt(output_dir / f"{func_name}_result.txt")
         self.plot_configuration_box.plot_fitting(
-            func=self.fitting_function_box.fit_function,
-            data=self.data_columns_box.fit_data,
-            a=self.fit_result.a,
+            func=self.fitting_function_box.fitting_function,
+            data=self.data_columns_box.fitting_data,
+            a=self.fitting_result.a,
         ).savefig(output_dir / f"{func_name}_fitting.png")
         self.plot_configuration_box.plot_residuals(
-            func=self.fitting_function_box.fit_function,
-            data=self.data_columns_box.fit_data,
-            a=self.fit_result.a,
+            func=self.fitting_function_box.fitting_function,
+            data=self.data_columns_box.fitting_data,
+            a=self.fitting_result.a,
         ).savefig(output_dir / f"{func_name}_residuals.png")
         self.main_window.info_dialog(
             title="Save output", message="All plots have been saved successfully!"
@@ -347,13 +355,13 @@ def show_figure_window(fig):
         figure_window = FigureWindow(fig)
         figure_window.show()
 
-    def reset_fit_data(self):
+    def reset_fitting_data(self):
         """Set fit data to None."""
-        self.data_columns_box.fit_data = None
+        self.data_columns_box.fitting_data = None
 
-    def reset_fit_result(self):
+    def reset_fitting_result(self):
         """Set fit result to None."""
-        self.fit_result = None
+        self.fitting_result = None
 
     def set_parameters_number(self, func):
         """Set number of parameters."""
@@ -362,21 +370,21 @@ def set_parameters_number(self, func):
         else:
             self.initial_guess_box.n = func.n
 
-    def __calculate_fit_result(self):
+    def __calculate_fitting_result(self):
         if (
-            self.data_columns_box.fit_data is None
-            or self.fitting_function_box.fit_function is None  # noqa: W503
+            self.data_columns_box.fitting_data is None
+            or self.fitting_function_box.fitting_function is None  # noqa: W503
         ):
-            self.fit_result = None
+            self.fitting_result = None
             return
         try:
-            self.fit_result = fit(
-                data=self.data_columns_box.fit_data,
-                func=self.fitting_function_box.fit_function,
+            self.fitting_result = fit(
+                data=self.data_columns_box.fitting_data,
+                func=self.fitting_function_box.fitting_function,
                 a0=self.initial_guess_box.a0,
             )
         except EddingtonException as error:
-            self.fit_result = None
+            self.fitting_result = None
             self.main_window.error_dialog(title="Fit result error", message=str(error))
             raise error
 
@@ -389,15 +397,15 @@ def select_default_sheet(self):
         for sheet in self.input_file_box.sheets_options:
             if sheet != NO_VALUE:
                 try:
-                    self.data_columns_box.fit_data = FittingData.read_from_excel(
+                    self.data_columns_box.fitting_data = FittingData.read_from_excel(
                         Path(self.input_file_box.file_path), sheet
                     )
                     self.input_file_box.selected_sheet = sheet
                     return
                 except FittingDataError:
                     pass
 
-        if self.data_columns_box.fit_data is None:
+        if self.data_columns_box.fitting_data is None:
             self.main_window.error_dialog(
                 title="Input data error",
                 message=(

src/eddington_gui/boxes/data_columns_box.py

@@ -22,7 +22,7 @@ class DataColumnsBox(toga.Box):  # pylint: disable=too-many-instance-attributes
     y_selection: toga.Selection
     yerr_selection: toga.Selection
 
-    __fit_data: Union[FittingData] = None
+    __fitting_data: Union[FittingData] = None
     __handlers: List[Callable] = []
 
     def __init__(self, flex):
@@ -43,23 +43,23 @@ def __init__(self, flex):
         )
 
     @property
-    def fit_data(self):
+    def fitting_data(self):
         """Fit data getter."""
-        return self.__fit_data
+        return self.__fitting_data
 
-    @fit_data.setter
-    def fit_data(self, fit_data: FittingData):
+    @fitting_data.setter
+    def fitting_data(self, fitting_data: FittingData):
         """
         Fit data setter.
 
         If fit data is None, reset all selections
         """
-        self.__fit_data = fit_data
-        if fit_data is None:
+        self.__fitting_data = fitting_data
+        if fitting_data is None:
             self.clear_selections()
             return
-        items = list(fit_data.data.keys())
-        used_columns = self.fit_data.used_columns
+        items = list(fitting_data.data.keys())
+        used_columns = self.fitting_data.used_columns
         self.set_items(self.x_selection, items, used_columns.x)
         self.set_items(self.xerr_selection, items, used_columns.xerr)
         self.set_items(self.y_selection, items, used_columns.y)
@@ -131,24 +131,24 @@ def set_columns(self, widget):  # pylint: disable=unused-argument
         """Set columns of the fit data based on the selection of the user."""
         if not self.selection_enabled:
             return
-        self.fit_data.x_column = self.x_selection.value
-        self.fit_data.xerr_column = self.xerr_selection.value
-        self.fit_data.y_column = self.y_selection.value
-        self.fit_data.yerr_column = self.yerr_selection.value
+        self.fitting_data.x_column = self.x_selection.value
+        self.fitting_data.xerr_column = self.xerr_selection.value
+        self.fitting_data.y_column = self.y_selection.value
+        self.fitting_data.yerr_column = self.yerr_selection.value
         self.run_handlers()
 
     def run_handlers(self):
         """Whenever fit data is updated, run handlers to notify other components."""
         for handler in self.__handlers:
-            handler(self.fit_data)
+            handler(self.fitting_data)
 
     def read_csv(self, filepath):
         """
         Read data from csv file.
 
         :param filepath: path of the csv file
         """
-        self.fit_data = FittingData.read_from_csv(filepath)
+        self.fitting_data = FittingData.read_from_csv(filepath)
 
     def read_excel(self, filepath, sheet):
         """
@@ -157,7 +157,7 @@ def read_excel(self, filepath, sheet):
         :param filepath: path of the excel file
         :param sheet: sheet from which to read the data.
         """
-        self.fit_data = FittingData.read_from_excel(filepath, sheet)
+        self.fitting_data = FittingData.read_from_excel(filepath, sheet)
 
     def __add_column_option(self, label, on_select):