1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0026395: Merge clasees NCollection_CellFilter_NDim and NCollection_CellFilter

Deleted exceed class CellFilterNDim.
Now dimension count used as input parameter in NCollection_CellFilter.

minor corrections.
This commit is contained in:
aml
2015-07-28 12:18:04 +03:00
committed by bugmaster
parent 637b758367
commit 50bc8f9624
14 changed files with 79 additions and 468 deletions

View File

@@ -18,12 +18,12 @@
#include <gp_Pnt.hxx>
#include <gp_Pnt2d.hxx>
#include <NCollection_CellFilterNDim.hxx>
#include <NCollection_CellFilter.hxx>
#include <math_MultipleVarFunction.hxx>
#include <NCollection_Sequence.hxx>
#include <Standard_Type.hxx>
class NCollection_CellFilter_NDimInspector
class NCollection_CellFilter_Inspector
{
public:
@@ -31,8 +31,8 @@ public:
typedef math_Vector Point;
typedef math_Vector Target;
NCollection_CellFilter_NDimInspector(const Standard_Integer theDim,
const Standard_Real theTol)
NCollection_CellFilter_Inspector(const Standard_Integer theDim,
const Standard_Real theTol)
: myCurrent(1, theDim)
{
myTol = theTol * theTol;
@@ -201,7 +201,7 @@ private:
NCollection_Array1<Standard_Real> myCellSize;
Standard_Integer myMinCellFilterSol;
Standard_Boolean isFirstCellFilterInvoke;
NCollection_CellFilterNDim<NCollection_CellFilter_NDimInspector> myFilter;
NCollection_CellFilter<NCollection_CellFilter_Inspector> myFilter;
Standard_Real myF; // Current value of Global optimum.
};