v1.11.0

auxiliary_packages/funman_benchmarks/src/funman_benchmarks/_version.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "1.10.0"
+__version__ = "1.11.0"

auxiliary_packages/funman_demo/src/funman_demo/_version.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "1.10.0"
+__version__ = "1.11.0"

auxiliary_packages/funman_demo/src/funman_demo/helpers.py

@@ -5,6 +5,7 @@
 import logging
 
 import matplotlib.pyplot as plt
+import numpy as np
 import pandas as pd
 
 from funman import (
@@ -163,16 +164,22 @@ def relax_parameter_bounds(funman_request, factor=0.1):
         interval.ub = interval.ub + (factor / 2 * width)
 
 
-def plot_last_point(results, states):
+def plot_last_point(results, states, plot_logscale=False):
     pts = results.parameter_space.points()
     print(f"{len(pts)} points")
 
     if len(pts) > 0:
         # Get a plot for last point
         df = results.dataframe(points=pts[-1:])
         # pd.options.plotting.backend = "plotly"
+        for s in states:
+            df[s] = df[s].mask(np.isinf)
+
         ax = df[states].plot()
 
+        if plot_logscale:
+            ax.set_yscale("symlog")
+
         fig = plt.figure()
         # fig.set_yscale("log")
         # fig.savefig("save_file_name.pdf")
@@ -196,12 +203,41 @@ def pretty_print_request_params(params):
         print(df.T)
 
 
-def report(results, name, states, request_results, request_params):
+def runtime_stats_dataframe(request_params):
+    df = pd.DataFrame(request_params).T
+    df.index.name = "Model"
+    df = (
+        df[["model_size", "total_time", "time_horizon"]]
+        .rename(
+            columns={
+                "model_size": "Model Size",
+                "total_time": "Total Time",
+                "time_horizon": "Time Horizon",
+            }
+        )
+        .sort_index()
+    )
+    return df
+
+
+def report(
+    results,
+    name,
+    states,
+    request_results,
+    request_params,
+    plot_logscale=False,
+    plot=True,
+):
     request_results[name] = results
-    plot_last_point(results, states)
+    if plot:
+        plot_last_point(results, states, plot_logscale=plot_logscale)
     param_values = get_last_point_parameters(results)
     # print(f"Point parameters: {param_values}")
     if param_values is not None:
+        param_values["total_time"] = results.timing.total_time
+        param_values["model_size"] = results.model.num_elements()
+        param_values["time_horizon"] = results.time_horizon()
         request_params[name] = param_values
     pretty_print_request_params(request_params)
 

auxiliary_packages/funman_demo/src/funman_demo/plot.py

@@ -108,7 +108,9 @@ def summarize_results(
     boxes = (
         results.parameter_space.boxes()
         if not print_last_time
-        else results.parameter_space.last_boxes()
+        else results.parameter_space.last_boxes(
+            steps=[results.parameter_space.last_step()]
+        )
     )
 
     if parameters_to_plot is None:

auxiliary_packages/funman_dreal/src/funman_dreal/_version.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "1.10.0"
+__version__ = "1.11.0"

auxiliary_packages/funman_dreal/src/funman_dreal/converter.py

@@ -30,6 +30,8 @@
 )
 from pysmt.walkers import DagWalker
 
+from funman.utils.smtlib_utils import str_smtlib
+
 l = logging.getLogger(__name__)
 
 
@@ -119,15 +121,15 @@ def __init__(self, env=None):
                     r"(-?\d+\.\d+e-?\d+)", self.real_constant, True
                 ),  # decimals scientific
             ]
-            + self.rules[0:-1]
+            + self.rules[0:-2]
             + [
                 Rule(
-                    r"(([A-Za-z_]|[^\u0000-\u007F])([A-Za-z_]|[^\u0000-\u007F])*)",
+                    r"(([A-Za-z_]|[^\u0000-\u007F])([\w\.\{\}_]|[^\u0000-\u007F])*)",
                     self.identifier,
                     True,
                 ),  # unicode identifiers
             ]
-            + self.rules[-1:]
+            + self.rules[-2:]
         )
         self.compile()
 
@@ -218,6 +220,7 @@ def back(self, dreal_formula: dreal.Formula) -> FNode:
             )
             new_symbols = self.create_dreal_symbols(str(dreal_formula))
             formula = CoreParser().parse(str(dreal_formula))
+            l.debug(f"Extracted SMTLib: {str_smtlib(formula)}")
         except Exception as e:
             raise e
         return formula

auxiliary_packages/pde2petri/src/pde2petri/_version.py

@@ -1 +1 @@
-__version__ = "1.10.0"
+__version__ = "1.11.0"

docker/docker-bake.hcl

@@ -20,7 +20,7 @@ variable "DREAL_REPO_URL" {
   default = "https://github.com/danbryce/dreal4.git"
 }
 variable "DREAL_COMMIT_TAG" {
-  default = "03a1055c7768ba609f33897ad91c361da6582871"
+  default = "acc5a255e0245f05458b1041a4e163c11e89880e"
 }
 variable "AUTOMATES_COMMIT_TAG" {
   default = "e5fb635757aa57007615a75371f55dd4a24851e0"