Fixed a bug in the comparison of variables that included Inf or -Inf …

…(in the 1.0.1 release psom_cmp_var(Inf,Inf) would return false).
SIMEXP · Aug 21, 2013 · fc03b94 · fc03b94
1 parent 3f2789d
commit fc03b94
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/READ_ME.txt b/READ_ME.txt
@@ -1,4 +1,4 @@
-=Pipeline System for Octave and Matlab (PSOM), version 1.0.1=
+=Pipeline System for Octave and Matlab (PSOM), version 1.0.2=
 
 The pipeline system for Octave and Matlab (PSOM) is a lightweight library to manage complex multi-stage data processing. 
 A pipeline is a collection of jobs, i.e. Matlab or Octave codes with a well identified set of options that are using files for inputs and outputs. 

diff --git a/psom_cmp_var.m b/psom_cmp_var.m
@@ -82,7 +82,7 @@
                 mask_nan = isnan(var1);
                 flag_equal = false(size(var1));
                 flag_equal(mask_nan) = isnan(var2(mask_nan));
-                flag_equal(~mask_nan) = abs(var1(~mask_nan) - var2(~mask_nan)) <= opt.eps;
+                flag_equal(~mask_nan) = (abs(var1(~mask_nan) - var2(~mask_nan)) <= opt.eps)|((var1(~mask_nan)==Inf)&(var2(~mask_nan)==Inf))|((var1(~mask_nan)==-Inf)&(var2(~mask_nan)==-Inf));
                 flag_equal = min(flag_equal);                
             end
 

diff --git a/psom_gb_vars.m b/psom_gb_vars.m
@@ -65,7 +65,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % PSOM version
-gb_psom_version = '1.0.1'; % PSOM release number
+gb_psom_version = '1.0.2'; % PSOM release number
 
 % Is the environment Octave or Matlab ?
 if exist('OCTAVE_VERSION','builtin')