Merge pull request #206 from mldiego/master

Some tests, vnnlib error fix

code/nnv/engine/nn/funcs/TanSig.m

@@ -59,7 +59,7 @@
             if ~isa(I, 'Star')
                 error('Input set is not a star set');
             end            
-            if strcmp(method, 'approx-star-no-split') || strcmp(method, 'approx-star')
+            if strcmp(method, 'approx-star-no-split') || strcmp(method, 'approx-star') || contains(method, 'relax-star')
                 if relaxFactor == 0
                     S = TanSig.multiStepTanSig_NoSplit(I, dis_opt, lp_solver);
                 else

code/nnv/engine/utils/export2vnnlib.m

@@ -106,7 +106,10 @@ function export2vnnlib(lb, ub, outsize, property, name)
     % Outputs a string to write in the vnnlib file
 
     locs = find(hRow ~= 0); % Find indexes that are not zero
-    if hVal == 0 % Compare two indexes
+    if length(locs) > 1
+        if hVal ~= 0 % Compare two indexes
+            error("Only allowed index to index comparison, or 1 index to value, but not both.")
+        end
         if hRow(locs(1)) > 0 % 
             str = "(>= Y_"+string(locs(2)-1) + " " + "Y_"+string(locs(1)-1)+ "))";
         else

code/nnv/engine/utils/load_vnnlib.m

@@ -374,7 +374,7 @@
             if contains(x, 'X')
                 [lb_input, ub_input] =  process_input_constraint(x, lb_input, ub_input);
             else
-                [H, g] =  process_output_combo_constraint(tline, H, g, output_dim);
+                [H, g] =  process_output_combo_constraint(x, H, g, output_dim);
             end
         end
         Hg = HalfSpace(H,g);