refactor matlab.py

Author: StephenNneji

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)