Johannes R 12 жил өмнө
parent
commit
e9744e4151

+ 2 - 2
core/algebra/progs/testILSConjugateGradientsLanczos.cpp

@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
 			if ( j == i ) A(i,j) = (i+1)+(j+1);
 			else {
 			  
-			    A(i,j) = sqrt((i+1)*(j+1));
+			    A(i,j) = sqrt( (double)( (i+1)*(j+1) ) );
 			}
 
 			fprintf(logfile, "%f  ",A(i,j));
@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
 	fprintf(logfile, "b:\n");
 	for (uint i = 0; i < b.size(); i++)
 	{	
-	    b(i) = (i+1)*sqrt(i+1);
+	    b(i) = (i+1)*sqrt( (double)( i+1) );
 	    fprintf(logfile, "%f  ",b(i));
 	}
 	fprintf(logfile, "\n");

+ 2 - 2
core/algebra/progs/testILSMinResLanczos.cpp

@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
 			if ( j == i ) A(i,j) = (i+1)+(j+1);
 			else {
 			  
-			    A(i,j) = sqrt((i+1)*(j+1));
+			    A(i,j) = sqrt((double)( (i+1)*(j+1) ));
 			}
 
 			fprintf(logfile, "%f  ",A(i,j));
@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
 	fprintf(logfile, "b:\n");
 	for (uint i = 0; i < b.size(); i++)
 	{	
-	    b(i) = (i+1)*sqrt(i+1);
+	    b(i) = (i+1)*sqrt((double)( i+1) );
 	    fprintf(logfile, "%f  ",b(i));
 	}
 	fprintf(logfile, "\n");

+ 2 - 2
core/algebra/progs/testILSSymmLqLanczos.cpp

@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
 			if ( j == i ) A(i,j) = (i+1)+(j+1);
 			else {
 			  
-			    A(i,j) = sqrt((i+1)*(j+1));
+			    A(i,j) = sqrt( (double)( (i+1)*(j+1)) );
 			}
 
 			fprintf(logfile, "%f  ",A(i,j));
@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
 	fprintf(logfile, "b:\n");
 	for (uint i = 0; i < b.size(); i++)
 	{	
-	    b(i) = (i+1)*sqrt(i+1);
+	    b(i) = (i+1)*sqrt( (double)(i+1) );
 	    fprintf(logfile, "%f  ",b(i));
 	}
 	fprintf(logfile, "\n");

+ 2 - 0
core/vector/progs/testCholeskySpeed.cpp

@@ -37,7 +37,9 @@ double getInvError ( const Matrix & A, const Matrix & Ainv )
 */
 int main (int argc, char **argv)
 {   
+#ifndef WIN32
     std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
+#endif
 
     int size = 500;
 	if ( argc > 1 )