Merge pull request #108 from netZoo/devel

Devel

Author: marouenbg

netZooM/otter/otter.m

@@ -20,6 +20,7 @@
 %
 % Outputs:
 %               W  : Predicted TF-gene complete regulatory network as an adjacency matrix of size (t,g).
+
 %global parameters
 if nargin<4
     lambda = 0.0035;
@@ -40,9 +41,9 @@
 %initial transformation
 C = C/trace(C);
 P = P+2.2;
-P = P/trace(P);
 W = P*W;
 W = W/trace(W*W');
+P = P/trace(P);
 
 [t, g] = size(W);
 m = zeros(t, g);

tests/testOtter.m

@@ -44,8 +44,8 @@ function testOtterSimple()
         W_test = csvread(filename);
 
         % Compare the outputs
-        tolMat  =1e-6;
-        deltaMat=max(max(abs(W-W_test)));
+        tolMat  =1e-10;
+        deltaMat=max(max(abs(W_test - W)));
 	    assertTrue( deltaMat < tolMat );
 
 end