From 3a4b9222ceef28290431ca0197d31e35d8165fdd Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Tue, 12 May 2026 14:47:50 +0100 Subject: [PATCH 1/3] Add function to run directly from MATLAB API --- ratapi/__init__.py | 3 +- ratapi/utils/matlab.py | 67 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 ratapi/utils/matlab.py diff --git a/ratapi/__init__.py b/ratapi/__init__.py index 98683c7e..8f441f44 100644 --- a/ratapi/__init__.py +++ b/ratapi/__init__.py @@ -9,7 +9,7 @@ from ratapi.outputs import BayesResults, Results from ratapi.project import Project from ratapi.run import run -from ratapi.utils import convert, plotting +from ratapi.utils import convert, matlab, plotting with suppress(ImportError): # orsopy is an optional dependency from ratapi.utils import orso as orso @@ -26,4 +26,5 @@ "run", "plotting", "convert", + "matlab", ] diff --git a/ratapi/utils/matlab.py b/ratapi/utils/matlab.py new file mode 100644 index 00000000..dad8921b --- /dev/null +++ b/ratapi/utils/matlab.py @@ -0,0 +1,67 @@ +"""Runs RAT from the MATLAB API.""" + +import os +import tempfile +import warnings +from pathlib import Path + +from ..outputs import Results +from ..project import Project +from ..wrappers import MatlabWrapper + +RUNNER = """function executeRAT() +project = jsonToProject('{project}'); +controls = jsonToControls('{control}'); +[project, results] = RAT(project, controls); + +projectToJson(project, '{project}'); +resultsToJson(results, '{result}'); +end +""" + + +def run_matlab_directly(project, controls, matlab_rat_path): + """Run User provided MATLAB RAT for the given project and controls inputs. + + Parameters + ---------- + project : RAT.Project + The project model, which defines the physical system under study. + controls : RAT.Controls + The controls model, which defines algorithmic properties. + matlab_rat_path : str + The path to MATLAB RAT folder. + """ + if MatlabWrapper.loader is None: + raise ImportError(MatlabWrapper.loader_error_message) from None + + engine = MatlabWrapper.loader.result() + cur_dir = os.getcwd() + + with tempfile.TemporaryDirectory() as tmp: + project_file = Path(tmp, "project.json") + control_file = Path(tmp, "controls.json") + result_file = Path(tmp, "results.json") + runner_file = Path(tmp, "executeRAT.m") + + with open(runner_file, "w") as f: + f.write(RUNNER.format(project=project_file, control=control_file, result=result_file)) + + with warnings.catch_warnings(): # Avoid warning about relative paths + warnings.simplefilter("ignore") + project.save(project_file) + controls.save(control_file) + + engine.cd(matlab_rat_path, nargout=0) + engine.eval("addPaths", nargout=0) + engine.cd(cur_dir, nargout=0) + + engine.addpath(tmp, nargout=0) + for file in project.custom_files: + engine.addpath(str(file.path), nargout=0) + + engine.executeRAT(nargout=0) + + project = Project.load(project_file) + results = Results.load(result_file) + return project, results From de0123b21d598b81a836dac0127642fb29551906 Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Fri, 15 May 2026 09:26:04 +0100 Subject: [PATCH 2/3] refactor matlab.py --- ratapi/utils/matlab.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/ratapi/utils/matlab.py b/ratapi/utils/matlab.py index dad8921b..14c340cf 100644 --- a/ratapi/utils/matlab.py +++ b/ratapi/utils/matlab.py @@ -1,6 +1,5 @@ """Runs RAT from the MATLAB API.""" -import os import tempfile import warnings from pathlib import Path @@ -10,8 +9,17 @@ from ..wrappers import MatlabWrapper RUNNER = """function executeRAT() + +cur_dir = pwd; +cd('{rat_path}'); +addPaths; +cd(cur_dir); + project = jsonToProject('{project}'); controls = jsonToControls('{control}'); +for i=1:project.customFile.rowCount + addpath(project.customFile.varTable{{i, 5}}); +end [project, results] = RAT(project, controls); projectToJson(project, '{project}'); @@ -36,7 +44,6 @@ def run_matlab_directly(project, controls, matlab_rat_path): raise ImportError(MatlabWrapper.loader_error_message) from None engine = MatlabWrapper.loader.result() - cur_dir = os.getcwd() with tempfile.TemporaryDirectory() as tmp: project_file = Path(tmp, "project.json") @@ -45,22 +52,18 @@ def run_matlab_directly(project, controls, matlab_rat_path): runner_file = Path(tmp, "executeRAT.m") with open(runner_file, "w") as f: - f.write(RUNNER.format(project=project_file, control=control_file, result=result_file)) + f.write( + RUNNER.format(project=project_file, control=control_file, result=result_file, rat_path=matlab_rat_path) + ) with warnings.catch_warnings(): # Avoid warning about relative paths warnings.simplefilter("ignore") project.save(project_file) controls.save(control_file) - engine.cd(matlab_rat_path, nargout=0) - engine.eval("addPaths", nargout=0) - engine.cd(cur_dir, nargout=0) - engine.addpath(tmp, nargout=0) - for file in project.custom_files: - engine.addpath(str(file.path), nargout=0) - engine.executeRAT(nargout=0) + engine.rmpath(tmp, nargout=0) project = Project.load(project_file) results = Results.load(result_file) From 259163464f2ad707d6ef7a52c1649163635dcdfa Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Wed, 20 May 2026 09:59:45 +0100 Subject: [PATCH 3/3] Add support for live plot --- ratapi/project.py | 29 ++++++++++++++++++++--------- ratapi/utils/matlab.py | 31 ++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/ratapi/project.py b/ratapi/project.py index b8ca49f2..98d9071c 100644 --- a/ratapi/project.py +++ b/ratapi/project.py @@ -927,16 +927,14 @@ def classlist_script(name, classlist): + "\n)" ) - def save(self, filepath: str | Path = "./project.json"): - """Save a project to a JSON file. + def model_dump(self): + """Generate a dictionary representation of the model. - Parameters - ---------- - filepath : str or Path - The path to where the project file will be written. + Returns + ------- + json_dict : dict + A dict containing the model information. """ - filepath = Path(filepath).with_suffix(".json") - json_dict = {} for field in self.model_fields: attr = getattr(self, field) @@ -960,7 +958,7 @@ def make_custom_file_dict(item): "name": item.name, "filename": item.filename, "language": item.language, - "path": try_relative_to(item.path, filepath.parent), + "path": item.path, } if item.name != item.function_name: file_dict["function_name"] = item.function_name @@ -973,7 +971,20 @@ def make_custom_file_dict(item): json_dict[field] = [item.model_dump() for item in attr] else: json_dict[field] = attr + return json_dict + def save(self, filepath: str | Path = "./project.json"): + """Save a project to a JSON file. + + Parameters + ---------- + filepath : str or Path + The path to where the project file will be written. + """ + filepath = Path(filepath).with_suffix(".json") + json_dict = self.model_dump() + for file in json_dict["custom_files"]: + file["path"] = try_relative_to(file["path"], filepath.parent) filepath.write_text(json.dumps(json_dict)) @classmethod diff --git a/ratapi/utils/matlab.py b/ratapi/utils/matlab.py index 14c340cf..04a45507 100644 --- a/ratapi/utils/matlab.py +++ b/ratapi/utils/matlab.py @@ -1,5 +1,6 @@ """Runs RAT from the MATLAB API.""" +import json import tempfile import warnings from pathlib import Path @@ -14,9 +15,13 @@ cd('{rat_path}'); addPaths; cd(cur_dir); - + project = jsonToProject('{project}'); controls = jsonToControls('{control}'); +if any(strcmpi(controls.procedure, {{procedures.DE.value, procedures.Simplex.value}})) + disp("hello") + useLivePlot(1); +end for i=1:project.customFile.rowCount addpath(project.customFile.varTable{{i, 5}}); end @@ -24,21 +29,26 @@ projectToJson(project, '{project}'); resultsToJson(results, '{result}'); +close all end """ -def run_matlab_directly(project, controls, matlab_rat_path): +def run_matlab_directly(project, controls, matlab_rat_path, stdout=None, stderr=None): """Run User provided MATLAB RAT for the given project and controls inputs. Parameters ---------- - project : RAT.Project - The project model, which defines the physical system under study. - controls : RAT.Controls - The controls model, which defines algorithmic properties. + project : RAT.Project or dict + The project model (or equivalent json dict), which defines the physical system under study. + controls : RAT.Controls or dict + The controls model (or equivalent json dict), which defines algorithmic properties. matlab_rat_path : str The path to MATLAB RAT folder. + stdout : io.TextIOBase, optional + Text stream for MATLAB console output + stderr : io.TextIOBase, optional + Text stream for MATLAB console error output """ if MatlabWrapper.loader is None: raise ImportError(MatlabWrapper.loader_error_message) from None @@ -56,13 +66,16 @@ def run_matlab_directly(project, controls, matlab_rat_path): RUNNER.format(project=project_file, control=control_file, result=result_file, rat_path=matlab_rat_path) ) + controls.save(control_file) if not isinstance(controls, dict) else control_file.write_text(json.dumps(controls)) + with warnings.catch_warnings(): # Avoid warning about relative paths warnings.simplefilter("ignore") - project.save(project_file) - controls.save(control_file) + project.save(project_file) if not isinstance(project, dict) else project_file.write_text( + json.dumps(project) + ) engine.addpath(tmp, nargout=0) - engine.executeRAT(nargout=0) + engine.executeRAT(nargout=0, stdout=stdout, stderr=stderr) engine.rmpath(tmp, nargout=0) project = Project.load(project_file)