Version 7.12.2. Option -precision of the -cmp function of the xlmlima utility

Author: Charles PIGNEROL

cmake/version.cmake

@@ -4,7 +4,7 @@
 
 set (LIMA_MAJOR_VERSION "7")
 set (LIMA_MINOR_VERSION "12")
-set (LIMA_RELEASE_VERSION "1")
+set (LIMA_RELEASE_VERSION "2")
 set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})
 
 

installation.txt

@@ -22,7 +22,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=OFF -DSUMESH:BOOL=OFF -DFORMAT_MLI:BOOL=OFF -DFORMAT_MLI2:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython3_ROOT_DIR=/usr/lib/python3 -DHDF5_ROOT=/opt/HDF5/1.12.0  \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.1
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.2
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 
@@ -32,7 +32,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=ON -DSUMESH:BOOL=ON -DFORMAT_MLI:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython3_ROOT_DIR=/usr/lib/python3 -DHDF5_ROOT=/opt/HDF5/1.12.0 -DHDF145_INCLUDE_DIR=/opt/hdf145/1.3.0/include -DHDF145CPP_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145_cpp.so -DHDF145_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145.so \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.1
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.2
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 

src/Xlmlima_exe/XlmLimaComparer.cpp

@@ -41,6 +41,8 @@ inline bool operator == (const Noeud& n1, const Noeud& n2)
 	double	dy	= n1.y ( ) - n2.y ( );
 	double	dz	= n1.z ( ) - n2.z ( );
 	double	distance2	= dx * dx + dy * dy + dz * dz;
+if (!le (distance2, epsilon2))
+	cout << setprecision (20) << "D2=" << distance2 << " D=" << sqrt (distance2) << " EPS2=" << epsilon2 << " (" << n1.x ( ) << ", " << n1.y ( ) << ", " << n1.z ( ) << ") != (" << n2.x ( ) << ", " << n2.y ( ) << ", " << n2.z ( ) << ")" << endl;
 
 	return le (distance2, epsilon2);
 }	// operator == (const Noeud& n1, const Noeud& n2)
@@ -298,6 +300,7 @@ void XlmLimaComparer::run ( )
 		compareAttributes (mesh1.att_polyedres ( ), mesh2.att_polyedres ( ));
 
 		// Comparaison des noeuds :
+		// CP v 7.12.2 : être capable de spécifier l'epsilon pour la comparaison des noeuds
 		epsilon2	= getPrecision ( ) * getPrecision ( );
 		size_t	i	= 0, j	= 0;
 		for (i = 0; i < mesh1.nb_noeuds ( ); i++)
@@ -310,8 +313,8 @@ void XlmLimaComparer::run ( )
 			}	// if (n1.id ( ) != n2.id ( ))
 			if (n1 != n2)
 			{
-				str << "Les noeuds " << n1.id ( ) << " n'ont pas les mêmes coordonnées (" << n1.x ( ) << ", " << n1.y ( ) << ", "
-				    << n1.z ( ) << ") / (" << n2.x ( ) << ", " << n2.y ( ) << ", " << n2.z ( ) << ").";
+				str << "Les noeuds " << n1.id ( ) << " n'ont pas les mêmes coordonnées (" << setprecision (20)
+				    << n1.x ( ) << ", " << n1.y ( ) << ", " << n1.z ( ) << ") / (" << n2.x ( ) << ", " << n2.y ( ) << ", " << n2.z ( ) << ").";
 				throw XlmLimaException (str.str ( ));
 			}	// if (n1 != n2)
 		}	// for (i = 0; i < mesh1.nb_noeuds ( ); i++)

src/Xlmlima_exe/XlmLimaFactory.cpp

@@ -167,27 +167,47 @@ XlmLimaAction* XlmLimaFactory::createAction (int argc, char* argv [])
 
 	if (action == "-cmp")
 	{
+		double		precision	= DBL_EPSILON;
 		string		inputFile2 ("");
 		format_t	inputFormat2	= SUFFIXE;
 
 		switch (argc)
 		{
-			case	3	:
+			case	3	:	// => -cmp infile outfile
 				inputFile	= argv [1];
 				inputFile2	= argv [2];
 				break;
 			case	5	:
+				if (0 == strcmp (argv [3], "-precision"))
+				{	// => -cmp infile outfile -precision precision
+					inputFile	= argv [1];
+					inputFile2	= argv [2];
+					precision	= stringToDouble (argv [4]);
+				}	// if (0 == strcmp (argv [3], "-precision"))
+				else
+				{	// -cmp format infile format outfile
+					inputFormat	= stringToFormat (argv [1]);
+					inputFile	= argv [2];
+					inputFormat2= stringToFormat (argv [3]);
+					inputFile2	= argv [4];
+				}	// else if (0 == strcmp (argv [3], "-precision"))
+				break;
+			case	7	:	// -cmp format infile format outfile -precision precision
+				if (0 != strcmp (argv [6], "-precision"))
+					break;
 				inputFormat	= stringToFormat (argv [1]);
 				inputFile	= argv [2];
 				inputFormat2= stringToFormat (argv [3]);
 				inputFile2	= argv [4];
+				precision	= stringToDouble (argv [6]);
 				break;
 			default		:
 				syntax ( );
 		}	// switch (argc)
 
-		return new XlmLimaComparer (
-								inputFile, inputFormat, inputFile2, inputFormat2);
+		XlmLimaComparer*	comparer	= new XlmLimaComparer (inputFile, inputFormat, inputFile2, inputFormat2);
+		comparer->setPrecision (precision);	// v 7.12.2
+		return comparer;
 	}	// if (action == "-cmp")
 
 
@@ -281,7 +301,7 @@ void XlmLimaFactory::syntax ( )
 	message	+= string ("\n        \tpour préparer\n");
 	message	+= string ("        -cp [format] fichier_entrée [format] fichier_sortie");
 	message	+= string ("\n        \tpour copier\n");
-	message	+= string ("        -cmp [format] fichier1 [format] fichier2");
+	message	+= string ("        -cmp [format] fichier1 [format] fichier2 [-precision precision]");
 	message	+= string ("\n        \tpour comparer deux maillages\n");
 	message	+= string ("        -m [format] fichier_entrée [format] fichier_sortie");
 	message	+= string ("\n        \tpour exprimer les coordonnées en mètres\n");