#include <gp_Pnt.hxx>
+#include <Precision.hxx>
+#include <Standard_Overflow.hxx>
+
+#include <NCollection_Vector.hxx>
+#include <NCollection_IncAllocator.hxx>
+
#define ItemType gp_Pnt
#define Key1Type Standard_Real
#define Key2Type Standard_Integer
////////////////////////////////DEFINE_HARRAY1(QANCollection_HArray1,QANCollection_Array1)
DEFINE_ARRAY1(QANCollection_Array1Func,QANCollection_BaseColFunc,ItemType)
DEFINE_HARRAY1(QANCollection_HArray1Func,QANCollection_Array1Func)
-IMPLEMENT_HARRAY1(QANCollection_HArray1Func)
#include <NCollection_DefineArray2.hxx>
#include <NCollection_DefineHArray2.hxx>
////////////////////////////////DEFINE_HARRAY2(QANCollection_HArray2,QANCollection_Array2)
DEFINE_ARRAY2(QANCollection_Array2Func,QANCollection_BaseColFunc,ItemType)
DEFINE_HARRAY2(QANCollection_HArray2Func,QANCollection_Array2Func)
-IMPLEMENT_HARRAY2(QANCollection_HArray2Func)
#include <NCollection_DefineMap.hxx>
#include <NCollection_DefineDataMap.hxx>
////////////////////////////////DEFINE_HSEQUENCE(QANCollection_HSequence,QANCollection_Sequence)
DEFINE_SEQUENCE(QANCollection_SequenceFunc,QANCollection_BaseColFunc,ItemType)
DEFINE_HSEQUENCE(QANCollection_HSequenceFunc,QANCollection_SequenceFunc)
-IMPLEMENT_HSEQUENCE(QANCollection_HSequenceFunc)
// HashCode and IsEquel must be defined for key types of maps
Standard_Integer HashCode(const gp_Pnt thePnt, int theUpper)
// Assign
AssignCollection (theL, aL);
+ // Different allocators
+ {
+ // The joining of list having different allocator can cause memory error
+ // if the fact of different allocator is not taken into account.
+ Handle(NCollection_IncAllocator) anAlloc = new NCollection_IncAllocator;
+ QANCollection_ListFunc aS2(anAlloc);
+ aS2.Append(anItem);
+ theL.Prepend(aS2);
+ aS2.Append(anItem);
+ theL.Append(aS2);
+ aS2.Append(anItem);
+ QANCollection_ListFunc::Iterator anIter(theL);
+ theL.InsertBefore(aS2, anIter);
+ aS2.Append(anItem);
+ theL.InsertAfter(aS2, anIter);
+ }
+
// Clear
aL.Clear();
}
// Assign
AssignCollection (theS, aS);
+ // Different allocators
+ {
+ // The joining of sequence having different allocator can cause memory error
+ // if the fact of different allocator is not taken into account.
+ Handle(NCollection_IncAllocator) anAlloc = new NCollection_IncAllocator;
+ QANCollection_SequenceFunc aS2(anAlloc);
+ aS2.Append(anItem);
+ theS.Prepend(aS2);
+ aS2.Append(anItem);
+ theS.Append(aS2);
+ aS2.Append(anItem);
+ theS.InsertBefore(1, aS2);
+ aS2.Append(anItem);
+ theS.InsertAfter(1, aS2);
+ }
+
// Clear
aS.Clear();
}
// ===================== Test methods of Map type =============================
////////////////////////////////void TestMap (QANCollection_Map& theM)
-static void TestMap (QANCollection_MapFunc& theM)
+static void TestMap(QANCollection_MapFunc& theM, Draw_Interpretor& theDI)
{
- // Extent
- Standard_Integer iExt=theM.Extent();
- Standard_Integer i;
-
- printf ("Info: testing Map(l=%d)\n", iExt);
- theM.Statistics(cout);
- // Resize
- theM.ReSize(8);
- theM.Statistics(cout);
- cout.flush();
- // Constructor
- ////////////////////////////////QANCollection_Map aM;
- QANCollection_MapFunc aM;
- // Add
- Key1Type aKey;
- for (i=0; i<8; i++)
{
- Random (aKey);
- aM.Add (aKey);
- }
- // Contains, Remove
- if (!aM.Contains(aKey))
- {
- printf("Error : map says that it does not contain its key ");
- PrintItem(aKey);
+ // Extent
+ Standard_Integer iExt=theM.Extent();
+ Standard_Integer i;
+
+ printf ("Info: testing Map(l=%d)\n", iExt);
+ theM.Statistics(cout);
+ // Resize
+ theM.ReSize(8);
+ theM.Statistics(cout);
+ cout.flush();
+ // Constructor
+ ////////////////////////////////QANCollection_Map aM;
+ QANCollection_MapFunc aM;
+ // Add
+ Key1Type aKey;
+ for (i=0; i<8; i++)
+ {
+ Random (aKey);
+ aM.Add (aKey);
+ }
+ // Contains, Remove
+ if (!aM.Contains(aKey))
+ {
+ theDI << "Error: map says that it does not contain its key " << aKey;
+ }
+ else
+ {
+ aM.Remove(aKey);
+ cout << " successfully removed item, l=%d\n" << aM.Size() << "\n";
+ }
+ // Copy constructor (including operator=)
+ ////////////////////////////////QANCollection_Map aM2 = QANCollection_Map(aM);
+ QANCollection_MapFunc aM2 = QANCollection_MapFunc(aM);
+ // Assign
+ AssignCollection (aM2,theM);
+
+ // Clear
+ aM.Clear();
}
- else
+
+ // Check method 'HasIntersection'.
{
- aM.Remove(aKey);
- printf(" successfully removed item, l=%d\n", aM.Size());
- }
- // Copy constructor (including operator=)
- ////////////////////////////////QANCollection_Map aM2 = QANCollection_Map(aM);
- QANCollection_MapFunc aM2 = QANCollection_MapFunc(aM);
- // Assign
- AssignCollection (aM2,theM);
+ QANCollection_MapFunc aM1, aM2, aM3;
- // Clear
- aM.Clear();
+ aM1.Add(6);
+ aM1.Add(8);
+ aM1.Add(10);
+
+ aM2.Add(4);
+ aM2.Add(8);
+ aM2.Add(16);
+
+ aM3.Add(1);
+ aM3.Add(2);
+ aM3.Add(3);
+
+ if (!aM1.HasIntersection(aM2) || !aM2.HasIntersection(aM1) ||
+ aM1.HasIntersection(aM3) || aM3.HasIntersection(aM1))
+ {
+ theDI << "Error: method 'HasIntersection' failed.";
+ }
+ }
}
// ===================== Test methods of DataMap type =========================
// Substitute
Random(aKey);
aM.Substitute(1,aKey);
+ if (!aM.Contains (aKey) || aM.FindIndex (aKey) != 1)
+ {
+ printf("Error : map does not contain valid key after substitute");
+ }
+ // Invoke substitute with the same key
+ aM.Substitute(1,aKey);
+ if (!aM.Contains (aKey) || aM.FindIndex (aKey) != 1)
+ {
+ printf("Error : map does not contain valid key after substitute");
+ }
// Copy constructor (including operator=)
////////////////////////////////QANCollection_IndexedMap aM2 = QANCollection_IndexedMap(aM);
QANCollection_IndexedMapFunc aM2 = QANCollection_IndexedMapFunc(aM);
aM.RemoveLast();
printf(" successfully removed item, l=%d\n", aM.Size());
}
- // Substitute
+ // Substitute with different keys
Random(aKey);
aM.Substitute (1, aKey, anItem);
+ if (!aM.Contains (aKey) || aM.FindIndex (aKey) != 1 || !aM.FindFromKey (aKey).IsEqual (anItem, Precision::Confusion()))
+ {
+ printf("Error : map does not contain valid key and item after substitute");
+ }
+ // Substitute with equal keys
+ Random(anItem);
+ aM.Substitute (1, aKey, anItem);
+ if (!aM.Contains (aKey) || aM.FindIndex (aKey) != 1 || !aM.FindFromKey (aKey).IsEqual (anItem, Precision::Confusion()))
+ {
+ printf("Error : map does not contain valid key and item after substitute");
+ }
// Copy constructor (including operator=)
////////////////////////////////theM = QANCollection_IDMap(aM);
theM = QANCollection_IDMapFunc(aM);
Standard_Integer CheckArguments1(Draw_Interpretor& di, Standard_Integer argc, const char ** argv, Standard_Integer& Lower, Standard_Integer& Upper)
{
if ( argc != 3) {
- di << "Usage : " << argv[0] << " Lower Upper" << "\n";
+ di << "Usage : " << argv[0] << " Lower Upper\n";
return 1;
}
Lower = Draw::Atoi(argv[1]);
Upper = Draw::Atoi(argv[2]);
if ( Lower > Upper ) {
- di << "Lower > Upper" << "\n";
+ di << "Lower > Upper\n";
return 1;
}
return 0;
Standard_Integer CheckArguments2(Draw_Interpretor& di, Standard_Integer argc, const char ** argv, Standard_Integer& LowerRow, Standard_Integer& UpperRow, Standard_Integer& LowerCol, Standard_Integer& UpperCol)
{
if ( argc != 5) {
- di << "Usage : " << argv[0] << " LowerRow UpperRow LowerCol UpperCol" << "\n";
+ di << "Usage : " << argv[0] << " LowerRow UpperRow LowerCol UpperCol\n";
return 1;
}
LowerRow = Draw::Atoi(argv[1]);
LowerCol = Draw::Atoi(argv[3]);
UpperCol = Draw::Atoi(argv[4]);
if ( LowerRow > UpperRow ) {
- di << "LowerRow > UpperRow" << "\n";
+ di << "LowerRow > UpperRow\n";
return 1;
}
if ( LowerCol > UpperCol ) {
- di << "LowerCol UpperCol> " << "\n";
+ di << "LowerCol UpperCol> \n";
return 1;
}
return 0;
}
QANCollection_Array2Func anArr2(LowerRow, UpperRow, LowerCol, UpperCol);
TestArray2(anArr2);
+
+ // check resize
+ for (int aPass = 0; aPass <= 5; ++aPass)
+ {
+ Standard_Integer aNewLowerRow = LowerRow, aNewUpperRow = UpperRow, aNewLowerCol = LowerCol, aNewUpperCol = UpperCol;
+ switch (aPass)
+ {
+ case 0: aNewLowerRow -= 1; break;
+ case 1: aNewLowerCol -= 1; break;
+ case 2: aNewLowerRow -= 1; aNewLowerCol -= 1; break;
+ case 3: aNewUpperRow += 1; break;
+ case 4: aNewUpperCol += 1; break;
+ case 5: aNewUpperRow += 1; aNewUpperCol += 1; break;
+ }
+ QANCollection_Array2Func anArr2Copy = anArr2;
+ anArr2Copy.Resize (aNewLowerRow, aNewUpperRow, aNewLowerCol, aNewUpperCol, true);
+ const Standard_Integer aNbRowsMin = Min (anArr2.NbRows(), anArr2Copy.NbRows());
+ const Standard_Integer aNbColsMin = Min (anArr2.NbColumns(), anArr2Copy.NbColumns());
+ for (Standard_Integer aRowIter = 0; aRowIter < aNbRowsMin; ++aRowIter)
+ {
+ for (Standard_Integer aColIter = 0; aColIter < aNbColsMin; ++aColIter)
+ {
+ const gp_Pnt& aPnt1 = anArr2 .Value (aRowIter + anArr2.LowerRow(), aColIter + anArr2.LowerCol());
+ const gp_Pnt& aPnt2 = anArr2Copy.Value (aRowIter + anArr2Copy.LowerRow(), aColIter + anArr2Copy.LowerCol());
+ if (!aPnt1.IsEqual (aPnt2, gp::Resolution()))
+ {
+ std::cerr << "Error: 2D array is not properly resized\n";
+ return 1;
+ }
+ }
+ }
+ }
+
+ QANCollection_Array2Func anArr2Copy2 = anArr2;
+ anArr2Copy2.Resize (LowerRow - 1, UpperRow - 1, LowerCol + 1, UpperCol + 1, false);
+
return 0;
}
return 1;
}
QANCollection_MapFunc aMap;
- TestMap(aMap);
+ TestMap(aMap, di);
return 0;
}
return 0;
}
+//=======================================================================
+//function : QANColTestVector
+//purpose :
+//=======================================================================
+static Standard_Integer QANColTestVector (Draw_Interpretor&, Standard_Integer, const char**)
+{
+ // test method Append and copying of empty vector
+ NCollection_Vector<int> aVec;
+ NCollection_Vector<int> aVec2 (aVec);
+ NCollection_Vector<int> aVec3;
+ aVec3 = aVec;
+
+ aVec.Append(5);
+ if (aVec(0) != 5)
+ std::cout << "Error: wrong value in original vector!" << endl;
+ aVec2.Append(5);
+ if (aVec2(0) != 5)
+ std::cout << "Error: wrong value in copy-constructed vector!" << endl;
+ aVec3.Append(5);
+ if (aVec3(0) != 5)
+ std::cout << "Error: wrong value in copied vector!" << endl;
+ std::cout << "Test OK" << endl;
+
+ return 0;
+}
+
//=======================================================================
//function : QANColTestSequence
//purpose :
return 0;
}
+//=======================================================================
+//function : QANColTestMove
+//purpose :
+//=======================================================================
+
+// Return array based on local C array buffer by value.
+// Note that this is expected to cause errors due
+// to the fact that returned copy will keep reference to the
+// buffer allocated in the stack of this function.
+// Unfortunately, this cannot be prevented due to the fact that
+// modern compilers use return value optimization in release mode
+// (object that is returned is constructed once at its target
+// place and never copied).
+static NCollection_Array1<double> GetArrayByValue()
+{
+ const int aLen = 1024;
+ double aCArray[aLen];
+ NCollection_Array1<double> anArray (aCArray[0], 1, aLen);
+ for (int i = 1; i <= aLen; i++)
+ anArray.SetValue(i, i + 113.);
+ return anArray;
+}
+
+// check array for possible corruption
+static bool CheckArrayByValue(NCollection_Array1<double> theArray)
+{
+ for (int i = 1; i <= theArray.Length(); i++)
+ {
+ if (theArray.Value(i) != i + 113.)
+ {
+ std::cout << "Error at item " << i << ": value = " << theArray.Value(i) << ", expected " << i + 113. << std::endl;
+ return false;
+ }
+ }
+ return true;
+}
+
+static Standard_Integer QANColTestArrayMove (Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
+{
+ if ( argc != 1) {
+ di << "Usage : " << argv[0] << "\n";
+ return 1;
+ }
+ NCollection_Array1<double> anArray = GetArrayByValue();
+ di << (CheckArrayByValue(anArray) ? "Error: memory corruption is not detected" : "Expected behavior: memory is corrupted");
+ return 0;
+}
+
+#include <math_BullardGenerator.hxx>
+#include <OSD_Timer.hxx>
+
+static inline double test_atof (const char* theStr)
+{
+ return atof (theStr);
+}
+
+static inline double test_Atof (const char* theStr)
+{
+ return Atof (theStr);
+}
+
+static inline double test_strtod (const char* theStr)
+{
+ char *end;
+ return strtod (theStr, &end);
+}
+
+static inline double test_Strtod (const char* theStr)
+{
+ char *end;
+ return Strtod (theStr, &end);
+}
+
+static inline double test_sscanf (const char* theStr)
+{
+ double val = 0.;
+ sscanf (theStr, "%lf", &val);
+ return val;
+}
+
+static int check_atof (const NCollection_Array2<char>& theStrings, const char* theFormat,
+ double (*test_func)(const char*), Draw_Interpretor& di)
+{
+ int aNbErr = 0;
+ for (int i = 0; i < theStrings.UpperRow(); i++)
+ {
+ const char *aStr= &theStrings(i,0);
+ char buff[256];
+ double aVal = test_func (aStr);
+ Sprintf (buff, theFormat, aVal);
+ if (strcasecmp (buff, &theStrings(i,0)))
+ {
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ // MSVC < 2015 prints nan and inf as 1.#NAN or 1.INF, and noes not recognize nan or inf on read
+ if (strstr (aStr, "1.#") || strstr (aStr, "nan") || strstr (aStr, "inf") ||
+ strstr (aStr, "NAN") || strstr (aStr, "INF"))
+ continue;
+#endif
+ if (aNbErr < 5)
+ {
+ di << "Deviation parsing " << aStr << " and print back: " << buff << "\n";
+ }
+ aNbErr++;
+ }
+ }
+ return aNbErr;
+}
+
+// Test speed of standard and OCCT-specific (accelerated) functions to parse string to double
+static Standard_Integer QATestAtof (Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
+{
+ int aNbToTest = Max (100, (argc > 1 ? Draw::Atoi(argv[1]) : 1000000));
+ int aNbDigits = (argc > 2 ? Draw::Atoi(argv[2]) : 10);
+ double aRangeMin = (argc > 3 ? Draw::Atof(argv[3]) : -1e9);
+ double aRangeMax = (argc > 4 ? Draw::Atof(argv[4]) : 1e9);
+
+ char aFormat[256];
+ Sprintf (aFormat, "%%.%dlg", Max (2, Min (20, aNbDigits)));
+
+ // prepare data
+ const int MAXLEN = 256;
+ NCollection_Array2<char> aValuesStr (0, aNbToTest - 1, 0, MAXLEN);
+ math_BullardGenerator aRandom;
+
+ if (aRangeMin < aRangeMax)
+ {
+ // random values within specified range
+// std::default_random_engine aRandomEngine;
+// std::uniform_real_distribution<double> aRandomDistr (aRangeMin, aRangeMax);
+ const uint64_t aMaxUInt64 = ~(uint64_t)0; // could be (not supported by old GCC): std::numeric_limits<uint64_t>::max()
+ for (int i = 0; i < aNbToTest; i++)
+ {
+// double aVal = aRandomDistr (aRandomEngine);
+ uint64_t aIVal = ((uint64_t)aRandom.NextInt() << 32) + aRandom.NextInt();
+ double aVal = aRangeMin + (aIVal / (double)aMaxUInt64) * (aRangeMax - aRangeMin);
+ Sprintf(&aValuesStr(i,0), aFormat, aVal);
+ }
+ }
+ else
+ {
+ // special values
+ int i = 0;
+
+ strcpy (&aValuesStr(i++,0), "nan");
+ strcpy (&aValuesStr(i++,0), "nan(qnan)");
+ strcpy (&aValuesStr(i++,0), "NAN");
+ strcpy (&aValuesStr(i++,0), "-nan");
+ strcpy (&aValuesStr(i++,0), "-NAN");
+ strcpy (&aValuesStr(i++,0), "inf");
+ strcpy (&aValuesStr(i++,0), "INF");
+ strcpy (&aValuesStr(i++,0), "-inf");
+ strcpy (&aValuesStr(i++,0), "-INF");
+
+ strcpy (&aValuesStr(i++,0), " ."); // standalone period should not be considered as a number
+ strcpy (&aValuesStr(i++,0), "nanabcdef_128 xx"); // extra non-parenthised sequence after "nan"
+
+ strcpy (&aValuesStr(i++,0), "905791934.11394954"); // value that gets rounded in a wrong way by fast Strtod()
+ strcpy (&aValuesStr(i++,0), "9.343962790444495e+148"); // value where strtod() and Strtod() differ by 2 Epsilon
+
+ strcpy (&aValuesStr(i++,0), " 12345.67text"); // test for leading whitespaces and trailing text
+ strcpy (&aValuesStr(i++,0), "000.000"); // test for zero
+ strcpy (&aValuesStr(i++,0), "000.000e-0002"); // test for zero
+
+ strcpy (&aValuesStr(i++,0), "1000000000000000000000000000012345678901234567890"); // huge mantissa
+ strcpy (&aValuesStr(i++,0), "0000000000.00000000000000000012345678901234567890"); // leading zeros
+ strcpy (&aValuesStr(i++,0), "1.00000000000000000000000000012345678901234567890"); // long fractional part
+
+ strcpy (&aValuesStr(i++,0), "0.0000000001e318"); // large exponent but no overflow
+ strcpy (&aValuesStr(i++,0), "-1.7976931348623158e+308"); // -DBL_MAX
+ strcpy (&aValuesStr(i++,0), "1.79769313486232e+308"); // overflow
+
+ strcpy (&aValuesStr(i++,0), "10000000000e-310"); // large negative exponent but no underflow
+ strcpy (&aValuesStr(i++,0), "1.1e-310"); // underflow
+ strcpy (&aValuesStr(i++,0), "0.000001e-310"); // underflow
+ strcpy (&aValuesStr(i++,0), "2.2250738585072014e-308"); // underflow, DBL_MIN
+ strcpy (&aValuesStr(i++,0), "2.2250738585e-308"); // underflow, value less than DBL_MIN
+
+ strcpy (&aValuesStr(i++,0), "2.2204460492503131e-016"); // DBL_EPSILON
+
+ // random binary data
+// std::default_random_engine aRandomEngine;
+// std::uniform_int_distribution<uint64_t> aRandomDistr (0, ~(uint64_t)0);
+ for (; i < aNbToTest; i++)
+ {
+ union {
+ uint64_t valint;
+ double valdbl;
+ } aVal;
+// aVal.valint = aRandomDistr (aRandomEngine);
+ aVal.valint = ((uint64_t)aRandom.NextInt() << 32) + aRandom.NextInt();
+ Sprintf(&aValuesStr(i,0), aFormat, aVal.valdbl);
+ }
+ }
+
+ // test different methods
+#define TEST_ATOF(method) \
+ OSD_Timer aT_##method; aT_##method.Start(); \
+ double aRes_##method = 0.; \
+ for (int i = 0; i < aNbToTest; i++) { aRes_##method += test_##method (&aValuesStr(i,0)); } \
+ aT_##method.Stop()
+
+ TEST_ATOF(sscanf);
+ TEST_ATOF(strtod);
+ TEST_ATOF(atof);
+ TEST_ATOF(Strtod);
+ TEST_ATOF(Atof);
+#undef TEST_ATOF
+
+ // test different methods
+#define CHECK_ATOF(method) \
+ int aNbErr_##method = check_atof (aValuesStr, aFormat, test_##method, di); \
+ di << "Checking " << #method << ": " << aNbErr_##method << " deviations\n"
+
+ CHECK_ATOF(sscanf);
+ CHECK_ATOF(strtod);
+ CHECK_ATOF(atof);
+ CHECK_ATOF(Strtod);
+ CHECK_ATOF(Atof);
+#undef CHECK_ATOF
+
+/* compare results with atof */
+#ifdef _MSC_VER
+#define ISFINITE _finite
+#else
+#define ISFINITE std::isfinite
+#endif
+ int nbErr = 0;
+ for (int i = 0; i < aNbToTest; i++)
+ {
+ char *aStr = &aValuesStr(i,0), *anEndOCCT, *anEndStd;
+ double aRes = Strtod (aStr, &anEndOCCT);
+ double aRef = strtod (aStr, &anEndStd);
+ if (ISFINITE(aRes) != ISFINITE(aRef))
+ {
+ nbErr++;
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ // MSVC < 2015 prints nan and inf as 1.#NAN or 1.INF, and noes not recognize nan or inf on read
+ if (strstr (aStr, "1.#") || strstr (aStr, "nan") || strstr (aStr, "inf") ||
+ strstr (aStr, "NAN") || strstr (aStr, "INF"))
+ continue;
+#endif
+ if (nbErr < 5)
+ {
+ char aBuff[256];
+ Sprintf (aBuff, "Error parsing %s: %.20lg / %.20lg\n", aStr, aRes, aRef);
+ di << aBuff;
+ }
+ }
+ else if (ISFINITE(aRef) && Abs (aRes - aRef) > Epsilon (aRef))
+ {
+ nbErr++;
+ if (nbErr < 5)
+ {
+ char aBuff[256];
+ Sprintf (aBuff, "Error parsing %s: %.20lg / %.20lg\n", aStr, aRes, aRef);
+ di << aBuff;
+ Sprintf (aBuff, "[Delta = %.8lg, Epsilon = %.8lg]\n", Abs (aRes - aRef), Epsilon (aRef));
+ di << aBuff;
+ }
+ }
+
+ // check that Strtod() and strtod() stop at the same place;
+ // this makes sense for reading special values such as "nan" and thus
+ // is not relevant for MSVC 2010 and earlier than do not support these
+#if ! defined(_MSC_VER) || _MSC_VER >= 1700
+ if (anEndOCCT != anEndStd)
+ {
+ nbErr++;
+ if (nbErr < 5)
+ di << "Error: different number of symbols parsed in "
+ << aStr << ": " << (int)(anEndOCCT - aStr) << " / " << (int)(anEndStd - aStr) << "\n";
+ }
+#endif
+ }
+ di << "Total " << nbErr << " defiations from strtod() found\n";
+/* */
+
+ // print results
+ di << "Method\t CPU\t Elapsed \t Deviations \tChecksum\n";
+
+#define PRINT_RES(method) \
+ di << #method "\t" << aT_##method.UserTimeCPU() << " \t" << aT_##method.ElapsedTime() << "\t" \
+ << aNbErr_##method << "\t" << aRes_##method << "\n"
+ PRINT_RES(sscanf);
+ PRINT_RES(strtod);
+ PRINT_RES(atof);
+ PRINT_RES(Strtod);
+ PRINT_RES(Atof);
+#undef PRINT_RES
+
+ return 0;
+}
+
+// Test operations with NCollection_Vec4 that caused generation of invalid code by GCC
+// due to reinterpret_cast conversions of Vec4 internal buffer to Vec3 (see #29825)
+static Standard_Integer QANColTestVec4 (Draw_Interpretor& theDI, Standard_Integer /*theNbArgs*/, const char** /*theArgVec*/)
+{
+ NCollection_Mat4<float> aMatrix;
+ aMatrix.Translate (NCollection_Vec3<float> (4.0f, 3.0f, 1.0f));
+
+ NCollection_Vec4<float> aPoints1[8];
+ for (int aX = 0; aX < 2; ++aX)
+ {
+ for (int aY = 0; aY < 2; ++aY)
+ {
+ for (int aZ = 0; aZ < 2; ++aZ)
+ {
+ aPoints1[aX * 2 * 2 + aY * 2 + aZ] = NCollection_Vec4<float> (-1.0f + 2.0f * float(aX),
+ -1.0f + 2.0f * float(aY),
+ -1.0f + 2.0f * float(aZ),
+ 1.0f);
+ }
+ }
+ }
+
+ NCollection_Vec3<float> aPoints2[8];
+ for (int aPntIdx = 0; aPntIdx < 8; ++aPntIdx)
+ {
+ // NB: the evaluation of line below could be dropped by GCC optimizer
+ // while retrieving xyz() value the line after
+ aPoints1[aPntIdx] = aMatrix * aPoints1[aPntIdx];
+ aPoints2[aPntIdx] = aPoints1[aPntIdx].xyz() / aPoints1[aPntIdx].w();
+ //aPoints2[aPntIdx] = NCollection_Vec3<float> (aPoints1[aPntIdx].x(), aPoints1[aPntIdx].y(), aPoints1[aPntIdx].z()) / aPoints1[aPntIdx].w();
+ }
+
+ for (int aPntIter = 0; aPntIter < 8; ++aPntIter) { theDI << aPoints2[aPntIter].SquareModulus() << " "; }
+ if ((int )(aPoints2[7].SquareModulus() + 0.5f) != 45)
+ {
+ theDI << "Error: method 'NCollection_Vec4::xyz()' failed.";
+ }
+ return 0;
+}
+
void QANCollection::CommandsTest(Draw_Interpretor& theCommands) {
const char *group = "QANCollection";
- // from agvCollTest/src/CollectionEXE/FuncTestEXE.cxx
- theCommands.Add("QANColTestArray1", "QANColTestArray1", __FILE__, QANColTestArray1, group);
- theCommands.Add("QANColTestArray2", "QANColTestArray2", __FILE__, QANColTestArray2, group);
+ theCommands.Add("QANColTestArray1", "QANColTestArray1 Lower Upper",
+ __FILE__, QANColTestArray1, group);
+ theCommands.Add("QANColTestArray2", "QANColTestArray2 LowerRow UpperRow LowerCol UpperCol",
+ __FILE__, QANColTestArray2, group);
theCommands.Add("QANColTestMap", "QANColTestMap", __FILE__, QANColTestMap, group);
theCommands.Add("QANColTestDataMap", "QANColTestDataMap", __FILE__, QANColTestDataMap, group);
theCommands.Add("QANColTestDoubleMap", "QANColTestDoubleMap", __FILE__, QANColTestDoubleMap, group);
theCommands.Add("QANColTestIndexedDataMap", "QANColTestIndexedDataMap", __FILE__, QANColTestIndexedDataMap, group);
theCommands.Add("QANColTestList", "QANColTestList", __FILE__, QANColTestList, group);
theCommands.Add("QANColTestSequence", "QANColTestSequence", __FILE__, QANColTestSequence, group);
-
- return;
+ theCommands.Add("QANColTestVector", "QANColTestVector", __FILE__, QANColTestVector, group);
+ theCommands.Add("QANColTestArrayMove", "QANColTestArrayMove (is expected to give error)", __FILE__, QANColTestArrayMove, group);
+ theCommands.Add("QANColTestVec4", "QANColTestVec4 test Vec4 implementation", __FILE__, QANColTestVec4, group);
+ theCommands.Add("QATestAtof", "QATestAtof [nbvalues [nbdigits [min [max]]]]", __FILE__, QATestAtof, group);
}