From c490fbf0b83dc78ae4e60db568d3f23d897aaafc Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 3 May 2017 13:40:48 +0200 Subject: [PATCH] Factorization again --- src/MEDCoupling/MEDCouplingMemArray.cxx | 83 +---------- src/MEDCoupling/MEDCouplingMemArray.hxx | 26 ++-- src/MEDCoupling/MEDCouplingMemArray.txx | 90 ++++++++++++ .../MEDCouplingUMesh_intersection.cxx | 2 +- .../MEDCouplingBasicsTest5.py | 14 +- src/MEDCoupling_Swig/MEDCouplingMemArray.i | 129 +++++------------- 6 files changed, 154 insertions(+), 190 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx index 52b1788ad..d156115b4 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.cxx +++ b/src/MEDCoupling/MEDCouplingMemArray.cxx @@ -6080,41 +6080,6 @@ void DataArrayInt::applyModulus(int val) declareAsNew(); } -struct GreatEqual -{ - GreatEqual(int v):_v(v) { } - bool operator()(int v) const { return v>=_v; } - int _v; -}; - -struct GreaterThan -{ - GreaterThan(int v):_v(v) { } - bool operator()(int v) const { return v>_v; } - int _v; -}; - -struct LowerEqual -{ - LowerEqual(int v):_v(v) { } - bool operator()(int v) const { return v<=_v; } - int _v; -}; - -struct LowerThan -{ - LowerThan(int v):_v(v) { } - bool operator()(int v) const { return v<_v; } - int _v; -}; - -struct InRange -{ - InRange(int a, int b):_a(a),_b(b) { } - bool operator()(int v) const { return v>=_a && v<_b; } - int _a,_b; -}; - /*! * This method works only on data array with one component. * This method returns a newly allocated array storing stored ascendantly tuple ids in \b this so that @@ -6128,18 +6093,11 @@ struct InRange */ DataArrayInt *DataArrayInt::findIdsInRange(int vmin, int vmax) const { - InRange ir(vmin,vmax); + InRange ir(vmin,vmax); MCAuto ret(findIdsAdv(ir)); return ret.retn(); } -struct NotInRange -{ - NotInRange(int a, int b):_a(a),_b(b) { } - bool operator()(int v) const { return v<_a || v>=_b; } - int _a,_b; -}; - /*! * This method works only on data array with one component. * This method returns a newly allocated array storing stored ascendantly tuple ids in \b this so that @@ -6153,48 +6111,11 @@ struct NotInRange */ DataArrayInt *DataArrayInt::findIdsNotInRange(int vmin, int vmax) const { - NotInRange nir(vmin,vmax); + NotInRange nir(vmin,vmax); MCAuto ret(findIdsAdv(nir)); return ret.retn(); } -/*! - * This method works only on data array with one component. This method returns a newly allocated array storing stored ascendantly of tuple ids in \a this so that this[id]<0. - * - * \return a newly allocated data array that the caller should deal with. - * \sa DataArrayInt::findIdsInRange - */ -DataArrayInt *DataArrayInt::findIdsStricltyNegative() const -{ - LowerThan lt(0); - MCAuto ret(findIdsAdv(lt)); - return ret.retn(); -} - -MCAuto DataArrayInt::findIdsGreaterOrEqualTo(int val) const -{ - GreatEqual ge(val); - return findIdsAdv(ge); -} - -MCAuto DataArrayInt::findIdsGreaterThan(int val) const -{ - GreaterThan gt(val); - return findIdsAdv(gt); -} - -MCAuto DataArrayInt::findIdsLowerOrEqualTo(int val) const -{ - LowerEqual le(val); - return findIdsAdv(le); -} - -MCAuto DataArrayInt::findIdsLowerThan(int val) const -{ - LowerThan lt(val); - return findIdsAdv(lt); -} - /*! * This method works only on data array with one component. * This method checks that all ids in \b this are in [ \b vmin, \b vmax ). If there is at least one element in \a this not in [ \b vmin, \b vmax ) an exception will be thrown. diff --git a/src/MEDCoupling/MEDCouplingMemArray.hxx b/src/MEDCoupling/MEDCouplingMemArray.hxx index 59fd39043..6f67b7d0c 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.hxx +++ b/src/MEDCoupling/MEDCouplingMemArray.hxx @@ -315,8 +315,15 @@ namespace MEDCoupling MEDCOUPLING_EXPORT static typename Traits::ArrayType *Divide(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); MEDCOUPLING_EXPORT static typename Traits::ArrayType *Add(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); MEDCOUPLING_EXPORT static typename Traits::ArrayType *Multiply(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + MEDCOUPLING_EXPORT MCAuto findIdsGreaterOrEqualTo(T val) const; + MEDCOUPLING_EXPORT MCAuto findIdsGreaterThan(T val) const; + MEDCOUPLING_EXPORT MCAuto findIdsLowerOrEqualTo(T val) const; + MEDCOUPLING_EXPORT MCAuto findIdsLowerThan(T val) const; + MEDCOUPLING_EXPORT DataArrayInt *findIdsStrictlyNegative() const; protected: static typename Traits::ArrayType *PerformCopyOrIncrRef(bool dCpy, const typename Traits::ArrayType& self); + template + MCAuto findIdsAdv(const OP& op) const; private: template MCAuto< typename Traits::ArrayType > convertToOtherTypeOfArr() const; @@ -609,12 +616,7 @@ namespace MEDCoupling MEDCOUPLING_EXPORT void applyRPow(int val); MEDCOUPLING_EXPORT DataArrayInt *findIdsInRange(int vmin, int vmax) const; MEDCOUPLING_EXPORT DataArrayInt *findIdsNotInRange(int vmin, int vmax) const; - MEDCOUPLING_EXPORT DataArrayInt *findIdsStricltyNegative() const; MEDCOUPLING_EXPORT bool checkAllIdsInRange(int vmin, int vmax) const; - MEDCOUPLING_EXPORT MCAuto findIdsGreaterOrEqualTo(int val) const; - MEDCOUPLING_EXPORT MCAuto findIdsGreaterThan(int val) const; - MEDCOUPLING_EXPORT MCAuto findIdsLowerOrEqualTo(int val) const; - MEDCOUPLING_EXPORT MCAuto findIdsLowerThan(int val) const; MEDCOUPLING_EXPORT static DataArrayInt *Aggregate(const DataArrayInt *a1, const DataArrayInt *a2, int offsetA2); MEDCOUPLING_EXPORT static DataArrayInt *Aggregate(const std::vector& arr); MEDCOUPLING_EXPORT static DataArrayInt *AggregateIndexes(const std::vector& arrs); @@ -665,23 +667,21 @@ namespace MEDCoupling MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector& tinyInfo) const; MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector& tinyInfoI); MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); - private: - template - MCAuto findIdsAdv(const OP& op) const; private: ~DataArrayInt() { } DataArrayInt() { } }; + template template - MCAuto DataArrayInt::findIdsAdv(const OP& op) const + MCAuto DataArrayTemplateClassic::findIdsAdv(const OP& op) const { - checkAllocated(); - if(getNumberOfComponents()!=1) + this->checkAllocated(); + if(this->getNumberOfComponents()!=1) throw INTERP_KERNEL::Exception("DataArrayInt::findIdsAdv : this must have exactly one component !"); - const int *cptr(getConstPointer()); + const T *cptr(this->begin()); MCAuto ret(DataArrayInt::New()); ret->alloc(0,1); - int nbOfTuples(getNumberOfTuples()); + int nbOfTuples(this->getNumberOfTuples()); for(int i=0;ipushBackSilent(i); diff --git a/src/MEDCoupling/MEDCouplingMemArray.txx b/src/MEDCoupling/MEDCouplingMemArray.txx index 944b6bced..2a1c356b0 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.txx +++ b/src/MEDCoupling/MEDCouplingMemArray.txx @@ -2839,6 +2839,96 @@ namespace MEDCoupling return const_cast::ArrayType *>(&self); } } + + template + struct GreatEqual + { + GreatEqual(T v):_v(v) { } + bool operator()(T v) const { return v>=_v; } + T _v; + }; + + template + struct GreaterThan + { + GreaterThan(T v):_v(v) { } + bool operator()(T v) const { return v>_v; } + T _v; + }; + + template + struct LowerEqual + { + LowerEqual(T v):_v(v) { } + bool operator()(T v) const { return v<=_v; } + T _v; + }; + + template + struct LowerThan + { + LowerThan(T v):_v(v) { } + bool operator()(T v) const { return v<_v; } + T _v; + }; + + template + struct InRange + { + InRange(T a, T b):_a(a),_b(b) { } + bool operator()(T v) const { return v>=_a && v<_b; } + T _a,_b; + }; + +template +struct NotInRange +{ + NotInRange(T a, T b):_a(a),_b(b) { } + bool operator()(T v) const { return v<_a || v>=_b; } + T _a,_b; +}; + + /*! + * This method works only on data array with one component. This method returns a newly allocated array storing stored ascendantly of tuple ids in \a this so that this[id]<0. + * + * \return a newly allocated data array that the caller should deal with. + * \sa DataArrayInt::findIdsInRange + */ + template + DataArrayInt *DataArrayTemplateClassic::findIdsStrictlyNegative() const + { + LowerThan lt((T)0); + MCAuto ret(findIdsAdv(lt)); + return ret.retn(); + } + + template + MCAuto DataArrayTemplateClassic::findIdsGreaterOrEqualTo(T val) const + { + GreatEqual ge(val); + return findIdsAdv(ge); + } + + template + MCAuto DataArrayTemplateClassic::findIdsGreaterThan(T val) const + { + GreaterThan gt(val); + return findIdsAdv(gt); + } + + template + MCAuto DataArrayTemplateClassic::findIdsLowerOrEqualTo(T val) const + { + LowerEqual le(val); + return findIdsAdv(le); + } + + template + MCAuto DataArrayTemplateClassic::findIdsLowerThan(T val) const + { + LowerThan lt(val); + return findIdsAdv(lt); + } /*! * Checks if all values in \a this array are equal to \a val at precision \a eps. diff --git a/src/MEDCoupling/MEDCouplingUMesh_intersection.cxx b/src/MEDCoupling/MEDCouplingUMesh_intersection.cxx index 8865deb8a..61fc0913e 100644 --- a/src/MEDCoupling/MEDCouplingUMesh_intersection.cxx +++ b/src/MEDCoupling/MEDCouplingUMesh_intersection.cxx @@ -1788,7 +1788,7 @@ void MEDCouplingUMesh::Intersect2DMeshWith1DLine(const MEDCouplingUMesh *mesh2D, MCAuto ret2D(MEDCouplingUMesh::MergeUMeshesOnSameCoords(tmp)); // To finish - filter ret3 - std::numeric_limits::max() -> -1 - negate values must be resolved. ret3->rearrange(1); - MCAuto edgesToDealWith(ret3->findIdsStricltyNegative()); + MCAuto edgesToDealWith(ret3->findIdsStrictlyNegative()); for(const int *it=edgesToDealWith->begin();it!=edgesToDealWith->end();it++) { int old2DCellId(-ret3->getIJ(*it,0)-1); diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py index ca606bac7..c55eaf8a3 100644 --- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py +++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py @@ -3261,7 +3261,7 @@ class MEDCouplingBasicsTest5(unittest.TestCase): def testSwig2DAIGetIdsStrictlyNegative1(self): d=DataArrayInt([4,-5,-1,0,3,99,-7]) - self.assertTrue(d.findIdsStricltyNegative().isEqual(DataArrayInt([1,2,6]))) + self.assertTrue(d.findIdsStrictlyNegative().isEqual(DataArrayInt([1,2,6]))) pass def testSwig2DAIReplaceOneValByInThis1(self): @@ -4629,7 +4629,17 @@ class MEDCouplingBasicsTest5(unittest.TestCase): self.assertEqual(f1.isEqual(f4,1e-12,0.),expected) pass pass - + + def testLTGTDAD1(self): + d=DataArrayDouble(10) ; d.iota() + self.assertTrue(d.findIdsLowerThan(0).empty()) + self.assertTrue(d.findIdsLowerThan(1).isEqual(DataArrayInt([0]))) + d-=5. + self.assertTrue(d.findIdsStrictlyNegative().isEqual(DataArrayInt([0,1,2,3,4]))) + self.assertTrue(d.findIdsGreaterThan(0.).isEqual(DataArrayInt([6,7,8,9]))) + self.assertTrue(d.convertToFloatArr().isEqual(DataArrayFloat([-5,-4,-3,-2,-1,0,1,2,3,4]),1e-7)) + self.assertTrue(d.convertToFloatArr().convertToDblArr().isEqual(d,1e-12)) + pass pass if __name__ == '__main__': diff --git a/src/MEDCoupling_Swig/MEDCouplingMemArray.i b/src/MEDCoupling_Swig/MEDCouplingMemArray.i index 767d95696..fcad0d7c0 100644 --- a/src/MEDCoupling_Swig/MEDCouplingMemArray.i +++ b/src/MEDCoupling_Swig/MEDCouplingMemArray.i @@ -40,6 +40,21 @@ { $result=convertDataArrayChar($1,$owner); } + +%typemap(out) MCAuto +{ + $result=SWIG_NewPointerObj(SWIG_as_voidptr($1.retn()),SWIGTYPE_p_MEDCoupling__DataArrayInt,SWIG_POINTER_OWN|0); +} + +%typemap(out) MCAuto +{ + $result=SWIG_NewPointerObj(SWIG_as_voidptr($1.retn()),SWIGTYPE_p_MEDCoupling__DataArrayDouble,SWIG_POINTER_OWN|0); +} + +%typemap(out) MCAuto +{ + $result=SWIG_NewPointerObj(SWIG_as_voidptr($1.retn()),SWIGTYPE_p_MEDCoupling__DataArrayFloat,SWIG_POINTER_OWN|0); +} //$$$$$$$$$$$$$$$$$$ %newobject MEDCoupling::DataArray::deepCopy; @@ -52,12 +67,8 @@ %newobject MEDCoupling::DataArrayFloat::New; %newobject MEDCoupling::DataArrayFloat::iterator; %newobject MEDCoupling::DataArrayFloat::__iter__; -%newobject MEDCoupling::DataArrayFloat::convertToDblArr; %newobject MEDCoupling::DataArrayInt::New; %newobject MEDCoupling::DataArrayInt::__iter__; -%newobject MEDCoupling::DataArrayInt::selectPartDef; -%newobject MEDCoupling::DataArrayInt::convertToDblArr; -%newobject MEDCoupling::DataArrayInt::convertToFloatArr; %newobject MEDCoupling::DataArrayInt::performCopyOrIncrRef; %newobject MEDCoupling::DataArrayInt::subArray; %newobject MEDCoupling::DataArrayInt::changeNbOfComponents; @@ -80,7 +91,7 @@ %newobject MEDCoupling::DataArrayInt::computeAbs; %newobject MEDCoupling::DataArrayInt::findIdsInRange; %newobject MEDCoupling::DataArrayInt::findIdsNotInRange; -%newobject MEDCoupling::DataArrayInt::findIdsStricltyNegative; +%newobject MEDCoupling::DataArrayInt::findIdsStrictlyNegative; %newobject MEDCoupling::DataArrayInt::Aggregate; %newobject MEDCoupling::DataArrayInt::AggregateIndexes; %newobject MEDCoupling::DataArrayInt::Meld; @@ -102,11 +113,6 @@ %newobject MEDCoupling::DataArrayInt::buildIntersection; %newobject MEDCoupling::DataArrayInt::buildUnique; %newobject MEDCoupling::DataArrayInt::buildUniqueNotSorted; -%newobject MEDCoupling::DataArrayInt::fromLinkedListOfPairToList; -%newobject MEDCoupling::DataArrayInt::findIdsGreaterOrEqualTo; -%newobject MEDCoupling::DataArrayInt::findIdsGreaterThan; -%newobject MEDCoupling::DataArrayInt::findIdsLowerOrEqualTo; -%newobject MEDCoupling::DataArrayInt::findIdsLowerThan; %newobject MEDCoupling::DataArrayInt::deltaShiftIndex; %newobject MEDCoupling::DataArrayInt::buildExplicitArrByRanges; %newobject MEDCoupling::DataArrayInt::buildExplicitArrOfSliceOnScaledArr; @@ -152,9 +158,6 @@ %newobject MEDCoupling::DataArrayAsciiCharTuple::buildDAAsciiChar; %newobject MEDCoupling::DataArrayDouble::New; %newobject MEDCoupling::DataArrayDouble::__iter__; -%newobject MEDCoupling::DataArrayDouble::selectPartDef; -%newobject MEDCoupling::DataArrayDouble::convertToIntArr; -%newobject MEDCoupling::DataArrayDouble::convertToFloatArr; %newobject MEDCoupling::DataArrayDouble::performCopyOrIncrRef; %newobject MEDCoupling::DataArrayDouble::Aggregate; %newobject MEDCoupling::DataArrayDouble::Meld; @@ -169,9 +172,9 @@ %newobject MEDCoupling::DataArrayDouble::subArray; %newobject MEDCoupling::DataArrayDouble::changeNbOfComponents; %newobject MEDCoupling::DataArrayDouble::accumulatePerChunck; -%newobject MEDCoupling::DataArrayDouble::cumSum; %newobject MEDCoupling::DataArrayDouble::findIdsInRange; %newobject MEDCoupling::DataArrayDouble::findIdsNotInRange; +%newobject MEDCoupling::DataArrayDouble::findIdsStrictlyNegative; %newobject MEDCoupling::DataArrayDouble::negate; %newobject MEDCoupling::DataArrayDouble::computeAbs; %newobject MEDCoupling::DataArrayDouble::applyFunc; @@ -677,6 +680,7 @@ namespace MEDCoupling void pushBackSilent(float val) throw(INTERP_KERNEL::Exception); void iota(float init=0.) throw(INTERP_KERNEL::Exception); DataArrayFloatIterator *iterator() throw(INTERP_KERNEL::Exception); + MCAuto convertToDblArr() const throw(INTERP_KERNEL::Exception); %extend { DataArrayFloat() throw(INTERP_KERNEL::Exception) @@ -736,12 +740,6 @@ namespace MEDCoupling return convertDblArrToPyListOfTuple(vals,nbOfComp,nbOfTuples); } - DataArrayDouble *convertToDblArr() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->convertToDblArr()); - return ret.retn(); - } - PyObject *__getitem__(PyObject *obj) throw(INTERP_KERNEL::Exception) { return DataArrayT__getitem(self,obj); @@ -943,6 +941,7 @@ namespace MEDCoupling void applyFuncFast64(const std::string& func) throw(INTERP_KERNEL::Exception); DataArrayInt *findIdsInRange(double vmin, double vmax) const throw(INTERP_KERNEL::Exception); DataArrayInt *findIdsNotInRange(double vmin, double vmax) const throw(INTERP_KERNEL::Exception); + DataArrayInt *findIdsStrictlyNegative() const throw(INTERP_KERNEL::Exception); static DataArrayDouble *Aggregate(const DataArrayDouble *a1, const DataArrayDouble *a2) throw(INTERP_KERNEL::Exception); static DataArrayDouble *Meld(const DataArrayDouble *a1, const DataArrayDouble *a2) throw(INTERP_KERNEL::Exception); static DataArrayDouble *Dot(const DataArrayDouble *a1, const DataArrayDouble *a2) throw(INTERP_KERNEL::Exception); @@ -959,6 +958,14 @@ namespace MEDCoupling void divideEqual(const DataArrayDouble *other) throw(INTERP_KERNEL::Exception); static DataArrayDouble *Pow(const DataArrayDouble *a1, const DataArrayDouble *a2) throw(INTERP_KERNEL::Exception); void powEqual(const DataArrayDouble *other) throw(INTERP_KERNEL::Exception); + MCAuto findIdsGreaterOrEqualTo(double val) const throw(INTERP_KERNEL::Exception); + MCAuto findIdsGreaterThan(double val) const throw(INTERP_KERNEL::Exception); + MCAuto findIdsLowerOrEqualTo(double val) const throw(INTERP_KERNEL::Exception); + MCAuto findIdsLowerThan(double val) const throw(INTERP_KERNEL::Exception); + MCAuto convertToIntArr() const throw(INTERP_KERNEL::Exception); + MCAuto selectPartDef(const PartDefinition* pd) const throw(INTERP_KERNEL::Exception); + MCAuto cumSum() const throw(INTERP_KERNEL::Exception); + MCAuto convertToFloatArr() const throw(INTERP_KERNEL::Exception); %extend { DataArrayDouble() throw(INTERP_KERNEL::Exception) @@ -976,30 +983,6 @@ namespace MEDCoupling return MEDCoupling_DataArrayDouble_New__SWIG_1(elt0,nbOfTuples,elt2); } - DataArrayDouble *selectPartDef(const PartDefinition* pd) const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->selectPartDef(pd)); - return ret.retn(); - } - - DataArrayDouble *cumSum() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->cumSum()); - return ret.retn(); - } - - DataArrayFloat *convertToFloatArr() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->convertToFloatArr()); - return ret.retn(); - } - - DataArrayInt *convertToIntArr() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->convertToIntArr()); - return ret.retn(); - } - void pushBackValsSilent(PyObject *li) throw(INTERP_KERNEL::Exception) { double val; @@ -2358,7 +2341,7 @@ namespace MEDCoupling void applyRPow(int val) throw(INTERP_KERNEL::Exception); DataArrayInt *findIdsInRange(int vmin, int vmax) const throw(INTERP_KERNEL::Exception); DataArrayInt *findIdsNotInRange(int vmin, int vmax) const throw(INTERP_KERNEL::Exception); - DataArrayInt *findIdsStricltyNegative() const throw(INTERP_KERNEL::Exception); + DataArrayInt *findIdsStrictlyNegative() const throw(INTERP_KERNEL::Exception); bool checkAllIdsInRange(int vmin, int vmax) const throw(INTERP_KERNEL::Exception); static DataArrayInt *Aggregate(const DataArrayInt *a1, const DataArrayInt *a2, int offsetA2) throw(INTERP_KERNEL::Exception); static DataArrayInt *Meld(const DataArrayInt *a1, const DataArrayInt *a2) throw(INTERP_KERNEL::Exception); @@ -2394,6 +2377,14 @@ namespace MEDCoupling void modulusEqual(const DataArrayInt *other) throw(INTERP_KERNEL::Exception); static DataArrayInt *Pow(const DataArrayInt *a1, const DataArrayInt *a2) throw(INTERP_KERNEL::Exception); void powEqual(const DataArrayInt *other) throw(INTERP_KERNEL::Exception); + MCAuto fromLinkedListOfPairToList() const throw(INTERP_KERNEL::Exception); + MCAuto findIdsGreaterOrEqualTo(int val) const throw(INTERP_KERNEL::Exception); + MCAuto findIdsGreaterThan(int val) const throw(INTERP_KERNEL::Exception); + MCAuto findIdsLowerOrEqualTo(int val) const throw(INTERP_KERNEL::Exception); + MCAuto findIdsLowerThan(int val) const throw(INTERP_KERNEL::Exception); + MCAuto selectPartDef(const PartDefinition* pd) const throw(INTERP_KERNEL::Exception); + MCAuto convertToDblArr() const throw(INTERP_KERNEL::Exception); + MCAuto convertToFloatArr() const throw(INTERP_KERNEL::Exception); public: static DataArrayInt *Range(int begin, int end, int step) throw(INTERP_KERNEL::Exception); %extend @@ -2503,18 +2494,6 @@ namespace MEDCoupling return MEDCoupling_DataArrayInt_New__SWIG_1(elt0,nbOfTuples,nbOfComp); } - DataArrayDouble *convertToDblArr() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->convertToDblArr()); - return ret.retn(); - } - - DataArrayFloat *convertToFloatArr() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->convertToFloatArr()); - return ret.retn(); - } - std::string __str__() const throw(INTERP_KERNEL::Exception) { return self->reprNotTooLong(); @@ -2541,42 +2520,6 @@ namespace MEDCoupling { return self->iterator(); } - - DataArrayInt *fromLinkedListOfPairToList() const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->fromLinkedListOfPairToList()); - return ret.retn(); - } - - DataArrayInt *findIdsGreaterOrEqualTo(int val) const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->findIdsGreaterOrEqualTo(val)); - return ret.retn(); - } - - DataArrayInt *findIdsGreaterThan(int val) const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->findIdsGreaterThan(val)); - return ret.retn(); - } - - DataArrayInt *findIdsLowerOrEqualTo(int val) const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->findIdsLowerOrEqualTo(val)); - return ret.retn(); - } - - DataArrayInt *findIdsLowerThan(int val) const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->findIdsLowerThan(val)); - return ret.retn(); - } - - DataArrayInt *selectPartDef(const PartDefinition* pd) const throw(INTERP_KERNEL::Exception) - { - MCAuto ret(self->selectPartDef(pd)); - return ret.retn(); - } PyObject *accumulate() const throw(INTERP_KERNEL::Exception) { -- 2.39.2