X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingMemArray.hxx;h=d70be4d273dfebab3911a6ea885c988e9500fb93;hb=9abc40a840f69fd7f07b356cd31876b64dc81e14;hp=0ff5d409ae53aee2256078569e9fbbc1a793c11a;hpb=08cc6cac32ce9e8f8829836ecf1bca59a0f795c2;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingMemArray.hxx b/src/MEDCoupling/MEDCouplingMemArray.hxx old mode 100644 new mode 100755 index 0ff5d409a..d70be4d27 --- a/src/MEDCoupling/MEDCouplingMemArray.hxx +++ b/src/MEDCoupling/MEDCouplingMemArray.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D +// Copyright (C) 2007-2022 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -16,22 +16,24 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// Author : Anthony Geay (CEA/DEN) +// Author : Anthony Geay (EDF R&D) -#ifndef __MEDCOUPLING_MEDCOUPLINGMEMARRAY_HXX__ -#define __MEDCOUPLING_MEDCOUPLINGMEMARRAY_HXX__ +#pragma once #include "MEDCoupling.hxx" +#include "MCType.hxx" #include "MCAuto.hxx" #include "MEDCouplingTimeLabel.hxx" #include "MEDCouplingRefCountObject.hxx" #include "InterpKernelException.hxx" #include "MEDCouplingTraits.hxx" +#include "MEDCouplingMap.hxx" #include "BBTreePts.txx" #include #include #include +#include namespace MEDCoupling { @@ -44,7 +46,7 @@ namespace MEDCoupling // -- WARNING this enum must be synchronized with MEDCouplingCommon.i file ! -- class PartDefinition; - + template class MEDCouplingPointer { @@ -76,19 +78,19 @@ namespace MEDCoupling std::size_t getNbOfElem() const { return _nb_of_elem; } std::size_t getNbOfElemAllocated() const { return _nb_of_elem_alloc; } T *getPointer() { return _pointer.getPointer(); } - MemArray &operator=(const MemArray& other); + MemArray &operator=(const MemArray& other); T operator[](std::size_t id) const { return _pointer.getConstPointer()[id]; } T& operator[](std::size_t id) { return _pointer.getPointer()[id]; } bool isEqual(const MemArray& other, T prec, std::string& reason) const; - void repr(int sl, std::ostream& stream) const; - bool reprHeader(int sl, std::ostream& stream) const; - void reprZip(int sl, std::ostream& stream) const; - void reprNotTooLong(int sl, std::ostream& stream) const; + void repr(mcIdType sl, std::ostream& stream) const; + bool reprHeader(mcIdType sl, std::ostream& stream) const; + void reprZip(mcIdType sl, std::ostream& stream) const; + void reprNotTooLong(mcIdType sl, std::ostream& stream) const; void fillWithValue(const T& val); - T *fromNoInterlace(int nbOfComp) const; - T *toNoInterlace(int nbOfComp) const; + T *fromNoInterlace(std::size_t nbOfComp) const; + T *toNoInterlace(std::size_t nbOfComp) const; void sort(bool asc); - void reverse(int nbOfComp); + void reverse(std::size_t nbOfComp); void alloc(std::size_t nbOfElements); void reserve(std::size_t newNbOfElements); void reAlloc(std::size_t newNbOfElements); @@ -110,6 +112,7 @@ namespace MEDCoupling public: static void CPPDeallocator(void *pt, void *param); static void CDeallocator(void *pt, void *param); + static void COffsetDeallocator(void *pt, void *param); private: static void DestroyPointer(T *pt, Deallocator dealloc, void *param); static Deallocator BuildFromType(DeallocType type); @@ -122,87 +125,100 @@ namespace MEDCoupling void *_param_for_deallocator; }; - class DataArrayInt; + template class DataArrayTools + { + public: + static void GetSlice(T start, T stop, T step, mcIdType sliceId, mcIdType nbOfSlices, T& startSlice, T& stopSlice); + static mcIdType GetNumberOfItemGivenBES(T begin, T end, T step, const std::string& msg); + static mcIdType GetNumberOfItemGivenBESRelative(T begin, T end, T step, const std::string& msg); + static mcIdType GetPosOfItemGivenBESRelativeNoThrow(T value, T begin, T end, T step); + }; + + class DataArray; class DataArrayByte; + MEDCOUPLING_EXPORT void DACheckNbOfTuplesAndComp(const DataArray *da, mcIdType nbOfTuples, std::size_t nbOfCompo, const std::string& msg); + class MEDCOUPLING_EXPORT DataArray : public RefCountObject, public TimeLabel { public: - std::size_t getHeapMemorySizeWithoutChildren() const; - std::vector getDirectChildrenWithNull() const; - void setName(const std::string& name); - void copyStringInfoFrom(const DataArray& other); - void copyPartOfStringInfoFrom(const DataArray& other, const std::vector& compoIds); - void copyPartOfStringInfoFrom2(const std::vector& compoIds, const DataArray& other); - bool areInfoEqualsIfNotWhy(const DataArray& other, std::string& reason) const; - bool areInfoEquals(const DataArray& other) const; - std::string cppRepr(const std::string& varName) const; - std::string getName() const { return _name; } - const std::vector &getInfoOnComponents() const { return _info_on_compo; } - std::vector &getInfoOnComponents() { return _info_on_compo; } - void setInfoOnComponents(const std::vector& info); - void setInfoAndChangeNbOfCompo(const std::vector& info); - std::vector getVarsOnComponent() const; - std::vector getUnitsOnComponent() const; - std::string getInfoOnComponent(int i) const; - std::string getVarOnComponent(int i) const; - std::string getUnitOnComponent(int i) const; - void setInfoOnComponent(int i, const std::string& info); - std::size_t getNumberOfComponents() const { return _info_on_compo.size(); } - void setPartOfValuesBase3(const DataArray *aBase, const int *bgTuples, const int *endTuples, int bgComp, int endComp, int stepComp, bool strictCompoCompare=true); - virtual void *getVoidStarPointer() = 0; - virtual DataArray *deepCopy() const = 0; - virtual DataArray *buildNewEmptyInstance() const = 0; - virtual bool isAllocated() const = 0; - virtual void checkAllocated() const = 0; - virtual void desallocate() = 0; - virtual int getNumberOfTuples() const = 0; - virtual std::size_t getNbOfElems() const = 0; - virtual std::size_t getNbOfElemAllocated() const = 0; - virtual void alloc(std::size_t nbOfTuple, std::size_t nbOfCompo=1) = 0; - virtual void reAlloc(std::size_t newNbOfTuple) = 0; - virtual void renumberInPlace(const int *old2New) = 0; - virtual void renumberInPlaceR(const int *new2Old) = 0; - virtual void setContigPartOfSelectedValues(int tupleIdStart, const DataArray *aBase, const DataArrayInt *tuplesSelec) = 0; - virtual void setContigPartOfSelectedValuesSlice(int tupleIdStart, const DataArray *aBase, int bg, int end2, int step) = 0; - virtual DataArray *selectByTupleRanges(const std::vector >& ranges) const = 0; - virtual DataArray *keepSelectedComponents(const std::vector& compoIds) const = 0; - virtual DataArray *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const = 0; - virtual DataArray *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const = 0; - virtual DataArray *selectByTupleIdSafeSlice(int bg, int end2, int step) const = 0; - virtual void rearrange(int newNbOfCompo) = 0; - virtual void circularPermutation(int nbOfShift=1) = 0; - virtual void circularPermutationPerTuple(int nbOfShift=1) = 0; - virtual void reversePerTuple() = 0; - void checkNbOfTuples(int nbOfTuples, const std::string& msg) const; - void checkNbOfComps(int nbOfCompo, const std::string& msg) const; - void checkNbOfTuplesAndComp(const DataArray& other, const std::string& msg) const; - void checkNbOfTuplesAndComp(int nbOfTuples, int nbOfCompo, const std::string& msg) const; - void checkNbOfElems(std::size_t nbOfElems, const std::string& msg) const; - static void GetSlice(int start, int stop, int step, int sliceId, int nbOfSlices, int& startSlice, int& stopSlice); - static int GetNumberOfItemGivenBES(int begin, int end, int step, const std::string& msg); - static int GetNumberOfItemGivenBESRelative(int begin, int end, int step, const std::string& msg); - static int GetPosOfItemGivenBESRelativeNoThrow(int value, int begin, int end, int step); - static std::string GetVarNameFromInfo(const std::string& info); - static std::string GetUnitFromInfo(const std::string& info); - static std::string BuildInfoFromVarAndUnit(const std::string& var, const std::string& unit); - static std::string GetAxisTypeRepr(MEDCouplingAxisType at); - static DataArray *Aggregate(const std::vector& arrs); - virtual void reprStream(std::ostream& stream) const = 0; - virtual void reprZipStream(std::ostream& stream) const = 0; - virtual void reprWithoutNameStream(std::ostream& stream) const; - virtual void reprZipWithoutNameStream(std::ostream& stream) const = 0; - virtual void reprCppStream(const std::string& varName, std::ostream& stream) const = 0; - virtual void reprQuickOverview(std::ostream& stream) const = 0; - virtual void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const = 0; + std::size_t getHeapMemorySizeWithoutChildren() const; + std::vector getDirectChildrenWithNull() const; + void setName(const std::string& name); + void copyStringInfoFrom(const DataArray& other); + void copyPartOfStringInfoFrom(const DataArray& other, const std::vector& compoIds); + void copyPartOfStringInfoFrom2(const std::vector& compoIds, const DataArray& other); + bool areInfoEqualsIfNotWhy(const DataArray& other, std::string& reason) const; + bool areInfoEquals(const DataArray& other) const; + std::string cppRepr(const std::string& varName) const; + std::string getName() const { return _name; } + const std::vector &getInfoOnComponents() const { return _info_on_compo; } + std::vector &getInfoOnComponents() { return _info_on_compo; } + void setInfoOnComponents(const std::vector& info); + void setInfoAndChangeNbOfCompo(const std::vector& info); + std::vector getVarsOnComponent() const; + std::vector getUnitsOnComponent() const; + std::string getInfoOnComponent(std::size_t i) const; + std::string getVarOnComponent(std::size_t i) const; + std::string getUnitOnComponent(std::size_t i) const; + void setInfoOnComponent(std::size_t i, const std::string& info); + std::size_t getNumberOfComponents() const { return _info_on_compo.size(); } + void setPartOfValuesBase3(const DataArray *aBase, const mcIdType *bgTuples, const mcIdType *endTuples, mcIdType bgComp, mcIdType endComp, mcIdType stepComp, bool strictCompoCompare=true); + virtual void *getVoidStarPointer() = 0; + virtual DataArray *deepCopy() const = 0; + virtual DataArray *copySorted(bool asc=true) const = 0; + virtual DataArray *buildNewEmptyInstance() const = 0; + virtual bool isAllocated() const = 0; + virtual void checkAllocated() const = 0; + virtual void desallocate() = 0; + virtual mcIdType getNumberOfTuples() const = 0; + virtual mcIdType getNbOfElems() const = 0; + virtual std::size_t getNbOfElemAllocated() const = 0; + virtual void alloc(std::size_t nbOfTuple, std::size_t nbOfCompo=1) = 0; + virtual void reAlloc(std::size_t newNbOfTuple) = 0; + virtual void renumberInPlace(const mcIdType *old2New) = 0; + virtual void renumberInPlaceR(const mcIdType *new2Old) = 0; + virtual void setContigPartOfSelectedValues(mcIdType tupleIdStart, const DataArray *aBase, const DataArrayIdType *tuplesSelec) = 0; + virtual void setContigPartOfSelectedValuesSlice(mcIdType tupleIdStart, const DataArray *aBase, mcIdType bg, mcIdType end2, mcIdType step) = 0; + virtual DataArray *selectByTupleRanges(const std::vector >& ranges) const = 0; + virtual DataArray *keepSelectedComponents(const std::vector& compoIds) const = 0; + virtual DataArray *selectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const = 0; + virtual DataArray *selectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const = 0; + virtual DataArray *selectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const = 0; + virtual void rearrange(std::size_t newNbOfCompo) = 0; + virtual void circularPermutation(mcIdType nbOfShift=1) = 0; + virtual void circularPermutationPerTuple(mcIdType nbOfShift=1) = 0; + virtual void reversePerTuple() = 0; + void checkNbOfTuples(mcIdType nbOfTuples, const std::string& msg) const; + void checkNbOfComps(std::size_t nbOfCompo, const std::string& msg) const; + void checkNbOfTuplesAndComp(const DataArray& other, const std::string& msg) const; + void checkNbOfTuplesAndComp(mcIdType nbOfTuples, std::size_t nbOfCompo, const std::string& msg) const; + void checkNbOfElems(mcIdType nbOfElems, const std::string& msg) const; + static void GetSlice(mcIdType start, mcIdType stop, mcIdType step, mcIdType sliceId, mcIdType nbOfSlices, mcIdType& startSlice, mcIdType& stopSlice); + static mcIdType GetNumberOfItemGivenBES(mcIdType begin, mcIdType end, mcIdType step, const std::string& msg); + static mcIdType GetNumberOfItemGivenBESRelative(mcIdType begin, mcIdType end, mcIdType step, const std::string& msg); + static mcIdType GetPosOfItemGivenBESRelativeNoThrow(mcIdType value, mcIdType begin, mcIdType end, mcIdType step); + static std::vector SplitStringInChuncks(const std::string st, std::size_t sz); + static std::string GetVarNameFromInfo(const std::string& info); + static std::string GetUnitFromInfo(const std::string& info); + static std::string BuildInfoFromVarAndUnit(const std::string& var, const std::string& unit); + static std::string GetAxisTypeRepr(MEDCouplingAxisType at); + static DataArray *Aggregate(const std::vector& arrs); + virtual void reprStream(std::ostream& stream) const = 0; + virtual void reprZipStream(std::ostream& stream) const = 0; + virtual void reprWithoutNameStream(std::ostream& stream) const; + virtual void reprZipWithoutNameStream(std::ostream& stream) const = 0; + virtual void reprCppStream(const std::string& varName, std::ostream& stream) const = 0; + virtual void reprQuickOverview(std::ostream& stream) const = 0; + virtual void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const = 0; protected: DataArray() { } ~DataArray() { } protected: - static void CheckValueInRange(int ref, int value, const std::string& msg); - static void CheckValueInRangeEx(int value, int start, int end, const std::string& msg); - static void CheckClosingParInRange(int ref, int value, const std::string& msg); - static int EffectiveCircPerm(int nbOfShift, int nbOfTuples); + static void CheckValueInRange(mcIdType ref, mcIdType value, const std::string& msg); + static void CheckValueInRangeEx(mcIdType value, mcIdType start, mcIdType end, const std::string& msg); + static void CheckClosingParInRange(mcIdType ref, mcIdType value, const std::string& msg); + static mcIdType EffectiveCircPerm(mcIdType nbOfShift, mcIdType nbOfTuples); protected: std::string _name; std::vector _info_on_compo; @@ -211,522 +227,604 @@ namespace MEDCoupling namespace MEDCoupling { - class DataArrayInt; - template class DataArrayTemplate : public DataArray { public: - static MCAuto< typename Traits::ArrayTypeCh > NewFromStdVector(const typename std::vector& v); - std::vector< MCAuto< typename Traits::ArrayTypeCh > > explodeComponents() const; + typedef T Type; + public: + static MCAuto< typename Traits::ArrayTypeCh > NewFromStdVector(const typename std::vector& v); + static MCAuto< typename Traits::ArrayTypeCh > NewFromArray(const T *arrBegin, const T *arrEnd); + std::vector< MCAuto< typename Traits::ArrayTypeCh > > explodeComponents() const; // - std::size_t getHeapMemorySizeWithoutChildren() const; + void printForDebug(std::ostream& oss) const + { + this->checkAllocated(); + char comma[3] = {'\0',' ','\0'}; + std::for_each(this->begin(),this->end(),[&comma,&oss](const T& elt) { oss << comma << elt; comma[0]=','; } ); + oss << std::endl; + } + std::size_t getHeapMemorySizeWithoutChildren() const; + void updateTime() const { } // - int getNumberOfTuples() const { return _info_on_compo.empty()?0:_mem.getNbOfElem()/getNumberOfComponents(); } - std::size_t getNbOfElems() const { return _mem.getNbOfElem(); } - bool empty() const; - void *getVoidStarPointer() { return getPointer(); } - const T *getConstPointer() const { return _mem.getConstPointer(); } - const T *begin() const { return getConstPointer(); } - const T *end() const { return getConstPointer()+getNbOfElems(); } - void alloc(std::size_t nbOfTuple, std::size_t nbOfCompo=1); - void useArray(const T *array, bool ownership, DeallocType type, int nbOfTuple, int nbOfCompo); - void useExternalArrayWithRWAccess(const T *array, int nbOfTuple, int nbOfCompo); - T getIJSafe(int tupleId, int compoId) const; - T getIJ(int tupleId, int compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; } - void setIJ(int tupleId, int compoId, T newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; declareAsNew(); } - void setIJSilent(int tupleId, int compoId, T newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; } - T *getPointer() { return _mem.getPointer(); declareAsNew(); } - void pack() const; - bool isAllocated() const; - void checkAllocated() const; - void desallocate(); - void reserve(std::size_t nbOfElems); - void rearrange(int newNbOfCompo); - void transpose(); - void pushBackSilent(T val); - void pushBackValsSilent(const T *valsBg, const T *valsEnd); - T popBackSilent(); - T front() const; - T back() const; - std::size_t getNbOfElemAllocated() const { return _mem.getNbOfElemAllocated(); } - void allocIfNecessary(int nbOfTuple, int nbOfCompo); - void deepCopyFrom(const DataArrayTemplate& other); - void reverse(); - void fillWithValue(T val); - void reAlloc(std::size_t newNbOfTuple); - void renumberInPlace(const int *old2New); - void renumberInPlaceR(const int *new2Old); - void sort(bool asc=true); - typename Traits::ArrayType *renumber(const int *old2New) const; - typename Traits::ArrayType *renumberR(const int *new2Old) const; - typename Traits::ArrayType *renumberAndReduce(const int *old2New, int newNbOfTuple) const; - typename Traits::ArrayType *changeNbOfComponents(int newNbOfComp, T dftValue) const; - typename Traits::ArrayType *subArray(int tupleIdBg, int tupleIdEnd=-1) const; - MCAuto::ArrayTypeCh> selectPartDef(const PartDefinition* pd) const; - void circularPermutation(int nbOfShift=1); - void circularPermutationPerTuple(int nbOfShift=1); - void reversePerTuple(); - void setPartOfValues1(const typename Traits::ArrayType *a, int bgTuples, int endTuples, int stepTuples, int bgComp, int endComp, int stepComp, bool strictCompoCompare=true); - void setPartOfValuesSimple1(T a, int bgTuples, int endTuples, int stepTuples, int bgComp, int endComp, int stepComp); - void setPartOfValues2(const typename Traits::ArrayType *a, const int *bgTuples, const int *endTuples, const int *bgComp, const int *endComp, bool strictCompoCompare=true); - void setPartOfValuesSimple2(T a, const int *bgTuples, const int *endTuples, const int *bgComp, const int *endComp); - void setPartOfValues3(const typename Traits::ArrayType *a, const int *bgTuples, const int *endTuples, int bgComp, int endComp, int stepComp, bool strictCompoCompare=true); - void setPartOfValuesSimple3(T a, const int *bgTuples, const int *endTuples, int bgComp, int endComp, int stepComp); - void setPartOfValues4(const typename Traits::ArrayType *a, int bgTuples, int endTuples, int stepTuples, const int *bgComp, const int *endComp, bool strictCompoCompare=true); - void setPartOfValuesSimple4(T a, int bgTuples, int endTuples, int stepTuples, const int *bgComp, const int *endComp); - void setPartOfValuesAdv(const typename Traits::ArrayType *a, const DataArrayInt *tuplesSelec); - void setContigPartOfSelectedValues(int tupleIdStart, const DataArray *aBase, const DataArrayInt *tuplesSelec); - void setContigPartOfSelectedValuesSlice(int tupleIdStart, const DataArray *aBase, int bg, int end2, int step); - T getMaxValue(int& tupleId) const; - T getMaxValueInArray() const; - T getMinValue(int& tupleId) const; - T getMinValueInArray() const; + mcIdType getNumberOfTuples() const { return ToIdType(_info_on_compo.empty()?0:_mem.getNbOfElem()/getNumberOfComponents()); } + mcIdType getNbOfElems() const { return ToIdType(_mem.getNbOfElem()); } + bool empty() const; + void *getVoidStarPointer() { return getPointer(); } + const T *getConstPointer() const { return _mem.getConstPointer(); } + const T *begin() const { return getConstPointer(); } + const T *end() const { return getConstPointer()+getNbOfElems(); } + T *rwBegin() { return getPointer(); } + T *rwEnd() { return getPointer()+getNbOfElems(); } + void alloc(std::size_t nbOfTuple, std::size_t nbOfCompo=1); + void useArray(const T *array, bool ownership, DeallocType type, std::size_t nbOfTuple, std::size_t nbOfCompo); + void useExternalArrayWithRWAccess(const T *array, std::size_t nbOfTuple, std::size_t nbOfCompo); + T getIJSafe(std::size_t tupleId, std::size_t compoId) const; + T getIJ(std::size_t tupleId, std::size_t compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; } + void setIJ(std::size_t tupleId, std::size_t compoId, T newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; declareAsNew(); } + void setIJSilent(std::size_t tupleId, std::size_t compoId, T newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; } + T *getPointer() { declareAsNew(); return getPointerSilent(); } + T *getPointerSilent() { return _mem.getPointer(); } + void pack() const; + bool isAllocated() const override; + void checkAllocated() const; + void desallocate(); + void reserve(std::size_t nbOfElems); + void rearrange(std::size_t newNbOfCompo); + void transpose(); + void pushBackSilent(T val); + void pushBackValsSilent(const T *valsBg, const T *valsEnd); + T popBackSilent(); + T front() const; + T back() const; + std::size_t getNbOfElemAllocated() const { return _mem.getNbOfElemAllocated(); } + void allocIfNecessary(std::size_t nbOfTuple, std::size_t nbOfCompo); + void deepCopyFrom(const DataArrayTemplate& other); + void reverse(); + void fillWithValue(T val); + void reAlloc(std::size_t newNbOfTuple); + void renumberInPlace(const mcIdType *old2New); + void renumberInPlaceR(const mcIdType *new2Old); + void sort(bool asc=true); + typename Traits::ArrayType *renumber(const mcIdType *old2New) const; + typename Traits::ArrayType *renumberR(const mcIdType *new2Old) const; + typename Traits::ArrayType *renumberAndReduce(const mcIdType *old2New, mcIdType newNbOfTuple) const; + typename Traits::ArrayType *changeNbOfComponents(std::size_t newNbOfComp, T dftValue) const; + typename Traits::ArrayType *subArray(mcIdType tupleIdBg, mcIdType tupleIdEnd=-1) const; + MCAuto::ArrayTypeCh> selectPartDef(const PartDefinition* pd) const; + void circularPermutation(mcIdType nbOfShift=1); + void circularPermutationPerTuple(mcIdType nbOfShift=1); + void reversePerTuple(); + void setPartOfValues1(const typename Traits::ArrayType *a, mcIdType bgTuples, mcIdType endTuples, mcIdType stepTuples, mcIdType bgComp, mcIdType endComp, mcIdType stepComp, bool strictCompoCompare=true); + void setPartOfValuesSimple1(T a, mcIdType bgTuples, mcIdType endTuples, mcIdType stepTuples, mcIdType bgComp, mcIdType endComp, mcIdType stepComp); + void setPartOfValues2(const typename Traits::ArrayType *a, const mcIdType *bgTuples, const mcIdType *endTuples, const mcIdType *bgComp, const mcIdType *endComp, bool strictCompoCompare=true); + void setPartOfValuesSimple2(T a, const mcIdType *bgTuples, const mcIdType *endTuples, const mcIdType *bgComp, const mcIdType *endComp); + void setPartOfValues3(const typename Traits::ArrayType *a, const mcIdType *bgTuples, const mcIdType *endTuples, mcIdType bgComp, mcIdType endComp, mcIdType stepComp, bool strictCompoCompare=true); + void setPartOfValuesSimple3(T a, const mcIdType *bgTuples, const mcIdType *endTuples, mcIdType bgComp, mcIdType endComp, mcIdType stepComp); + void setPartOfValues4(const typename Traits::ArrayType *a, mcIdType bgTuples, mcIdType endTuples, mcIdType stepTuples, const mcIdType *bgComp, const mcIdType *endComp, bool strictCompoCompare=true); + void setPartOfValuesSimple4(T a, mcIdType bgTuples, mcIdType endTuples, mcIdType stepTuples, const mcIdType *bgComp, const mcIdType *endComp); + void setPartOfValuesAdv(const typename Traits::ArrayType *a, const DataArrayIdType *tuplesSelec); + void setContigPartOfSelectedValues(mcIdType tupleIdStart, const DataArray *aBase, const DataArrayIdType *tuplesSelec); + void setContigPartOfSelectedValuesSlice(mcIdType tupleIdStart, const DataArray *aBase, mcIdType bg, mcIdType end2, mcIdType step); + T getMaxValue(mcIdType& tupleId) const; + T getMaxValueInArray() const; + T getMaxAbsValue(std::size_t& tupleId) const; + T getMaxAbsValueInArray() const; + T getMinValue(mcIdType& tupleId) const; + T getMinValueInArray() const; + void getTuple(mcIdType tupleId, T *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); } + template + void insertAtTheEnd(InputIterator first, InputIterator last); + static void SetArrayIn(typename Traits::ArrayType *newArray, typename Traits::ArrayType* &arrayToSet); + void writeOnPlace(std::size_t id, T element0, const T *others, mcIdType sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); } + void fillWithZero(); + public: + MemArray& accessToMemArray() { return _mem; } + const MemArray& accessToMemArray() const { return _mem; } protected: - typename Traits::ArrayType *mySelectByTupleId(const int *new2OldBg, const int *new2OldEnd) const; - typename Traits::ArrayType *mySelectByTupleId(const DataArrayInt& di) const; - typename Traits::ArrayType *mySelectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const; - typename Traits::ArrayType *myKeepSelectedComponents(const std::vector& compoIds) const; - typename Traits::ArrayType *mySelectByTupleIdSafeSlice(int bg, int end2, int step) const; - typename Traits::ArrayType *mySelectByTupleRanges(const std::vector >& ranges) const; + typename Traits::ArrayTypeCh *copySortedImpl(bool asc) const; + typename Traits::ArrayType *mySelectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const; + typename Traits::ArrayType *mySelectByTupleId(const DataArrayIdType& di) const; + typename Traits::ArrayType *mySelectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const; + typename Traits::ArrayType *myKeepSelectedComponents(const std::vector& compoIds) const; + typename Traits::ArrayType *mySelectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const; + typename Traits::ArrayType *mySelectByTupleRanges(const std::vector >& ranges) const; protected: MemArray _mem; }; + + template + class DataArrayTemplateClassic : public DataArrayTemplate + { + public: + MCAuto convertToDblArr() const; + MCAuto convertToIntArr() const; + MCAuto convertToInt64Arr() const; + MCAuto convertToFloatArr() const; + void applyLin(T a, T b, std::size_t compoId); + void applyLin(T a, T b); + typename Traits::ArrayType *negate() const; + void addEqual(const typename Traits::ArrayType *other); + void substractEqual(const typename Traits::ArrayType *other); + void multiplyEqual(const typename Traits::ArrayType *other); + void divideEqual(const typename Traits::ArrayType *other); + static typename Traits::ArrayType *Substract(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + static typename Traits::ArrayType *Divide(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + static typename Traits::ArrayType *Add(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + static typename Traits::ArrayType *Multiply(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + static typename Traits::ArrayType *Meld(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + static typename Traits::ArrayType *Meld(const std::vector::ArrayType *>& arr); + MCAuto findIdsGreaterOrEqualTo(T val) const; + MCAuto findIdsGreaterThan(T val) const; + MCAuto findIdsLowerOrEqualTo(T val) const; + MCAuto findIdsLowerThan(T val) const; + DataArrayIdType *findIdsStrictlyNegative() const; + typename Traits::ArrayType *fromNoInterlace() const; + typename Traits::ArrayType *toNoInterlace() const; + void meldWith(const typename Traits::ArrayType *other); + typename Traits::ArrayType *duplicateEachTupleNTimes(mcIdType nbTimes) const; + void aggregate(const typename Traits::ArrayType *other); + void abs(); + typename Traits::ArrayType *computeAbs() const; + typename Traits::ArrayType *performCopyOrIncrRef(bool dCpy) const; + typename Traits::ArrayType *sumPerTuple() const; + void iota(T init=(T)0); + void reprStream(std::ostream& stream) const; + void reprZipStream(std::ostream& stream) const; + void reprNotTooLongStream(std::ostream& stream) const; + void reprWithoutNameStream(std::ostream& stream) const; + void reprZipWithoutNameStream(std::ostream& stream) const; + void reprNotTooLongWithoutNameStream(std::ostream& stream) const; + std::string repr() const; + std::string reprZip() const; + std::string reprNotTooLong() const; + template + MCAuto< typename Traits::ArrayType > convertToOtherTypeOfArr() const; + protected: + static typename Traits::ArrayType *PerformCopyOrIncrRef(bool dCpy, const typename Traits::ArrayType& self); + template + MCAuto findIdsAdv(const OP& op) const; + private: + template + void somethingEqual(const typename Traits::ArrayType *other); + }; + + template + class DataArrayTemplateFP : public DataArrayTemplateClassic + { + public: + bool isUniform(T val, T eps) const; + }; +} + +namespace MEDCoupling +{ + class DataArrayFloatIterator; + class MEDCOUPLING_EXPORT DataArrayFloat : public DataArrayTemplateFP + { + public: + static DataArrayFloat *New(); + public:// abstract method overload + DataArrayFloat *deepCopy() const; + DataArrayFloat *copySorted(bool asc=true) const override { return this->copySortedImpl(asc); } + std::string getClassName() const override { return std::string("DataArrayFloat"); } + DataArrayFloat *buildNewEmptyInstance() const { return DataArrayFloat::New(); } + DataArrayFloat *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplateFP::mySelectByTupleRanges(ranges); } + DataArrayFloat *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplateFP::myKeepSelectedComponents(compoIds); } + DataArrayFloat *selectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return this->mySelectByTupleId(new2OldBg,new2OldEnd); } + DataArrayFloat *selectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + DataArrayFloat *selectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const { return DataArrayTemplateFP::mySelectByTupleIdSafeSlice(bg,end2,step); } + void reprCppStream(const std::string& varName, std::ostream& stream) const; + void reprQuickOverview(std::ostream& stream) const; + void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + public:// non abstract but essential + bool isEqual(const DataArrayFloat& other, float prec) const; + bool isEqualIfNotWhy(const DataArrayFloat& other, float prec, std::string& reason) const; + bool isEqualWithoutConsideringStr(const DataArrayFloat& other, float prec) const; + public: + DataArrayFloatIterator *iterator(); + private: + ~DataArrayFloat() { } + DataArrayFloat() { } + }; } namespace MEDCoupling { class DataArrayDoubleIterator; - class MEDCOUPLING_EXPORT DataArrayDouble : public DataArrayTemplate - { - public: - static DataArrayDouble *New(); - double doubleValue() const; - DataArrayDouble *deepCopy() const; - DataArrayDouble *buildNewEmptyInstance() const { return DataArrayDouble::New(); } - DataArrayDouble *performCopyOrIncrRef(bool deepCopy) const; - void fillWithZero(); - void iota(double init=0.); - bool isUniform(double val, double eps) const; - void checkMonotonic(bool increasing, double eps) const; - bool isMonotonic(bool increasing, double eps) const; - std::string repr() const; - std::string reprZip() const; - std::string reprNotTooLong() const; - void writeVTK(std::ostream& ofs, int indent, const std::string& nameInFile, DataArrayByte *byteArr) const; - void reprStream(std::ostream& stream) const; - void reprZipStream(std::ostream& stream) const; - void reprNotTooLongStream(std::ostream& stream) const; - void reprWithoutNameStream(std::ostream& stream) const; - void reprZipWithoutNameStream(std::ostream& stream) const; - void reprNotTooLongWithoutNameStream(std::ostream& stream) const; - void reprCppStream(const std::string& varName, std::ostream& stream) const; - void reprQuickOverview(std::ostream& stream) const; - void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; - bool isEqual(const DataArrayDouble& other, double prec) const; - bool isEqualIfNotWhy(const DataArrayDouble& other, double prec, std::string& reason) const; - bool isEqualWithoutConsideringStr(const DataArrayDouble& other, double prec) const; - DataArrayInt *convertToIntArr() const; - DataArrayDouble *fromNoInterlace() const; - DataArrayDouble *toNoInterlace() const; - DataArrayDouble *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleId(new2OldBg,new2OldEnd); } - DataArrayDouble *selectByTupleId(const DataArrayInt& di) const { return DataArrayTemplate::mySelectByTupleId(di); } - DataArrayDouble *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } - DataArrayDouble *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } - DataArrayDouble *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } - DataArrayDouble *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } - void meldWith(const DataArrayDouble *other); - bool areIncludedInMe(const DataArrayDouble *other, double prec, DataArrayInt *&tupleIds) const; - void findCommonTuples(double prec, int limitTupleId, DataArrayInt *&comm, DataArrayInt *&commIndex) const; - double minimalDistanceTo(const DataArrayDouble *other, int& thisTupleId, int& otherTupleId) const; - DataArrayDouble *duplicateEachTupleNTimes(int nbTimes) const; - DataArrayDouble *getDifferentValues(double prec, int limitTupleId=-1) const; - DataArrayInt *findClosestTupleId(const DataArrayDouble *other) const; - DataArrayInt *computeNbOfInteractionsWith(const DataArrayDouble *otherBBoxFrmt, double eps) const; - void setSelectedComponents(const DataArrayDouble *a, const std::vector& compoIds); - void getTuple(int tupleId, double *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); } - static void SetArrayIn(DataArrayDouble *newArray, DataArrayDouble* &arrayToSet); - DataArrayDoubleIterator *iterator(); - template - void insertAtTheEnd(InputIterator first, InputIterator last); - void aggregate(const DataArrayDouble *other); - void writeOnPlace(std::size_t id, double element0, const double *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); } - void checkNoNullValues() const; - void getMinMaxPerComponent(double *bounds) const; - DataArrayDouble *computeBBoxPerTuple(double epsilon=0.0) const; - void computeTupleIdsNearTuples(const DataArrayDouble *other, double eps, DataArrayInt *& c, DataArrayInt *& cI) const; - void recenterForMaxPrecision(double eps); - double getMaxValue2(DataArrayInt*& tupleIds) const; - double getMinValue2(DataArrayInt*& tupleIds) const; - int count(double value, double eps) const; - double getAverageValue() const; - double norm2() const; - double normMax() const; - double normMin() const; - void accumulate(double *res) const; - double accumulate(int compId) const; - DataArrayDouble *accumulatePerChunck(const int *bgOfIndex, const int *endOfIndex) const; - MCAuto cumSum() const; - double distanceToTuple(const double *tupleBg, const double *tupleEnd, int& tupleId) const; - DataArrayDouble *fromPolarToCart() const; - DataArrayDouble *fromCylToCart() const; - DataArrayDouble *fromSpherToCart() const; - DataArrayDouble *cartesianize(MEDCouplingAxisType atOfThis) const; - DataArrayDouble *fromCartToPolar() const; - DataArrayDouble *fromCartToCyl() const; - DataArrayDouble *fromCartToSpher() const; - DataArrayDouble *fromCartToCylGiven(const DataArrayDouble *coords, const double center[3], const double vect[3]) const; - DataArrayDouble *doublyContractedProduct() const; - DataArrayDouble *determinant() const; - DataArrayDouble *eigenValues() const; - DataArrayDouble *eigenVectors() const; - DataArrayDouble *inverse() const; - DataArrayDouble *trace() const; - DataArrayDouble *deviator() const; - DataArrayDouble *magnitude() const; - DataArrayDouble *sumPerTuple() const; - DataArrayDouble *maxPerTuple() const; - DataArrayDouble *maxPerTupleWithCompoId(DataArrayInt* &compoIdOfMaxPerTuple) const; - DataArrayDouble *buildEuclidianDistanceDenseMatrix() const; - DataArrayDouble *buildEuclidianDistanceDenseMatrixWith(const DataArrayDouble *other) const; - void sortPerTuple(bool asc); - void abs(); - DataArrayDouble *computeAbs() const; - void applyLin(double a, double b, int compoId); - void applyLin(double a, double b); - void applyInv(double numerator); - void applyPow(double val); - void applyRPow(double val); - DataArrayDouble *negate() const; - DataArrayDouble *applyFunc(int nbOfComp, FunctionToEvaluate func) const; - DataArrayDouble *applyFunc(int nbOfComp, const std::string& func, bool isSafe=true) const; - DataArrayDouble *applyFunc(const std::string& func, bool isSafe=true) const; - void applyFuncOnThis(const std::string& func, bool isSafe=true); - DataArrayDouble *applyFuncCompo(int nbOfComp, const std::string& func, bool isSafe=true) const; - DataArrayDouble *applyFuncNamedCompo(int nbOfComp, const std::vector& varsOrder, const std::string& func, bool isSafe=true) const; - void applyFuncFast32(const std::string& func); - void applyFuncFast64(const std::string& func); - MCAuto symmetry3DPlane(const double point[3], const double normalVector[3]) const; - DataArrayInt *findIdsInRange(double vmin, double vmax) const; - DataArrayInt *findIdsNotInRange(double vmin, double vmax) const; - static DataArrayDouble *Aggregate(const DataArrayDouble *a1, const DataArrayDouble *a2); - static DataArrayDouble *Aggregate(const std::vector& arr); - static DataArrayDouble *Meld(const DataArrayDouble *a1, const DataArrayDouble *a2); - static DataArrayDouble *Meld(const std::vector& arr); - static DataArrayDouble *Dot(const DataArrayDouble *a1, const DataArrayDouble *a2); - static DataArrayDouble *CrossProduct(const DataArrayDouble *a1, const DataArrayDouble *a2); - static DataArrayDouble *Max(const DataArrayDouble *a1, const DataArrayDouble *a2); - static DataArrayDouble *Min(const DataArrayDouble *a1, const DataArrayDouble *a2); - static DataArrayDouble *Add(const DataArrayDouble *a1, const DataArrayDouble *a2); - void addEqual(const DataArrayDouble *other); - static DataArrayDouble *Substract(const DataArrayDouble *a1, const DataArrayDouble *a2); - void substractEqual(const DataArrayDouble *other); - static DataArrayDouble *Multiply(const DataArrayDouble *a1, const DataArrayDouble *a2); - void multiplyEqual(const DataArrayDouble *other); - static DataArrayDouble *Divide(const DataArrayDouble *a1, const DataArrayDouble *a2); - void divideEqual(const DataArrayDouble *other); - static DataArrayDouble *Pow(const DataArrayDouble *a1, const DataArrayDouble *a2); - void powEqual(const DataArrayDouble *other); - void updateTime() const { } - MemArray& accessToMemArray() { return _mem; } - const MemArray& accessToMemArray() const { return _mem; } - std::vector toVectorOfBool(double eps) const; - static void Rotate2DAlg(const double *center, double angle, int nbNodes, const double *coordsIn, double *coordsOut); - static void Rotate3DAlg(const double *center, const double *vect, double angle, int nbNodes, const double *coordsIn, double *coordsOut); - static void Symmetry3DPlane(const double point[3], const double normalVector[3], int nbNodes, const double *coordsIn, double *coordsOut); - static void GiveBaseForPlane(const double normalVector[3], double baseOfPlane[9]); - public: - void getTinySerializationIntInformation(std::vector& tinyInfo) const; - void getTinySerializationStrInformation(std::vector& tinyInfo) const; - bool resizeForUnserialization(const std::vector& tinyInfoI); - void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); + class MEDCOUPLING_EXPORT DataArrayDouble : public DataArrayTemplateFP + { + public: + static DataArrayDouble *New(); + double doubleValue() const; + DataArrayDouble *deepCopy() const; + DataArrayDouble *copySorted(bool asc=true) const override { return this->copySortedImpl(asc); } + std::string getClassName() const override { return std::string("DataArrayDouble"); } + DataArrayDouble *buildNewEmptyInstance() const { return DataArrayDouble::New(); } + void checkMonotonic(bool increasing, double eps) const; + bool isMonotonic(bool increasing, double eps) const; + void writeVTK(std::ostream& ofs, mcIdType indent, const std::string& nameInFile, DataArrayByte *byteArr) const; + void reprCppStream(const std::string& varName, std::ostream& stream) const; + void reprQuickOverview(std::ostream& stream) const; + void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + bool isEqual(const DataArrayDouble& other, double prec) const; + bool isEqualIfNotWhy(const DataArrayDouble& other, double prec, std::string& reason) const; + bool isEqualWithoutConsideringStr(const DataArrayDouble& other, double prec) const; + DataArrayDouble *selectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return this->mySelectByTupleId(new2OldBg,new2OldEnd); } + DataArrayDouble *selectByTupleId(const DataArrayIdType& di) const { return this->mySelectByTupleId(di); } + DataArrayDouble *selectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + DataArrayDouble *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplateFP::myKeepSelectedComponents(compoIds); } + DataArrayDouble *selectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const { return DataArrayTemplateFP::mySelectByTupleIdSafeSlice(bg,end2,step); } + DataArrayDouble *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplateFP::mySelectByTupleRanges(ranges); } + bool areIncludedInMe(const DataArrayDouble *other, double prec, DataArrayIdType *&tupleIds) const; + void findCommonTuples(double prec, mcIdType limitTupleId, DataArrayIdType *&comm, DataArrayIdType *&commIndex) const; + double minimalDistanceTo(const DataArrayDouble *other, mcIdType& thisTupleId, mcIdType& otherTupleId) const; + DataArrayDouble *getDifferentValues(double prec, mcIdType limitTupleId=-1) const; + DataArrayIdType *findClosestTupleId(const DataArrayDouble *other) const; + DataArrayIdType *computeNbOfInteractionsWith(const DataArrayDouble *otherBBoxFrmt, double eps) const; + void setSelectedComponents(const DataArrayDouble *a, const std::vector& compoIds); + DataArrayDoubleIterator *iterator(); + void checkNoNullValues() const; + void getMinMaxPerComponent(double *bounds) const; + DataArrayDouble *computeBBoxPerTuple(double epsilon=0.0) const; + void computeTupleIdsNearTuples(const DataArrayDouble *other, double eps, DataArrayIdType *& c, DataArrayIdType *& cI) const; + void recenterForMaxPrecision(double eps); + double getMaxValue2(DataArrayIdType*& tupleIds) const; + double getMinValue2(DataArrayIdType*& tupleIds) const; + mcIdType count(double value, double eps) const; + double getAverageValue() const; + double norm2() const; + double normMax() const; + void normMaxPerComponent(double * res) const; + double normMin() const; + void accumulate(double *res) const; + double accumulate(std::size_t compId) const; + DataArrayDouble *accumulatePerChunck(const mcIdType *bgOfIndex, const mcIdType *endOfIndex) const; + MCAuto cumSum() const; + double distanceToTuple(const double *tupleBg, const double *tupleEnd, mcIdType& tupleId) const; + DataArrayDouble *fromPolarToCart() const; + DataArrayDouble *fromCylToCart() const; + DataArrayDouble *fromSpherToCart() const; + DataArrayDouble *cartesianize(MEDCouplingAxisType atOfThis) const; + DataArrayDouble *fromCartToPolar() const; + DataArrayDouble *fromCartToCyl() const; + DataArrayDouble *fromCartToSpher() const; + DataArrayDouble *fromCartToCylGiven(const DataArrayDouble *coords, const double center[3], const double vect[3]) const; + DataArrayDouble *doublyContractedProduct() const; + DataArrayDouble *determinant() const; + DataArrayDouble *eigenValues() const; + DataArrayDouble *eigenVectors() const; + DataArrayDouble *inverse() const; + DataArrayDouble *trace() const; + DataArrayDouble *deviator() const; + DataArrayDouble *magnitude() const; + DataArrayDouble *minPerTuple() const; + DataArrayDouble *maxPerTuple() const; + DataArrayDouble *maxPerTupleWithCompoId(DataArrayIdType* &compoIdOfMaxPerTuple) const; + DataArrayDouble *buildEuclidianDistanceDenseMatrix() const; + DataArrayDouble *buildEuclidianDistanceDenseMatrixWith(const DataArrayDouble *other) const; + void asArcOfCircle(double center[2], double& radius, double& ang) const; + void sortPerTuple(bool asc); + void applyInv(double numerator); + void applyPow(double val); + void applyRPow(double val); + DataArrayDouble *applyFunc(std::size_t nbOfComp, FunctionToEvaluate func) const; + DataArrayDouble *applyFunc(std::size_t nbOfComp, const std::string& func, bool isSafe=true) const; + DataArrayDouble *applyFunc(const std::string& func, bool isSafe=true) const; + void applyFuncOnThis(const std::string& func, bool isSafe=true); + DataArrayDouble *applyFuncCompo(std::size_t nbOfComp, const std::string& func, bool isSafe=true) const; + DataArrayDouble *applyFuncNamedCompo(std::size_t nbOfComp, const std::vector& varsOrder, const std::string& func, bool isSafe=true) const; + void applyFuncFast32(const std::string& func); + void applyFuncFast64(const std::string& func); + MCAuto symmetry3DPlane(const double point[3], const double normalVector[3]) const; + DataArrayIdType *findIdsInRange(double vmin, double vmax) const; + DataArrayIdType *findIdsNotInRange(double vmin, double vmax) const; + static DataArrayDouble *Aggregate(const DataArrayDouble *a1, const DataArrayDouble *a2); + static DataArrayDouble *Aggregate(const std::vector& arr); + static DataArrayDouble *Dot(const DataArrayDouble *a1, const DataArrayDouble *a2); + static DataArrayDouble *CrossProduct(const DataArrayDouble *a1, const DataArrayDouble *a2); + static DataArrayDouble *Max(const DataArrayDouble *a1, const DataArrayDouble *a2); + static DataArrayDouble *Min(const DataArrayDouble *a1, const DataArrayDouble *a2); + static DataArrayDouble *Pow(const DataArrayDouble *a1, const DataArrayDouble *a2); + void powEqual(const DataArrayDouble *other); + std::vector toVectorOfBool(double eps) const; + static void Rotate2DAlg(const double *center, double angle, mcIdType nbNodes, const double *coordsIn, double *coordsOut); + static void Rotate3DAlg(const double *center, const double *vect, double angle, mcIdType nbNodes, const double *coordsIn, double *coordsOut); + static void Symmetry3DPlane(const double point[3], const double normalVector[3], mcIdType nbNodes, const double *coordsIn, double *coordsOut); + static void GiveBaseForPlane(const double normalVector[3], double baseOfPlane[9]); + static void ComputeIntegralOfSeg2IntoTri3(const double seg2[4], const double tri3[6], double coeffs[3], double& length); + public: + void getTinySerializationIntInformation(std::vector& tinyInfo) const; + void getTinySerializationStrInformation(std::vector& tinyInfo) const; + bool resizeForUnserialization(const std::vector& tinyInfoI); + void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); public: template - void findCommonTuplesAlg(const double *bbox, int nbNodes, int limitNodeId, double prec, DataArrayInt *c, DataArrayInt *cI) const; + void findCommonTuplesAlg(const double *bbox, mcIdType nbNodes, mcIdType limitNodeId, double prec, DataArrayIdType *c, DataArrayIdType *cI) const; template - static void FindClosestTupleIdAlg(const BBTreePts& myTree, double dist, const double *pos, int nbOfTuples, const double *thisPt, int thisNbOfTuples, int *res); + static void FindClosestTupleIdAlg(const BBTreePts& myTree, double dist, const double *pos, mcIdType nbOfTuples, const double *thisPt, mcIdType thisNbOfTuples, mcIdType *res); template - static void FindTupleIdsNearTuplesAlg(const BBTreePts& myTree, const double *pos, int nbOfTuples, double eps, - DataArrayInt *c, DataArrayInt *cI); + static void FindTupleIdsNearTuplesAlg(const BBTreePts& myTree, const double *pos, mcIdType nbOfTuples, double eps, + DataArrayIdType *c, DataArrayIdType *cI); + private: + DataArrayDouble *operatePerTuple(std::function func) const; private: ~DataArrayDouble() { } DataArrayDouble() { } }; +} - class DataArrayDoubleTuple; - - class MEDCOUPLING_EXPORT DataArrayDoubleIterator +namespace MEDCoupling +{ + template + class DataArrayDiscrete : public DataArrayTemplateClassic { public: - DataArrayDoubleIterator(DataArrayDouble *da); - ~DataArrayDoubleIterator(); - DataArrayDoubleTuple *nextt(); - private: - DataArrayDouble *_da; - double *_pt; - int _tuple_id; - int _nb_comp; - int _nb_tuple; + using DataArrayType = typename Traits::ArrayType; + public: + static DataArrayType *New(); + T intValue() const; + bool isEqual(const DataArrayDiscrete& other) const; + bool isEqualIfNotWhy(const DataArrayDiscrete& other, std::string& reason) const; + bool isEqualWithoutConsideringStr(const DataArrayDiscrete& other) const; + bool isEqualWithoutConsideringStrAndOrder(const typename Traits::ArrayType& other) const; + void switchOnTupleEqualTo(T val, std::vector& vec) const; + void switchOnTupleNotEqualTo(T val, std::vector& vec) const; + DataArrayIdType *occurenceRankInThis() const; + DataArrayIdType *buildPermutationArr(const DataArrayDiscrete& other) const; + DataArrayIdType *indicesOfSubPart(const DataArrayDiscrete& partOfThis) const; + void checkMonotonic(bool increasing) const; + bool isMonotonic(bool increasing) const; + void checkStrictlyMonotonic(bool increasing) const; + bool isStrictlyMonotonic(bool increasing) const; + mcIdType getHashCode() const; + void reprCppStream(const std::string& varName, std::ostream& stream) const; + void reprQuickOverview(std::ostream& stream) const; + void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + void writeVTK(std::ostream& ofs, mcIdType indent, const std::string& type, const std::string& nameInFile, DataArrayByte *byteArr) const; + void transformWithIndArr(const T *indArrBg, const T *indArrEnd); + void transformWithIndArr(const MapKeyVal& m); + DataArrayIdType *findIdsEqual(T val) const; + DataArrayIdType *transformWithIndArrR(const T *indArr2Bg, const T *indArrEnd) const; + void splitByValueRange(const T *arrBg, const T *arrEnd, + DataArrayType *& castArr, DataArrayType *& rankInsideCast, DataArrayType *& castsPresent) const; + bool isRange(T& strt, T& sttoopp, T& stteepp) const; + DataArrayIdType *invertArrayO2N2N2O(mcIdType newNbOfElem) const; + DataArrayIdType *invertArrayN2O2O2N(mcIdType oldNbOfElem) const; + DataArrayIdType *invertArrayO2N2N2OBis(mcIdType newNbOfElem) const; + MCAuto< MapKeyVal > invertArrayN2O2O2NOptimized() const; + MCAuto< MapKeyVal > giveN2OOptimized() const; + MCAuto findIdForEach(const T *valsBg, const T *valsEnd) const; + DataArrayIdType *checkAndPreparePermutation() const; + void changeSurjectiveFormat(T targetNb, DataArrayIdType *&arr, DataArrayIdType *&arrI) const; + DataArrayIdType *buildPermArrPerLevel() const; + bool isIota(mcIdType sizeExpected) const; + bool isUniform(T val) const; + T checkUniformAndGuess() const; + bool hasUniqueValues() const; + void setSelectedComponents(const DataArrayType *a, const std::vector& compoIds); + DataArrayIdType *locateComponentId(const DataArrayType *valToSearchIntoTuples, const DataArrayIdType *tupleIdHint) const; + DataArrayIdType *findIdsNotEqual(T val) const; + DataArrayIdType *findIdsEqualTuple(const T *tupleBg, const T *tupleEnd) const; + DataArrayIdType *findIdsEqualList(const T *valsBg, const T *valsEnd) const; + DataArrayIdType *findIdsNotEqualList(const T *valsBg, const T *valsEnd) const; + mcIdType findIdFirstEqual(T value) const; + mcIdType findIdFirstEqual(const std::vector& vals) const; + mcIdType findIdFirstEqualTuple(const std::vector& tupl) const; + mcIdType findIdSequence(const std::vector& vals) const; + mcIdType changeValue(T oldValue, T newValue); + mcIdType count(T value) const; + bool presenceOfTuple(const std::vector& tupl) const; + bool presenceOfValue(T value) const; + bool presenceOfValue(const std::vector& vals) const; + void accumulate(T *res) const; + T accumulate(std::size_t compId) const; + DataArrayType *accumulatePerChunck(const mcIdType *bgOfIndex, const mcIdType *endOfIndex) const; + void getMinMaxValues(T& minValue, T& maxValue) const; + void applyInv(T numerator); + void applyDivideBy(T val); + void applyModulus(T val); + void applyRModulus(T val); + void applyPow(T val); + void applyRPow(T val); + DataArrayIdType *findIdsInRange(T vmin, T vmax) const; + DataArrayIdType *findIdsNotInRange(T vmin, T vmax) const; + bool checkAllIdsInRange(T vmin, T vmax) const; + static DataArrayType *Aggregate(const DataArrayType *a1, const DataArrayType *a2, T offsetA2); + static DataArrayType *Aggregate(const std::vector& arr); + static DataArrayType *AggregateIndexes(const std::vector& arrs); + static DataArrayType *BuildUnion(const std::vector& arr); + static DataArrayType *BuildIntersection(const std::vector& arr); + static void PutIntoToSkylineFrmt(const std::vector< std::vector >& v, DataArrayType *& data, DataArrayIdType *& dataIndex); + DataArrayIdType *buildComplement(mcIdType nbOfElement) const; + DataArrayType *buildSubstraction(const DataArrayType *other) const; + DataArrayType *buildSubstractionOptimized(const DataArrayType *other) const; + DataArrayType *buildUnion(const DataArrayType *other) const; + DataArrayType *buildIntersection(const DataArrayType *other) const; + DataArrayIdType *indexOfSameConsecutiveValueGroups() const; + DataArrayType *buildUnique() const; + DataArrayType *buildUniqueNotSorted() const; + DataArrayType *deltaShiftIndex() const; + void computeOffsets(); + void computeOffsetsFull(); + void findIdsRangesInListOfIds(const DataArrayType *listOfIds, DataArrayIdType *& rangeIdsFetched, DataArrayType *& idsInInputListThatFetch) const; + DataArrayType *buildExplicitArrByRanges(const DataArrayType *offsets) const; + DataArrayType *buildExplicitArrOfSliceOnScaledArr(T begin, T stop, T step) const; + DataArrayIdType *findRangeIdForEachTuple(const DataArrayType *ranges) const; + DataArrayType *findIdInRangeForEachTuple(const DataArrayType *ranges) const; + void sortEachPairToMakeALinkedList(); + void sortToHaveConsecutivePairs(); + MCAuto fromLinkedListOfPairToList() const; + DataArrayType *getDifferentValues() const; + std::vector partitionByDifferentValues(std::vector& differentIds) const; + std::vector< std::pair > splitInBalancedSlices(mcIdType nbOfSlices) const; + static DataArrayType *Modulus(const DataArrayType *a1, const DataArrayType *a2); + void modulusEqual(const DataArrayType *other); + static DataArrayType *Pow(const DataArrayType *a1, const DataArrayType *a2); + void powEqual(const DataArrayType *other); + //MemArray& accessToMemArray() { return _mem; } + //const MemArray& accessToMemArray() const { return _mem; } + public: + static DataArrayIdType *FindPermutationFromFirstToSecond(const DataArrayType *ids1, const DataArrayType *ids2); + static DataArrayIdType *FindPermutationFromFirstToSecondDuplicate(const DataArrayType *ids1, const DataArrayType *ids2); + static mcIdType *CheckAndPreparePermutation(const T *start, const T *end); + static DataArrayType *BuildListOfSwitchedOn(const std::vector& v); + static DataArrayType *BuildListOfSwitchedOff(const std::vector& v); + static DataArrayIdType *ConvertIndexArrayToO2N(mcIdType nbOfOldTuples, const mcIdType *arr, const mcIdType *arrIBg, const mcIdType *arrIEnd, mcIdType &newNbOfTuples); + static DataArrayIdType *MakePartition(const std::vector& groups, mcIdType newNb, std::vector< std::vector >& fidsOfGroups); + public: + static void ExtractFromIndexedArrays(const mcIdType *idsOfSelectBg, const mcIdType *idsOfSelectEnd, + const DataArrayType *arrIn, const DataArrayIdType *arrIndxIn, + DataArrayType* &arrOut, DataArrayIdType* &arrIndexOut); + static void ExtractFromIndexedArraysSlice(mcIdType idsOfSelectStart, mcIdType idsOfSelectStop, mcIdType idsOfSelectStep, + const DataArrayType *arrIn, const DataArrayIdType *arrIndxIn, + DataArrayType* &arrOut, DataArrayIdType* &arrIndexOut); + static void SetPartOfIndexedArrays(const mcIdType *idsOfSelectBg, const mcIdType *idsOfSelectEnd, + const DataArrayType *arrIn, const DataArrayIdType *arrIndxIn, + const DataArrayType *srcArr, const DataArrayIdType *srcArrIndex, + DataArrayType* &arrOut, DataArrayIdType* &arrIndexOut); + static void SetPartOfIndexedArraysSlice(mcIdType start, mcIdType end, mcIdType step, + const DataArrayType *arrIn, const DataArrayIdType *arrIndxIn, + const DataArrayType *srcArr, const DataArrayIdType *srcArrIndex, + DataArrayType* &arrOut, DataArrayIdType* &arrIndexOut); + static void SetPartOfIndexedArraysSameIdx(const mcIdType *idsOfSelectBg, const mcIdType *idsOfSelectEnd, + DataArrayType *arrInOut, const DataArrayIdType *arrIndxIn, + const DataArrayType *srcArr, const DataArrayIdType *srcArrIndex); + static void SetPartOfIndexedArraysSameIdxSlice(mcIdType start, mcIdType end, mcIdType step, + DataArrayType *arrInOut, const DataArrayIdType *arrIndxIn, + const DataArrayType *srcArr, const DataArrayIdType *srcArrIndex); + static bool RemoveIdsFromIndexedArrays(const T *idsToRemoveBg, const T *idsToRemoveEnd, + DataArrayType *arr, DataArrayIdType *arrIndx, mcIdType offsetForRemoval=0); + static DataArrayType *Range(T begin, T end, T step); + public: + void getTinySerializationIntInformation(std::vector& tinyInfo) const; + void getTinySerializationStrInformation(std::vector& tinyInfo) const; + bool resizeForUnserialization(const std::vector& tinyInfoI); + void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); + protected: + template + void switchOnTupleAlg(T val, std::vector& vec, ALG algo) const; + protected: + ~DataArrayDiscrete() { } }; - class MEDCOUPLING_EXPORT DataArrayDoubleTuple + template + class DataArrayDiscreteSigned : public DataArrayDiscrete { public: - DataArrayDoubleTuple(double *pt, int nbOfComp); - std::string repr() const; - int getNumberOfCompo() const { return _nb_of_compo; } - const double *getConstPointer() const { return _pt; } - double *getPointer() { return _pt; } - double doubleValue() const; - DataArrayDouble *buildDADouble(int nbOfTuples, int nbOfCompo) const; - private: - double *_pt; - int _nb_of_compo; - }; - - class DataArrayIntIterator; - - class MEDCOUPLING_EXPORT DataArrayInt : public DataArrayTemplate - { - public: - static DataArrayInt *New(); - int intValue() const; - int getHashCode() const; - DataArrayInt *deepCopy() const; - DataArrayInt *performCopyOrIncrRef(bool deepCopy) const; - DataArrayInt *buildNewEmptyInstance() const { return DataArrayInt::New(); } - bool isEqual(const DataArrayInt& other) const; - bool isEqualIfNotWhy(const DataArrayInt& other, std::string& reason) const; - bool isEqualWithoutConsideringStr(const DataArrayInt& other) const; - bool isEqualWithoutConsideringStrAndOrder(const DataArrayInt& other) const; - bool isFittingWith(const std::vector& v) const; - void switchOnTupleEqualTo(int val, std::vector& vec) const; - void switchOnTupleNotEqualTo(int val, std::vector& vec) const; - DataArrayInt *buildPermutationArr(const DataArrayInt& other) const; - DataArrayInt *indicesOfSubPart(const DataArrayInt& partOfThis) const; - DataArrayInt *sumPerTuple() const; - void checkMonotonic(bool increasing) const; - bool isMonotonic(bool increasing) const; - void checkStrictlyMonotonic(bool increasing) const; - bool isStrictlyMonotonic(bool increasing) const; - void fillWithZero(); - void iota(int init=0); - std::string repr() const; - std::string reprZip() const; - std::string reprNotTooLong() const; - void writeVTK(std::ostream& ofs, int indent, const std::string& type, const std::string& nameInFile, DataArrayByte *byteArr) const; - void reprStream(std::ostream& stream) const; - void reprZipStream(std::ostream& stream) const; - void reprNotTooLongStream(std::ostream& stream) const; - void reprWithoutNameStream(std::ostream& stream) const; - void reprZipWithoutNameStream(std::ostream& stream) const; - void reprNotTooLongWithoutNameStream(std::ostream& stream) const; - void reprCppStream(const std::string& varName, std::ostream& stream) const; - void reprQuickOverview(std::ostream& stream) const; - void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; - void transformWithIndArr(const int *indArrBg, const int *indArrEnd); - DataArrayInt *transformWithIndArrR(const int *indArrBg, const int *indArrEnd) const; - void splitByValueRange(const int *arrBg, const int *arrEnd, - DataArrayInt *& castArr, DataArrayInt *& rankInsideCast, DataArrayInt *& castsPresent) const; - bool isRange(int& strt, int& sttoopp, int& stteepp) const; - DataArrayInt *invertArrayO2N2N2O(int newNbOfElem) const; - DataArrayInt *invertArrayN2O2O2N(int oldNbOfElem) const; - DataArrayInt *invertArrayO2N2N2OBis(int newNbOfElem) const; - DataArrayDouble *convertToDblArr() const; - DataArrayInt *fromNoInterlace() const; - DataArrayInt *toNoInterlace() const; - DataArrayInt *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleId(new2OldBg,new2OldEnd); } - DataArrayInt *selectByTupleId(const DataArrayInt& di) const { return DataArrayTemplate::mySelectByTupleId(di); } - DataArrayInt *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } - DataArrayInt *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } - DataArrayInt *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } - DataArrayInt *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } - DataArrayInt *checkAndPreparePermutation() const; - static DataArrayInt *FindPermutationFromFirstToSecond(const DataArrayInt *ids1, const DataArrayInt *ids2); - void changeSurjectiveFormat(int targetNb, DataArrayInt *&arr, DataArrayInt *&arrI) const; - static DataArrayInt *ConvertIndexArrayToO2N(int nbOfOldTuples, const int *arr, const int *arrIBg, const int *arrIEnd, int &newNbOfTuples); - DataArrayInt *buildPermArrPerLevel() const; - bool isIota(int sizeExpected) const; - bool isUniform(int val) const; - bool hasUniqueValues() const; - void meldWith(const DataArrayInt *other); - void setSelectedComponents(const DataArrayInt *a, const std::vector& compoIds); - void getTuple(int tupleId, int *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); } - static void SetArrayIn(DataArrayInt *newArray, DataArrayInt* &arrayToSet); - DataArrayIntIterator *iterator(); - DataArrayInt *findIdsEqual(int val) const; - DataArrayInt *findIdsNotEqual(int val) const; - DataArrayInt *findIdsEqualList(const int *valsBg, const int *valsEnd) const; - DataArrayInt *findIdsNotEqualList(const int *valsBg, const int *valsEnd) const; - DataArrayInt *findIdsEqualTuple(const int *tupleBg, const int *tupleEnd) const; - int changeValue(int oldValue, int newValue); - int findIdFirstEqualTuple(const std::vector& tupl) const; - int findIdFirstEqual(int value) const; - int findIdFirstEqual(const std::vector& vals) const; - int findIdSequence(const std::vector& vals) const; - bool presenceOfTuple(const std::vector& tupl) const; - bool presenceOfValue(int value) const; - bool presenceOfValue(const std::vector& vals) const; - int count(int value) const; - void accumulate(int *res) const; - int accumulate(int compId) const; - DataArrayInt *accumulatePerChunck(const int *bgOfIndex, const int *endOfIndex) const; - void getMinMaxValues(int& minValue, int& maxValue) const; - void abs(); - DataArrayInt *computeAbs() const; - void applyLin(int a, int b, int compoId); - void applyLin(int a, int b); - void applyInv(int numerator); - DataArrayInt *negate() const; - void applyDivideBy(int val); - void applyModulus(int val); - void applyRModulus(int val); - void applyPow(int val); - void applyRPow(int val); - DataArrayInt *findIdsInRange(int vmin, int vmax) const; - DataArrayInt *findIdsNotInRange(int vmin, int vmax) const; - DataArrayInt *findIdsStricltyNegative() const; - bool checkAllIdsInRange(int vmin, int vmax) const; - static DataArrayInt *Aggregate(const DataArrayInt *a1, const DataArrayInt *a2, int offsetA2); - static DataArrayInt *Aggregate(const std::vector& arr); - static DataArrayInt *AggregateIndexes(const std::vector& arrs); - static DataArrayInt *Meld(const DataArrayInt *a1, const DataArrayInt *a2); - static DataArrayInt *Meld(const std::vector& arr); - static DataArrayInt *MakePartition(const std::vector& groups, int newNb, std::vector< std::vector >& fidsOfGroups); - static DataArrayInt *BuildUnion(const std::vector& arr); - static DataArrayInt *BuildIntersection(const std::vector& arr); - static DataArrayInt *BuildListOfSwitchedOn(const std::vector& v); - static DataArrayInt *BuildListOfSwitchedOff(const std::vector& v); - static void PutIntoToSkylineFrmt(const std::vector< std::vector >& v, DataArrayInt *& data, DataArrayInt *& dataIndex); - DataArrayInt *buildComplement(int nbOfElement) const; - DataArrayInt *buildSubstraction(const DataArrayInt *other) const; - DataArrayInt *buildSubstractionOptimized(const DataArrayInt *other) const; - DataArrayInt *buildUnion(const DataArrayInt *other) const; - DataArrayInt *buildIntersection(const DataArrayInt *other) const; - DataArrayInt *buildUnique() const; - DataArrayInt *buildUniqueNotSorted() const; - DataArrayInt *deltaShiftIndex() const; - void computeOffsets(); - void computeOffsetsFull(); - void findIdsRangesInListOfIds(const DataArrayInt *listOfIds, DataArrayInt *& rangeIdsFetched, DataArrayInt *& idsInInputListThatFetch) const; - DataArrayInt *buildExplicitArrByRanges(const DataArrayInt *offsets) const; - DataArrayInt *buildExplicitArrOfSliceOnScaledArr(int begin, int stop, int step) const; - DataArrayInt *findRangeIdForEachTuple(const DataArrayInt *ranges) const; - DataArrayInt *findIdInRangeForEachTuple(const DataArrayInt *ranges) const; - void sortEachPairToMakeALinkedList(); - MCAuto fromLinkedListOfPairToList() const; - DataArrayInt *duplicateEachTupleNTimes(int nbTimes) const; - DataArrayInt *getDifferentValues() const; - std::vector partitionByDifferentValues(std::vector& differentIds) const; - std::vector< std::pair > splitInBalancedSlices(int nbOfSlices) const; - template - void insertAtTheEnd(InputIterator first, InputIterator last); - void aggregate(const DataArrayInt *other); - void writeOnPlace(std::size_t id, int element0, const int *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); } - static DataArrayInt *Add(const DataArrayInt *a1, const DataArrayInt *a2); - void addEqual(const DataArrayInt *other); - static DataArrayInt *Substract(const DataArrayInt *a1, const DataArrayInt *a2); - void substractEqual(const DataArrayInt *other); - static DataArrayInt *Multiply(const DataArrayInt *a1, const DataArrayInt *a2); - void multiplyEqual(const DataArrayInt *other); - static DataArrayInt *Divide(const DataArrayInt *a1, const DataArrayInt *a2); - void divideEqual(const DataArrayInt *other); - static DataArrayInt *Modulus(const DataArrayInt *a1, const DataArrayInt *a2); - void modulusEqual(const DataArrayInt *other); - static DataArrayInt *Pow(const DataArrayInt *a1, const DataArrayInt *a2); - void powEqual(const DataArrayInt *other); - void updateTime() const { } - MemArray& accessToMemArray() { return _mem; } - const MemArray& accessToMemArray() const { return _mem; } - public: - static int *CheckAndPreparePermutation(const int *start, const int *end); - static DataArrayInt *Range(int begin, int end, int step); - public: - void getTinySerializationIntInformation(std::vector& tinyInfo) const; - void getTinySerializationStrInformation(std::vector& tinyInfo) const; - bool resizeForUnserialization(const std::vector& tinyInfoI); - void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); - private: - ~DataArrayInt() { } - DataArrayInt() { } + bool isFittingWith(const std::vector& v) const; + protected: + ~DataArrayDiscreteSigned() { } }; - class DataArrayIntTuple; + class DataArrayInt32Iterator; - class MEDCOUPLING_EXPORT DataArrayIntIterator + class MEDCOUPLING_EXPORT DataArrayInt32 : public DataArrayDiscreteSigned { + friend class DataArrayDiscrete; + public: + DataArrayInt32 *deepCopy() const; + DataArrayInt32 *copySorted(bool asc=true) const override { return this->copySortedImpl(asc); } + DataArrayInt32 *buildNewEmptyInstance() const { return DataArrayInt32::New(); } + MCAuto convertToInt64Arr() const; public: - DataArrayIntIterator(DataArrayInt *da); - ~DataArrayIntIterator(); - DataArrayIntTuple *nextt(); + DataArrayInt32 *selectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return this->mySelectByTupleId(new2OldBg,new2OldEnd); } + DataArrayInt32 *selectByTupleId(const DataArrayIdType& di) const { return this->mySelectByTupleId(di); } + DataArrayInt32 *selectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return this->mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + DataArrayInt32 *keepSelectedComponents(const std::vector& compoIds) const { return this->myKeepSelectedComponents(compoIds); } + DataArrayInt32 *selectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const { return this->mySelectByTupleIdSafeSlice(bg,end2,step); } + DataArrayInt32 *selectByTupleRanges(const std::vector >& ranges) const { return this->mySelectByTupleRanges(ranges); } + std::string getClassName() const override { return std::string("DataArrayInt32"); } + public: + DataArrayInt32Iterator *iterator(); private: - DataArrayInt *_da; - int *_pt; - int _tuple_id; - int _nb_comp; - int _nb_tuple; + ~DataArrayInt32() { } + DataArrayInt32() { } }; - class MEDCOUPLING_EXPORT DataArrayIntTuple + class MEDCOUPLING_EXPORT DataArrayInt64 : public DataArrayDiscreteSigned { + friend class DataArrayDiscrete; + public: + DataArrayInt64 *deepCopy() const; + DataArrayInt64 *copySorted(bool asc=true) const override { return this->copySortedImpl(asc); } + DataArrayInt64 *buildNewEmptyInstance() const { return DataArrayInt64::New(); }//ok + MCAuto convertToInt32Arr() const; + public: + DataArrayInt64 *selectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return this->mySelectByTupleId(new2OldBg,new2OldEnd); } + DataArrayInt64 *selectByTupleId(const DataArrayIdType& di) const { return this->mySelectByTupleId(di); } + DataArrayInt64 *selectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + DataArrayInt64 *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } + DataArrayInt64 *selectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } + DataArrayInt64 *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } + std::string getClassName() const override { return std::string("DataArrayInt64"); } public: - DataArrayIntTuple(int *pt, int nbOfComp); - std::string repr() const; - int getNumberOfCompo() const { return _nb_of_compo; } - const int *getConstPointer() const { return _pt; } - int *getPointer() { return _pt; } - int intValue() const; - DataArrayInt *buildDAInt(int nbOfTuples, int nbOfCompo) const; + DataArrayInt64Iterator *iterator(); private: - int *_pt; - int _nb_of_compo; + ~DataArrayInt64() { } + DataArrayInt64() { } }; +} + +namespace MEDCoupling +{ + + template + template + MCAuto DataArrayTemplateClassic::findIdsAdv(const OP& op) const + { + this->checkAllocated(); + if(this->getNumberOfComponents()!=1) + throw INTERP_KERNEL::Exception("DataArrayInt::findIdsAdv : this must have exactly one component !"); + const T *cptr(this->begin()); + MCAuto ret(DataArrayIdType::New()); ret->alloc(0,1); + mcIdType nbOfTuples=this->getNumberOfTuples(); + for(mcIdType i=0;ipushBackSilent(i); + return ret; + } class MEDCOUPLING_EXPORT DataArrayChar : public DataArrayTemplate { public: - virtual DataArrayChar *buildEmptySpecializedDAChar() const = 0; - int getHashCode() const; - bool isEqual(const DataArrayChar& other) const; - virtual bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; - bool isEqualWithoutConsideringStr(const DataArrayChar& other) const; - void fillWithZero(); - std::string repr() const; - std::string reprZip() const; - DataArrayInt *convertToIntArr() const; - DataArrayChar *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleId(new2OldBg,new2OldEnd); } - DataArrayChar *selectByTupleId(const DataArrayInt& di) const { return DataArrayTemplate::mySelectByTupleId(di); } - DataArrayChar *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } - DataArrayChar *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } - DataArrayChar *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } - bool isUniform(char val) const; - void meldWith(const DataArrayChar *other); - DataArray *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } - void getTuple(int tupleId, char *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); } - DataArrayInt *findIdsEqual(char val) const; - DataArrayInt *findIdsNotEqual(char val) const; - int findIdSequence(const std::vector& vals) const; - int findIdFirstEqualTuple(const std::vector& tupl) const; - int findIdFirstEqual(char value) const; - int findIdFirstEqual(const std::vector& vals) const; - bool presenceOfTuple(const std::vector& tupl) const; - bool presenceOfValue(char value) const; - bool presenceOfValue(const std::vector& vals) const; - DataArrayInt *findIdsInRange(char vmin, char vmax) const; - static DataArrayChar *Aggregate(const DataArrayChar *a1, const DataArrayChar *a2); - static DataArrayChar *Aggregate(const std::vector& arr); - static DataArrayChar *Meld(const DataArrayChar *a1, const DataArrayChar *a2); - static DataArrayChar *Meld(const std::vector& arr); - template - void insertAtTheEnd(InputIterator first, InputIterator last); - void updateTime() const { } - MemArray& accessToMemArray() { return _mem; } - const MemArray& accessToMemArray() const { return _mem; } - public: - // void getTinySerializationIntInformation(std::vector& tinyInfo) const; - // void getTinySerializationStrInformation(std::vector& tinyInfo) const; - // bool resizeForUnserialization(const std::vector& tinyInfoI); - // void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); + virtual DataArrayChar *buildEmptySpecializedDAChar() const = 0; + mcIdType getHashCode() const; + bool isEqual(const DataArrayChar& other) const; + virtual bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; + bool isEqualWithoutConsideringStr(const DataArrayChar& other) const; + std::string repr() const; + std::string reprZip() const; + DataArrayInt *convertToIntArr() const; + DataArrayChar *selectByTupleId(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return this->mySelectByTupleId(new2OldBg,new2OldEnd); } + DataArrayChar *selectByTupleId(const DataArrayIdType& di) const { return this->mySelectByTupleId(di); } + DataArrayChar *selectByTupleIdSafe(const mcIdType *new2OldBg, const mcIdType *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + DataArrayChar *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } + DataArrayChar *selectByTupleIdSafeSlice(mcIdType bg, mcIdType end2, mcIdType step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } + bool isUniform(char val) const; + void meldWith(const DataArrayChar *other); + DataArray *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } + DataArrayIdType *findIdsEqual(char val) const; + DataArrayIdType *findIdsNotEqual(char val) const; + mcIdType findIdSequence(const std::vector& vals) const; + mcIdType findIdFirstEqualTuple(const std::vector& tupl) const; + mcIdType findIdFirstEqual(char value) const; + mcIdType findIdFirstEqual(const std::vector& vals) const; + bool presenceOfTuple(const std::vector& tupl) const; + bool presenceOfValue(char value) const; + bool presenceOfValue(const std::vector& vals) const; + DataArrayIdType *findIdsInRange(char vmin, char vmax) const; + static DataArrayChar *Aggregate(const DataArrayChar *a1, const DataArrayChar *a2); + static DataArrayChar *Aggregate(const std::vector& arr); + static DataArrayChar *Meld(const DataArrayChar *a1, const DataArrayChar *a2); + static DataArrayChar *Meld(const std::vector& arr); + MemArray& accessToMemArray() { return _mem; } + const MemArray& accessToMemArray() const { return _mem; } + public: + //void getTinySerializationIntInformation(std::vector& tinyInfo) const; + //void getTinySerializationStrInformation(std::vector& tinyInfo) const; + //bool resizeForUnserialization(const std::vector& tinyInfoI); + //void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); protected: DataArrayChar() { } }; @@ -736,116 +834,222 @@ namespace MEDCoupling class MEDCOUPLING_EXPORT DataArrayByte : public DataArrayChar { public: - static DataArrayByte *New(); - DataArrayChar *buildEmptySpecializedDAChar() const; - DataArrayByteIterator *iterator(); - DataArrayByte *deepCopy() const; - DataArrayByte *performCopyOrIncrRef(bool deepCopy) const; - DataArrayByte *buildNewEmptyInstance() const { return DataArrayByte::New(); } - char byteValue() const; - void reprStream(std::ostream& stream) const; - void reprZipStream(std::ostream& stream) const; - void reprWithoutNameStream(std::ostream& stream) const; - void reprZipWithoutNameStream(std::ostream& stream) const; - void reprCppStream(const std::string& varName, std::ostream& stream) const; - void reprQuickOverview(std::ostream& stream) const; - void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; - bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; - std::vector toVectorOfBool() const; + static DataArrayByte *New(); + DataArrayChar *buildEmptySpecializedDAChar() const; + DataArrayByteIterator *iterator(); + DataArrayByte *deepCopy() const; + DataArrayByte *copySorted(bool asc=true) const override { return this->copySortedImpl(asc); } + DataArrayByte *performCopyOrIncrRef(bool deepCopy) const; + DataArrayByte *buildNewEmptyInstance() const { return DataArrayByte::New(); } + char byteValue() const; + void reprStream(std::ostream& stream) const; + void reprZipStream(std::ostream& stream) const; + void reprWithoutNameStream(std::ostream& stream) const; + void reprZipWithoutNameStream(std::ostream& stream) const; + void reprCppStream(const std::string& varName, std::ostream& stream) const; + void reprQuickOverview(std::ostream& stream) const; + void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; + std::vector toVectorOfBool() const; + std::string getClassName() const override { return std::string("DataArrayByte"); } private: ~DataArrayByte() { } DataArrayByte() { } }; - class DataArrayByteTuple; + class DataArrayAsciiCharIterator; - class MEDCOUPLING_EXPORT DataArrayByteIterator + class MEDCOUPLING_EXPORT DataArrayAsciiChar : public DataArrayChar { public: - DataArrayByteIterator(DataArrayByte *da); - ~DataArrayByteIterator(); - DataArrayByteTuple *nextt(); + static DataArrayAsciiChar *New(); + static DataArrayAsciiChar *New(const std::string& st); + static DataArrayAsciiChar *New(const std::vector& vst, char defaultChar); + DataArrayChar *buildEmptySpecializedDAChar() const; + DataArrayAsciiCharIterator *iterator(); + DataArrayAsciiChar *deepCopy() const; + DataArrayAsciiChar *copySorted(bool asc=true) const override { (void)asc;throw INTERP_KERNEL::Exception("DataArrayAsciiChar::copySorted : not implemented for DataArrayByte"); } + DataArrayAsciiChar *performCopyOrIncrRef(bool deepCopy) const; + DataArrayAsciiChar *buildNewEmptyInstance() const { return DataArrayAsciiChar::New(); } + char asciiCharValue() const; + void reprStream(std::ostream& stream) const; + void reprZipStream(std::ostream& stream) const; + void reprWithoutNameStream(std::ostream& stream) const; + void reprZipWithoutNameStream(std::ostream& stream) const; + void reprCppStream(const std::string& varName, std::ostream& stream) const; + void reprQuickOverview(std::ostream& stream) const; + void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; + std::string getClassName() const override { return std::string("DataArrayAsciiChar"); } private: - DataArrayByte *_da; - char *_pt; - int _tuple_id; - int _nb_comp; - int _nb_tuple; + ~DataArrayAsciiChar() { } + DataArrayAsciiChar() { } + DataArrayAsciiChar(const std::string& st); + DataArrayAsciiChar(const std::vector& vst, char defaultChar); }; - class MEDCOUPLING_EXPORT DataArrayByteTuple + template + class DataArrayIterator { public: - DataArrayByteTuple(char *pt, int nbOfComp); - std::string repr() const; - int getNumberOfCompo() const { return _nb_of_compo; } - const char *getConstPointer() const { return _pt; } - char *getPointer() { return _pt; } - char byteValue() const; - DataArrayByte *buildDAByte(int nbOfTuples, int nbOfCompo) const; + DataArrayIterator(typename Traits::ArrayType *da); + ~DataArrayIterator(); + typename Traits::ArrayTuple *nextt(); private: - char *_pt; - int _nb_of_compo; + typename Traits::ArrayType *_da; + T *_pt; + mcIdType _tuple_id; + std::size_t _nb_comp; + mcIdType _nb_tuple; }; - class DataArrayAsciiCharIterator; + template + class DataArrayTuple + { + public: + DataArrayTuple(T *pt, std::size_t nbOfComp); + std::string repr() const; + std::size_t getNumberOfCompo() const { return _nb_of_compo; } + const T *getConstPointer() const { return _pt; } + T *getPointer() { return _pt; } + typename Traits::ArrayType *buildDA(std::size_t nbOfTuples, std::size_t nbOfCompo) const; + protected: + T zeValue() const; + protected: + T *_pt; + std::size_t _nb_of_compo; + }; - class MEDCOUPLING_EXPORT DataArrayAsciiChar : public DataArrayChar + class DataArrayDoubleTuple; + + class MEDCOUPLING_EXPORT DataArrayDoubleIterator : public DataArrayIterator { public: - static DataArrayAsciiChar *New(); - static DataArrayAsciiChar *New(const std::string& st); - static DataArrayAsciiChar *New(const std::vector& vst, char defaultChar); - DataArrayChar *buildEmptySpecializedDAChar() const; - DataArrayAsciiCharIterator *iterator(); - DataArrayAsciiChar *deepCopy() const; - DataArrayAsciiChar *performCopyOrIncrRef(bool deepCopy) const; - DataArrayAsciiChar *buildNewEmptyInstance() const { return DataArrayAsciiChar::New(); } - char asciiCharValue() const; - void reprStream(std::ostream& stream) const; - void reprZipStream(std::ostream& stream) const; - void reprWithoutNameStream(std::ostream& stream) const; - void reprZipWithoutNameStream(std::ostream& stream) const; - void reprCppStream(const std::string& varName, std::ostream& stream) const; - void reprQuickOverview(std::ostream& stream) const; - void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; - bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; - private: - ~DataArrayAsciiChar() { } - DataArrayAsciiChar() { } - DataArrayAsciiChar(const std::string& st); - DataArrayAsciiChar(const std::vector& vst, char defaultChar); + DataArrayDoubleIterator(DataArrayDouble *da); + ~DataArrayDoubleIterator() { } + }; + + class MEDCOUPLING_EXPORT DataArrayDoubleTuple : public DataArrayTuple + { + public: + DataArrayDoubleTuple(double *pt, std::size_t nbOfComp); + std::string repr() const; + double doubleValue() const; + DataArrayDouble *buildDADouble(std::size_t nbOfTuples, std::size_t nbOfCompo) const; + }; + + class DataArrayFloatTuple; + + class MEDCOUPLING_EXPORT DataArrayFloatIterator : public DataArrayIterator + { + public: + DataArrayFloatIterator(DataArrayFloat *da); + ~DataArrayFloatIterator() { } + }; + + class MEDCOUPLING_EXPORT DataArrayFloatTuple : public DataArrayTuple + { + public: + DataArrayFloatTuple(float *pt, std::size_t nbOfComp); + std::string repr() const; + float floatValue() const; + DataArrayFloat *buildDAFloat(std::size_t nbOfTuples, std::size_t nbOfCompo) const; + }; + + class MEDCOUPLING_EXPORT DataArrayInt32Iterator : public DataArrayIterator + { + public: + DataArrayInt32Iterator(DataArrayInt32 *da); + ~DataArrayInt32Iterator() { } + }; + + class MEDCOUPLING_EXPORT DataArrayInt64Iterator : public DataArrayIterator + { + public: + DataArrayInt64Iterator(DataArrayInt64 *da); + ~DataArrayInt64Iterator() { } + }; + + class MEDCOUPLING_EXPORT DataArrayInt32Tuple : public DataArrayTuple + { + public: + DataArrayInt32Tuple(Int32 *pt, std::size_t nbOfComp); + std::string repr() const; + Int32 intValue() const; + DataArrayInt32 *buildDAInt(std::size_t nbOfTuples, std::size_t nbOfCompo) const; + }; + + class MEDCOUPLING_EXPORT DataArrayInt64Tuple : public DataArrayTuple + { + public: + DataArrayInt64Tuple(Int64 *pt, std::size_t nbOfComp); + std::string repr() const; + Int64 intValue() const; + DataArrayInt64 *buildDAInt(std::size_t nbOfTuples, std::size_t nbOfCompo) const; }; + typedef DataArrayInt32Tuple DataArrayIntTuple; + class DataArrayAsciiCharTuple; class MEDCOUPLING_EXPORT DataArrayAsciiCharIterator { public: - DataArrayAsciiCharIterator(DataArrayAsciiChar *da); - ~DataArrayAsciiCharIterator(); - DataArrayAsciiCharTuple *nextt(); + DataArrayAsciiCharIterator(DataArrayAsciiChar *da); + ~DataArrayAsciiCharIterator(); + DataArrayAsciiCharTuple *nextt(); private: DataArrayAsciiChar *_da; char *_pt; - int _tuple_id; - int _nb_comp; - int _nb_tuple; + mcIdType _tuple_id; + std::size_t _nb_comp; + mcIdType _nb_tuple; }; class MEDCOUPLING_EXPORT DataArrayAsciiCharTuple { public: - DataArrayAsciiCharTuple(char *pt, int nbOfComp); - std::string repr() const; - int getNumberOfCompo() const { return _nb_of_compo; } - const char *getConstPointer() const { return _pt; } - char *getPointer() { return _pt; } - char asciiCharValue() const; - DataArrayAsciiChar *buildDAAsciiChar(int nbOfTuples, int nbOfCompo) const; + DataArrayAsciiCharTuple(char *pt, std::size_t nbOfComp); + std::string repr() const; + std::size_t getNumberOfCompo() const { return _nb_of_compo; } + const char *getConstPointer() const { return _pt; } + char *getPointer() { return _pt; } + char asciiCharValue() const; + DataArrayAsciiChar *buildDAAsciiChar(std::size_t nbOfTuples, std::size_t nbOfCompo) const; + private: + char *_pt; + std::size_t _nb_of_compo; + }; + + class DataArrayByteTuple; + + class MEDCOUPLING_EXPORT DataArrayByteIterator + { + public: + DataArrayByteIterator(DataArrayByte *da); + ~DataArrayByteIterator(); + DataArrayByteTuple *nextt(); + private: + DataArrayByte *_da; + char *_pt; + mcIdType _tuple_id; + std::size_t _nb_comp; + mcIdType _nb_tuple; + }; + + class MEDCOUPLING_EXPORT DataArrayByteTuple + { + public: + DataArrayByteTuple(char *pt, std::size_t nbOfComp); + std::string repr() const; + std::size_t getNumberOfCompo() const { return _nb_of_compo; } + const char *getConstPointer() const { return _pt; } + char *getPointer() { return _pt; } + char byteValue() const; + DataArrayByte *buildDAByte(std::size_t nbOfTuples, std::size_t nbOfCompo) const; private: char *_pt; - int _nb_of_compo; + std::size_t _nb_of_compo; }; } @@ -866,51 +1070,20 @@ namespace MEDCoupling pointer[_nb_of_elem++]=*first++; } } - - template - void DataArrayDouble::insertAtTheEnd(InputIterator first, InputIterator last) - { - int nbCompo(getNumberOfComponents()); - if(nbCompo==1) - _mem.insertAtTheEnd(first,last); - else if(nbCompo==0) - { - _info_on_compo.resize(1); - _mem.insertAtTheEnd(first,last); - } - else - throw INTERP_KERNEL::Exception("DataArrayDouble::insertAtTheEnd : not available for DataArrayDouble with number of components different than 1 !"); - } - - template - void DataArrayInt::insertAtTheEnd(InputIterator first, InputIterator last) - { - int nbCompo(getNumberOfComponents()); - if(nbCompo==1) - _mem.insertAtTheEnd(first,last); - else if(nbCompo==0) - { - _info_on_compo.resize(1); - _mem.insertAtTheEnd(first,last); - } - else - throw INTERP_KERNEL::Exception("DataArrayInt::insertAtTheEnd : not available for DataArrayInt with number of components different than 1 !"); - } + template template - void DataArrayChar::insertAtTheEnd(InputIterator first, InputIterator last) + void DataArrayTemplate::insertAtTheEnd(InputIterator first, InputIterator last) { - int nbCompo(getNumberOfComponents()); + std::size_t nbCompo(this->getNumberOfComponents()); if(nbCompo==1) - _mem.insertAtTheEnd(first,last); + this->_mem.insertAtTheEnd(first,last); else if(nbCompo==0) { - _info_on_compo.resize(1); - _mem.insertAtTheEnd(first,last); + this->_info_on_compo.resize(1); + this->_mem.insertAtTheEnd(first,last); } else - throw INTERP_KERNEL::Exception("DataArrayChar::insertAtTheEnd : not available for DataArrayChar with number of components different than 1 !"); + throw INTERP_KERNEL::Exception("DataArrayDouble::insertAtTheEnd : not available for DataArrayDouble with number of components different than 1 !"); } } - -#endif