From: eap Date: Tue, 3 Dec 2019 18:59:51 +0000 (+0300) Subject: finish LOT4: make all MEDCoupling tests C++ and Python pass in both 32 and 64 config X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=951a76e6b212135118fd2ecc5220265764cbf6fd;p=tools%2Fmedcoupling.git finish LOT4: make all MEDCoupling tests C++ and Python pass in both 32 and 64 config --- diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapper.i b/src/MEDCoupling_Swig/MEDCouplingRemapper.i index 5b8e041ed..ecd4a7ff7 100644 --- a/src/MEDCoupling_Swig/MEDCouplingRemapper.i +++ b/src/MEDCoupling_Swig/MEDCouplingRemapper.i @@ -66,24 +66,42 @@ def MEDCouplingDataArrayFloatImul(self,*args): def MEDCouplingDataArrayFloatIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayFloat____idiv___(self, self, *args) -def MEDCouplingDataArrayIntIadd(self,*args): +def MEDCouplingDataArrayInt32Iadd(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____iadd___(self, self, *args) -def MEDCouplingDataArrayIntIsub(self,*args): + return _MEDCouplingRemapper.DataArrayInt32____iadd___(self, self, *args) +def MEDCouplingDataArrayInt32Isub(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____isub___(self, self, *args) -def MEDCouplingDataArrayIntImul(self,*args): + return _MEDCouplingRemapper.DataArrayInt32____isub___(self, self, *args) +def MEDCouplingDataArrayInt32Imul(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____imul___(self, self, *args) -def MEDCouplingDataArrayIntIdiv(self,*args): + return _MEDCouplingRemapper.DataArrayInt32____imul___(self, self, *args) +def MEDCouplingDataArrayInt32Idiv(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____idiv___(self, self, *args) -def MEDCouplingDataArrayIntImod(self,*args): + return _MEDCouplingRemapper.DataArrayInt32____idiv___(self, self, *args) +def MEDCouplingDataArrayInt32Imod(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____imod___(self, self, *args) -def MEDCouplingDataArrayIntIpow(self,*args): + return _MEDCouplingRemapper.DataArrayInt32____imod___(self, self, *args) +def MEDCouplingDataArrayInt32Ipow(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____ipow___(self, self, *args) + return _MEDCouplingRemapper.DataArrayInt32____ipow___(self, self, *args) +def MEDCouplingDataArrayInt64Iadd(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt64____iadd___(self, self, *args) +def MEDCouplingDataArrayInt64Isub(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt64____isub___(self, self, *args) +def MEDCouplingDataArrayInt64Imul(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt64____imul___(self, self, *args) +def MEDCouplingDataArrayInt64Idiv(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt64____idiv___(self, self, *args) +def MEDCouplingDataArrayInt64Imod(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt64____imod___(self, self, *args) +def MEDCouplingDataArrayInt64Ipow(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt64____ipow___(self, self, *args) def MEDCouplingDataArrayDoubleTupleIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDoubleTuple____iadd___(self, self, *args) @@ -96,21 +114,36 @@ def MEDCouplingDataArrayDoubleTupleImul(self,*args): def MEDCouplingDataArrayDoubleTupleIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDoubleTuple____idiv___(self, self, *args) -def MEDCouplingDataArrayIntTupleIadd(self,*args): +def MEDCouplingDataArrayInt32TupleIadd(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt32Tuple____iadd___(self, self, *args) +def MEDCouplingDataArrayInt32TupleIsub(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt32Tuple____isub___(self, self, *args) +def MEDCouplingDataArrayInt32TupleImul(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt32Tuple____imul___(self, self, *args) +def MEDCouplingDataArrayInt32TupleIdiv(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt32Tuple____idiv___(self, self, *args) +def MEDCouplingDataArrayInt32TupleImod(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt32Tuple____imod___(self, self, *args) +def MEDCouplingDataArrayInt64TupleIadd(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayIntTuple____iadd___(self, self, *args) -def MEDCouplingDataArrayIntTupleIsub(self,*args): + return _MEDCouplingRemapper.DataArrayInt64Tuple____iadd___(self, self, *args) +def MEDCouplingDataArrayInt64TupleIsub(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayIntTuple____isub___(self, self, *args) -def MEDCouplingDataArrayIntTupleImul(self,*args): + return _MEDCouplingRemapper.DataArrayInt64Tuple____isub___(self, self, *args) +def MEDCouplingDataArrayInt64TupleImul(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayIntTuple____imul___(self, self, *args) -def MEDCouplingDataArrayIntTupleIdiv(self,*args): + return _MEDCouplingRemapper.DataArrayInt64Tuple____imul___(self, self, *args) +def MEDCouplingDataArrayInt64TupleIdiv(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayIntTuple____idiv___(self, self, *args) -def MEDCouplingDataArrayIntTupleImod(self,*args): + return _MEDCouplingRemapper.DataArrayInt64Tuple____idiv___(self, self, *args) +def MEDCouplingDataArrayInt64TupleImod(self,*args): import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayIntTuple____imod___(self, self, *args) + return _MEDCouplingRemapper.DataArrayInt64Tuple____imod___(self, self, *args) def MEDCouplingDenseMatrixIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DenseMatrix____iadd___(self, self, *args) diff --git a/src/MEDCoupling_Swig/MEDCouplingTimeDiscretization.i b/src/MEDCoupling_Swig/MEDCouplingTimeDiscretization.i index 16dc0a7b1..52c3fd5b2 100644 --- a/src/MEDCoupling_Swig/MEDCouplingTimeDiscretization.i +++ b/src/MEDCoupling_Swig/MEDCouplingTimeDiscretization.i @@ -104,8 +104,8 @@ namespace MEDCoupling virtual MEDCouplingTimeDiscretization *negate() const; virtual MEDCouplingTimeDiscretization *maxPerTuple() const; virtual MEDCouplingTimeDiscretization *keepSelectedComponents(const std::vector& compoIds) const; - virtual void setSelectedComponents(const MEDCouplingTimeDiscretization *other, const std::vector& compoIds); - virtual void changeNbOfComponents(int newNbOfComp, double dftValue); + virtual void setSelectedComponents(const MEDCouplingTimeDiscretization *other, const std::vector& compoIds); + virtual void changeNbOfComponents(std::size_t newNbOfComp, double dftValue); virtual void sortPerTuple(bool asc); virtual void setUniformValue(int nbOfTuple, int nbOfCompo, double value); virtual void setOrCreateUniformValueOnAllComponents(int nbOfTuple, double value); diff --git a/src/PyWrapping/medcoupling.i b/src/PyWrapping/medcoupling.i index 72032a3a4..b77d4dc2b 100644 --- a/src/PyWrapping/medcoupling.i +++ b/src/PyWrapping/medcoupling.i @@ -179,24 +179,42 @@ def MEDCouplingFieldDoubleIdiv(self,*args): def MEDCouplingFieldDoubleIpow(self,*args): import _medcoupling return _medcoupling.MEDCouplingFieldDouble____ipow___(self, self, *args) -def MEDCouplingDataArrayIntIadd(self,*args): +def MEDCouplingDataArrayInt32Iadd(self,*args): import _medcoupling - return _medcoupling.DataArrayInt____iadd___(self, self, *args) -def MEDCouplingDataArrayIntIsub(self,*args): + return _medcoupling.DataArrayInt32____iadd___(self, self, *args) +def MEDCouplingDataArrayInt32Isub(self,*args): import _medcoupling - return _medcoupling.DataArrayInt____isub___(self, self, *args) -def MEDCouplingDataArrayIntImul(self,*args): + return _medcoupling.DataArrayInt32____isub___(self, self, *args) +def MEDCouplingDataArrayInt32Imul(self,*args): import _medcoupling - return _medcoupling.DataArrayInt____imul___(self, self, *args) -def MEDCouplingDataArrayIntIdiv(self,*args): + return _medcoupling.DataArrayInt32____imul___(self, self, *args) +def MEDCouplingDataArrayInt32Idiv(self,*args): import _medcoupling - return _medcoupling.DataArrayInt____idiv___(self, self, *args) -def MEDCouplingDataArrayIntImod(self,*args): + return _medcoupling.DataArrayInt32____idiv___(self, self, *args) +def MEDCouplingDataArrayInt32Imod(self,*args): import _medcoupling - return _medcoupling.DataArrayInt____imod___(self, self, *args) -def MEDCouplingDataArrayIntIpow(self,*args): + return _medcoupling.DataArrayInt32____imod___(self, self, *args) +def MEDCouplingDataArrayInt32Ipow(self,*args): import _medcoupling - return _medcoupling.DataArrayInt____ipow___(self, self, *args) + return _medcoupling.DataArrayInt32____ipow___(self, self, *args) +def MEDCouplingDataArrayInt64Iadd(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt64____iadd___(self, self, *args) +def MEDCouplingDataArrayInt64Isub(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt64____isub___(self, self, *args) +def MEDCouplingDataArrayInt64Imul(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt64____imul___(self, self, *args) +def MEDCouplingDataArrayInt64Idiv(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt64____idiv___(self, self, *args) +def MEDCouplingDataArrayInt64Imod(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt64____imod___(self, self, *args) +def MEDCouplingDataArrayInt64Ipow(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt64____ipow___(self, self, *args) def MEDCouplingDataArrayFloatIadd(self,*args): import _medcoupling return _medcoupling.DataArrayFloat____iadd___(self, self, *args) @@ -221,21 +239,36 @@ def MEDCouplingDataArrayDoubleTupleImul(self,*args): def MEDCouplingDataArrayDoubleTupleIdiv(self,*args): import _medcoupling return _medcoupling.DataArrayDoubleTuple____idiv___(self, self, *args) -def MEDCouplingDataArrayIntTupleIadd(self,*args): +def MEDCouplingDataArrayInt32TupleIadd(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt32Tuple____iadd___(self, self, *args) +def MEDCouplingDataArrayInt32TupleIsub(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt32Tuple____isub___(self, self, *args) +def MEDCouplingDataArrayInt32TupleImul(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt32Tuple____imul___(self, self, *args) +def MEDCouplingDataArrayInt32TupleIdiv(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt32Tuple____idiv___(self, self, *args) +def MEDCouplingDataArrayInt32TupleImod(self,*args): + import _medcoupling + return _medcoupling.DataArrayInt32Tuple____imod___(self, self, *args) +def MEDCouplingDataArrayInt64TupleIadd(self,*args): import _medcoupling - return _medcoupling.DataArrayIntTuple____iadd___(self, self, *args) -def MEDCouplingDataArrayIntTupleIsub(self,*args): + return _medcoupling.DataArrayInt64Tuple____iadd___(self, self, *args) +def MEDCouplingDataArrayInt64TupleIsub(self,*args): import _medcoupling - return _medcoupling.DataArrayIntTuple____isub___(self, self, *args) -def MEDCouplingDataArrayIntTupleImul(self,*args): + return _medcoupling.DataArrayInt64Tuple____isub___(self, self, *args) +def MEDCouplingDataArrayInt64TupleImul(self,*args): import _medcoupling - return _medcoupling.DataArrayIntTuple____imul___(self, self, *args) -def MEDCouplingDataArrayIntTupleIdiv(self,*args): + return _medcoupling.DataArrayInt64Tuple____imul___(self, self, *args) +def MEDCouplingDataArrayInt64TupleIdiv(self,*args): import _medcoupling - return _medcoupling.DataArrayIntTuple____idiv___(self, self, *args) -def MEDCouplingDataArrayIntTupleImod(self,*args): + return _medcoupling.DataArrayInt64Tuple____idiv___(self, self, *args) +def MEDCouplingDataArrayInt64TupleImod(self,*args): import _medcoupling - return _medcoupling.DataArrayIntTuple____imod___(self, self, *args) + return _medcoupling.DataArrayInt64Tuple____imod___(self, self, *args) def MEDCouplingDenseMatrixIadd(self,*args): import _medcoupling return _medcoupling.DenseMatrix____iadd___(self, self, *args)