Adding explicit data types to the Matlab interface. Now integer problems can be tackled, too.

resources/MatlabInterface/@JEInterface/JEInterface.m

@@ -1,12 +1,14 @@
-function int = JEInterface(fhandle, range, varargin)
+function int = JEInterface(fhandle, datatype, range, varargin)
 % EvA2 Interface for Matlab
-%       JEInterface(fhandle, range)
-%       JEInterface(fhandle, range, initRange)
-%       JEInterface(fhandle, range, initRange, defaultargs)
-%       JEInterface(fhandle, range, initRange, defaultargs, options...)
+%       JEInterface(fhandle, datatype, range)
+%       JEInterface(fhandle, datatype, range, initRange)
+%       JEInterface(fhandle, datatype, range, initRange, defaultargs)
+%       JEInterface(fhandle, datatype, range, initRange, defaultargs, options...)
 %
 % Arguments: 
 %   fhandle: a function handle defining the optimization target.
+%   datatype: symbol 'int', 'double', or 'binary' denoting the problem data
+%       type
 %   range: a 2 x dim array defining the solution subspace with lower and
 %      upper bounds; or a scalar defining the bitwidth for binary
 %      problems.
@@ -52,11 +54,22 @@ int.mediator = '';
 int.optParams = [];
 int.optParamValues = [];
 int.hexMask=hex2dec('ffffffff');
+int.dataType=''; % to be set later!
 
 if (isa(fhandle, 'function_handle'))
     int.f = fhandle;
 else
-    error('Wrong second argument type, expected function_handle');
+    error('Wrong first argument type, expected function_handle');
+end
+
+if (strcmp(datatype,'double'))
+    int.dataType=eva2.server.go.problems.MatlabProblemDataTypeEnum.typeDouble;
+elseif strcmp(datatype, 'int')
+    int.dataType=eva2.server.go.problems.MatlabProblemDataTypeEnum.typeInteger;
+elseif strcmp(datatype, 'binary')
+    int.dataType=eva2.server.go.problems.MatlabProblemDataTypeEnum.typeBinary;
+else
+    error('Invalid data type, select double, int, or binary!');
 end
 
 disp('Setting up JEInterface...');
@@ -79,7 +92,7 @@ end
 int = class(int,'JEInterface');
 int.opts = makeOptions(int);
 
-if (nargin>2)
+if (nargin>3)
     int.initialRange=varargin{1};
     
     if (isa(varargin{1}, 'double') && (size(varargin{1},1) == 2))
@@ -91,15 +104,15 @@ if (nargin>2)
         disp(s);
     end
     
-    if (nargin>3)
+    if (nargin>4)
         int.args = varargin{2};
         disp('Fitness function argument: '); disp(int.args);
-        if (nargin > 4)
-            if (rem(nargin,2)==1)
+        if (nargin > 5)
+            if (rem(nargin,2)==0)
                 error('Invalid number of arguments!');
             end
             disp('Reading options:');
-            for i=3:2:nargin-2
+            for i=3:2:nargin-3
                 int=setOpt(int, varargin{i}, varargin{i+1});
             end
         end
@@ -107,11 +120,15 @@ if (nargin>2)
 end  
 display(getOptions(int));
 % finally create the java object
-if (isempty(int.initialRange))
-    int.mp = eva2.server.go.problems.MatlabProblem(int.dim, int.range);
+if (isempty(int.initialRange)) % binary case
+    int.mp = eva2.server.go.problems.MatlabProblem(int.dim, int.dataType, int.range);
 else
-    if (isempty(int.range) || eq(size(int.range), size(int.initialRange)))
-        int.mp = eva2.server.go.problems.MatlabProblem(int.dim, int.range, int.initialRange);
+%     size(int.range);
+%     size(int.initialRange);
+%     eq(size(int.range), size(int.initialRange))
+%     disp('-------');
+    if (isempty(int.range) || (sum(eq(size(int.range), size(int.initialRange)))==2))
+        int.mp = eva2.server.go.problems.MatlabProblem(int.dim, int.dataType, int.range, int.initialRange);
         %int.mp.getIndividualTemplate().setMutationOperator( ...
         %    eva2.server.go.operators.mutation.MutateEAMixer(eva2.server.go.operators.mutation.MutateGASwapBits, eva2.server.go.operators.mutation.MutateGAUniform));
     else 

resources/MatlabInterface/@JEInterface/testEvalFunc.m

@@ -2,7 +2,7 @@ function testEvalFunc(int)
 % Test the fitness function output format.
 wordwidth=32;
 
-if (isempty(int.range))
+if (strcmp(int.dataType,eva2.server.go.problems.MatlabProblemDataTypeEnum.typeBinary))
     % binary problem
     s=sprintf('Binary problem of bitwidth %d', int.dim);
     disp(s);
@@ -13,7 +13,7 @@ if (isempty(int.range))
     %x(numInts)=bitshift(x(numInts),-overheadBits); % shift right by overhead
     bs=eva2.tools.math.RNG.randomBitSet(0.5, int.dim);
     x=convertUnsignedJE(int, bs);
-else
+elseif strcmp(int.dataType,eva2.server.go.problems.MatlabProblemDataTypeEnum.typeDouble)
     % double problem
     x=rand(1, int.dim);
     s=sprintf('Real valued problem in %d dimensions and range %s ', int.dim, mat2str(int.range));
@@ -21,8 +21,16 @@ else
     for i=1:int.dim
         x(i)=int.range(i,1)+x(i)*(int.range(i,2)-int.range(i,1));
     end
+elseif strcmp(int.dataType,eva2.server.go.problems.MatlabProblemDataTypeEnum.typeInteger)
+    % integer problem
+    s=sprintf('Real valued problem in %d dimensions and range %s ', int.dim, mat2str(int.range));
+    disp(s);
+    size(int.range)
+    %x=int.range(1,:)+ceil(rand(1,int.dim).*int.range(2,:)-int.range(1,:));
+    x=(int.range(:,1)+ceil(rand(int.dim,1).*int.range(:,2)-int.range(:,1)))';
+else 
+    error('Invalid data type in testEvalFunc.m!'); 
 end
-
 if (isempty(int.range))
     msg=sprintf('\nTesting value: %d, bin.: %s', x, dec2bin(x, int.dim));
 else