Bug corrections for invalid input checks.

lingfeiwang · May 11, 2016 · e3d289a · e3d289a
1 parent 2203fde
commit e3d289a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ URL_LIB="https://github.com/lingfeiwang/findr"
 URL_BIN="https://github.com/lingfeiwang/findr-bin"
 URL_PYTHON="https://github.com/lingfeiwang/findr-python"
 URL_R="https://github.com/lingfeiwang/findr-R"
-URL_DOC="https://github.com/lingfeiwang/findr/blob/gh-pages/doc.pdf"
+URL_DOC="https://github.com/lingfeiwang/findr/blob/master/doc.pdf"
 VERSION1=0
 VERSION2=1
 VERSION3=0

diff --git a/pij/gassist/llrtopij_a.c b/pij/gassist/llrtopij_a.c
@@ -55,7 +55,7 @@ int pij_gassist_llrtopij_a_convert(const MATRIXF* d,const MATRIXF* dconv,MATRIXF
 	{
 		FTYPE		dmin,dmax;
 		MATRIXFF(minmax)(d,&dmin,&dmax);
-		if(!(dmin>=0))
+		if((!(dmin>=0))||gsl_isnan(dmax)||gsl_isinf(dmax))
 			ERRRET("Negative or NAN found in input data. It may invalidate follow up analysis. This may be due to incorrect previous steps.")
 		h=pij_llrtopij_a_nullhist((double)dmax,nv,ns,d->size2,n1d,n2d);
 		if(!h)

diff --git a/pij/llrtopij_a.c b/pij/llrtopij_a.c
@@ -125,7 +125,7 @@ int pij_llrtopij_a_convert_single(const MATRIXF* d,const MATRIXF* dconv,MATRIXF*
 	{
 		FTYPE		dmin,dmax;
 		MATRIXFF(minmax)(d,&dmin,&dmax);
-		if(!(dmin>=0))
+		if((!(dmin>=0))||gsl_isnan(dmax)||gsl_isinf(dmax))
 			ERRRET("Negative or NAN found in input data. It may invalidate follow up analysis. This may be due to incorrect previous steps.")
 		h=pij_llrtopij_a_nullhist_single((double)dmax,d->size2,n1,n2);
 		if(!h)