compare: combine matlab fcns

geospace-code · Nov 24, 2023 · 5e27a82 · 5e27a82
1 parent 6ce45b3
commit 5e27a82
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/scripts/matlab/has_aerospace_toolbox.m b/scripts/matlab/has_aerospace_toolbox.m
diff --git a/scripts/matlab/has_map_toolbox.m b/scripts/matlab/has_map_toolbox.m
diff --git a/scripts/matlab/matlab_engine.py b/scripts/matlab/matlab_engine.py
@@ -14,7 +14,7 @@ def matlab_engine():
 
 @functools.cache
 def has_aerospace(eng: matlab.engine.matlabengine.MatlabEngine) -> bool:
-    if eng.has_aerospace_toolbox():
+    if eng.matlab_toolbox().has_aerospace:
         return True
 
     cwd = Path(__file__).parent
@@ -28,7 +28,7 @@ def has_aerospace(eng: matlab.engine.matlabengine.MatlabEngine) -> bool:
 
 
 def has_mapping(eng: matlab.engine.matlabengine.MatlabEngine) -> bool:
-    if eng.has_map_toolbox():
+    if eng.matlab_toolbox().has_mapping:
         return True
 
     cwd = Path(__file__).parent

diff --git a/scripts/matlab/matlab_toolbox.m b/scripts/matlab/matlab_toolbox.m
@@ -0,0 +1,27 @@
+function h = matlab_toolbox()
+
+h = struct(mapping=has_mapping(), aerospace=has_aerospace())
+
+end
+
+
+function has_map = has_mapping()
+if usejava('jvm')
+  addons = matlab.addons.installedAddons();
+
+  has_map = any(contains(addons.Name, 'Mapping Toolbox'));
+else
+  has_map = ~isempty(ver("map"));
+end
+end
+
+
+function has_map = has_aerospace()
+if usejava('jvm')
+  addons = matlab.addons.installedAddons();
+
+  has_map = any(contains(addons.Name, 'Aerospace Toolbox'));
+else
+  has_map = ~isempty(ver("aero"));
+end
+end