better Octave compatibility

sccn · Jan 8, 2024 · 98b8c1b · 98b8c1b
1 parent 290ea71
commit 98b8c1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/run_ICL.m b/run_ICL.m
@@ -45,8 +45,10 @@
 
 % check path (sometimes mex file not first which create a problem)
 path2vl_nnconv = which('-all', 'vl_nnconv');
-if isempty(findstr('mex', path2vl_nnconv{1})) && length(path2vl_nnconv) > 1
-    addpath(fileparts(path2vl_nnconv{2}));
+if ~ischar(path2vl_nnconv)
+    if ~isempty(path2vl_nnconv) && isempty(findstr('mex', path2vl_nnconv{1})) && length(path2vl_nnconv) > 1
+        addpath(fileparts(path2vl_nnconv{2}));
+    end
 end
 
 %% inference

diff --git a/topoplotFast.m b/topoplotFast.m
@@ -956,8 +956,8 @@
   %
   xi = linspace(xmin,xmax,GRID_SCALE);   % x-axis description (row vector)
   yi = linspace(ymin,ymax,GRID_SCALE);   % y-axis description (row vector)
-
-  [Xi,Yi,Zi] = griddata(double(inty),double(intx),double(intValues),double(yi)',double(xi),'v4'); % interpolate data
+  [xi,yi] = meshgrid(xi,yi);
+  [Xi,Yi,Zi] = griddata(double(inty),double(intx),double(intValues),double(yi),double(xi),'v4'); % interpolate data
 %   [Xi,Yi,ZiC] = griddata(double(inty),double(intx),double(intContourVals),double(yi)',double(xi),'v4'); % interpolate data
 
   %