AnalyticFunction: Remove _ prefix from public attributes

3 files changed, 14 insertions, 14 deletions

diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index bf3ab64..e23fb9e 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -645,13 +645,13 @@ if __name__ == "__main__":
                 if param_info(state, attribute):
                     print(
                         "{:10s}: {}".format(
-                            state, param_info(state, attribute)["function"]._model_str
+                            state, param_info(state, attribute)["function"].model_function
                         )
                     )
                     print(
                         "{:10s}  {}".format(
                             "",
-                            param_info(state, attribute)["function"]._regression_args,
+                            param_info(state, attribute)["function"].model_args,
                         )
                     )
         for trans in model.transitions():
@@ -661,14 +661,14 @@ if __name__ == "__main__":
                         "{:10s}: {:10s}: {}".format(
                             trans,
                             attribute,
-                            param_info(trans, attribute)["function"]._model_str,
+                            param_info(trans, attribute)["function"].model_function,
                         )
                     )
                     print(
                         "{:10s}  {:10s}  {}".format(
                             "",
                             "",
-                            param_info(trans, attribute)["function"]._regression_args,
+                            param_info(trans, attribute)["function"].model_args,
                         )
                     )
 
diff --git a/bin/analyze-timing.py b/bin/analyze-timing.py
index 4039f45..924388d 100755
--- a/bin/analyze-timing.py
+++ b/bin/analyze-timing.py
@@ -423,14 +423,14 @@ if __name__ == "__main__":
                         "{:10s}: {:10s}: {}".format(
                             trans,
                             attribute,
-                            param_info(trans, attribute)["function"]._model_str,
+                            param_info(trans, attribute)["function"].model_function,
                         )
                     )
                     print(
                         "{:10s}  {:10s}  {}".format(
                             "",
                             "",
-                            param_info(trans, attribute)["function"]._regression_args,
+                            param_info(trans, attribute)["function"].model_args,
                         )
                     )
 
diff --git a/bin/eval-outlier-removal.py b/bin/eval-outlier-removal.py
index 14f0e60..b091ea4 100755
--- a/bin/eval-outlier-removal.py
+++ b/bin/eval-outlier-removal.py
@@ -141,12 +141,12 @@ if __name__ == "__main__":
             if param_i1(state, attribute):
                 print(
                     "{:10s}: {}".format(
-                        state, param_i1(state, attribute)["function"]._model_str
+                        state, param_i1(state, attribute)["function"].model_function
                     )
                 )
                 print(
                     "{:10s}  {}".format(
-                        "", param_i1(state, attribute)["function"]._regression_args
+                        "", param_i1(state, attribute)["function"].model_args
                     )
                 )
     for trans in m1.transitions():
@@ -162,12 +162,12 @@ if __name__ == "__main__":
                     "{:10s}: {:10s}: {}".format(
                         trans,
                         attribute,
-                        param_i1(trans, attribute)["function"]._model_str,
+                        param_i1(trans, attribute)["function"].model_function,
                     )
                 )
                 print(
                     "{:10s}  {:10s}  {}".format(
-                        "", "", param_i1(trans, attribute)["function"]._regression_args
+                        "", "", param_i1(trans, attribute)["function"].model_args
                     )
                 )
     param_m2, param_i2 = m2.get_fitted()
@@ -176,12 +176,12 @@ if __name__ == "__main__":
             if param_i2(state, attribute):
                 print(
                     "{:10s}: {}".format(
-                        state, param_i2(state, attribute)["function"]._model_str
+                        state, param_i2(state, attribute)["function"].model_function
                     )
                 )
                 print(
                     "{:10s}  {}".format(
-                        "", param_i2(state, attribute)["function"]._regression_args
+                        "", param_i2(state, attribute)["function"].model_args
                     )
                 )
     for trans in m2.transitions():
@@ -197,12 +197,12 @@ if __name__ == "__main__":
                     "{:10s}: {:10s}: {}".format(
                         trans,
                         attribute,
-                        param_i2(trans, attribute)["function"]._model_str,
+                        param_i2(trans, attribute)["function"].model_function,
                     )
                 )
                 print(
                     "{:10s}  {:10s}  {}".format(
-                        "", "", param_i2(trans, attribute)["function"]._regression_args
+                        "", "", param_i2(trans, attribute)["function"].model_args
                     )
                 )