Merge pull request #16 from ayrna/matlab-2017

Matlab 2017 closes issue #5
ayrna · Nov 9, 2017 · a4b71b5 · a4b71b5
2 parents 88b53c6 + b176d88
commit a4b71b5
Show file tree

Hide file tree

Showing 130 changed files with 18 additions and 24,226 deletions.
diff --git a/src/Algorithms/ORBoost.m b/src/Algorithms/ORBoost.m
@@ -127,7 +127,12 @@
                 model_information.testTime = etime(c2,c1);
 
                 fid = fopen(modelFile);
-                s = textscan(fid,'%s','Delimiter','\n','bufsize', 2^18-1);
+                if verLessThan('matlab','8.4')
+                    s = textscan(fid,'%s','Delimiter','\n','bufsize', 2^18-1);
+                else
+                    s = textscan(fid,'%s','Delimiter','\n');
+                end
+
                 s = s{1};
                 fclose(fid);
 

diff --git a/src/Algorithms/SVOREX/Makefile b/src/Algorithms/SVOREX/Makefile
@@ -9,7 +9,7 @@ CXX ?= g++
 
 CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
 MEX = $(MATLABDIR)/bin/mex
-MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
 # comment the following line if you use MATLAB on 32-bit computer
 MEX_OPTION += -largeArrayDims
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)

diff --git a/src/Algorithms/SVORIM/Makefile b/src/Algorithms/SVORIM/Makefile
@@ -10,7 +10,7 @@ CXX ?= g++
 
 CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
 MEX = $(MATLABDIR)/bin/mex
-MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
 # comment the following line if you use MATLAB on 32-bit computer
 MEX_OPTION += -largeArrayDims
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)

diff --git a/src/Algorithms/libsvm-rank-2.81/matlab/Makefile b/src/Algorithms/libsvm-rank-2.81/matlab/Makefile
@@ -10,7 +10,7 @@ CXX = g++
 CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
 
 MEX = $(MATLABDIR)/bin/mex
-MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
 # comment the following line if you use MATLAB on 32-bit computer
 MEX_OPTION += -largeArrayDims
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)

diff --git a/src/Algorithms/libsvm-weights-3.12/matlab/Makefile b/src/Algorithms/libsvm-weights-3.12/matlab/Makefile
@@ -9,7 +9,7 @@ CXX ?= g++
 CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
 
 MEX = $(MATLABDIR)/bin/mex
-MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
 # comment the following line if you use MATLAB on 32-bit computer
 MEX_OPTION += -largeArrayDims
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)

diff --git a/src/Algorithms/orensemble/Makefile b/src/Algorithms/orensemble/Makefile
@@ -1,10 +1,9 @@
-
-all: orensemble
-	make -C orensemble
+all: untar
+	make -e -C orensemble
 	mv orensemble/boostrank-predict .
 	mv orensemble/boostrank-train .
 
-orensemble:
+untar:
 	tar xzf orensemble.tar.gz
 
 clean:

diff --git a/src/Algorithms/orensemble/orensemble.tar.gz b/src/Algorithms/orensemble/orensemble.tar.gz
diff --git a/src/Algorithms/orensemble/orensemble/Makefile b/src/Algorithms/orensemble/orensemble/Makefile
diff --git a/src/Algorithms/orensemble/orensemble/README b/src/Algorithms/orensemble/orensemble/README