From 6585fe2c393089fdff08249df163defcf51a2297 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 31 Aug 2018 11:04:47 +0300 Subject: [PATCH] Move dll import/export to methods level. --- src/MEDCoupling/MEDCouplingMemArray.cxx | 3 + src/MEDCoupling/MEDCouplingMemArray.hxx | 1192 ++++++++--------- .../Test/MEDCouplingBasicsTest1.cxx | 4 - .../MEDCouplingDataArrayTraits.hxx | 4 - src/RENUMBER_Swig/MEDRenumberCommon.i | 1 - 5 files changed, 599 insertions(+), 605 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx index b96febeff..a1759a4aa 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.cxx +++ b/src/MEDCoupling/MEDCouplingMemArray.cxx @@ -53,6 +53,9 @@ template class MEDCoupling::DataArrayIterator; template class MEDCoupling::DataArrayIterator; template class MEDCoupling::DataArrayDiscrete; template class MEDCoupling::DataArrayDiscreteSigned; +template class MEDCoupling::DataArrayTuple; +template class MEDCoupling::DataArrayTuple; +template class MEDCoupling::DataArrayTuple; // [ABN] : Newest Intel compilers need this: template Traits::ArrayType* MEDCoupling::DataArrayTuple::buildDA(int, int) const; diff --git a/src/MEDCoupling/MEDCouplingMemArray.hxx b/src/MEDCoupling/MEDCouplingMemArray.hxx index ac38430a6..4ee8a3d7e 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.hxx +++ b/src/MEDCoupling/MEDCouplingMemArray.hxx @@ -51,14 +51,14 @@ namespace MEDCoupling class MEDCouplingPointer { public: - MEDCouplingPointer():_internal(0),_external(0) { } - void null() { _internal=0; _external=0; } - bool isNull() const { return _internal==0 && _external==0; } - void setInternal(T *pointer); - void setExternal(const T *pointer); - const T *getConstPointer() const { if(_internal) return _internal; else return _external; } - const T *getConstPointerLoc(std::size_t offset) const { if(_internal) return _internal+offset; else return _external+offset; } - T *getPointer() { if(_internal) return _internal; if(_external) throw INTERP_KERNEL::Exception("Trying to write on an external pointer."); else return 0; } + MEDCOUPLING_EXPORT MEDCouplingPointer():_internal(0),_external(0) { } + MEDCOUPLING_EXPORT void null() { _internal=0; _external=0; } + MEDCOUPLING_EXPORT bool isNull() const { return _internal==0 && _external==0; } + MEDCOUPLING_EXPORT void setInternal(T *pointer); + MEDCOUPLING_EXPORT void setExternal(const T *pointer); + MEDCOUPLING_EXPORT const T *getConstPointer() const { if(_internal) return _internal; else return _external; } + MEDCOUPLING_EXPORT const T *getConstPointerLoc(std::size_t offset) const { if(_internal) return _internal+offset; else return _external+offset; } + MEDCOUPLING_EXPORT T *getPointer() { if(_internal) return _internal; if(_external) throw INTERP_KERNEL::Exception("Trying to write on an external pointer."); else return 0; } private: T *_internal; const T *_external; @@ -70,45 +70,45 @@ namespace MEDCoupling public: typedef void (*Deallocator)(void *,void *); public: - MemArray():_nb_of_elem(0),_nb_of_elem_alloc(0),_ownership(false),_dealloc(0),_param_for_deallocator(0) { } - MemArray(const MemArray& other); - bool isNull() const { return _pointer.isNull(); } - const T *getConstPointerLoc(std::size_t offset) const { return _pointer.getConstPointerLoc(offset); } - const T *getConstPointer() const { return _pointer.getConstPointer(); } - 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); - 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 fillWithValue(const T& val); - T *fromNoInterlace(int nbOfComp) const; - T *toNoInterlace(int nbOfComp) const; - void sort(bool asc); - void reverse(int nbOfComp); - void alloc(std::size_t nbOfElements); - void reserve(std::size_t newNbOfElements); - void reAlloc(std::size_t newNbOfElements); - void useArray(const T *array, bool ownership, DeallocType type, std::size_t nbOfElem); - void useExternalArrayWithRWAccess(const T *array, std::size_t nbOfElem); - void writeOnPlace(std::size_t id, T element0, const T *others, std::size_t sizeOfOthers); + MEDCOUPLING_EXPORT MemArray():_nb_of_elem(0),_nb_of_elem_alloc(0),_ownership(false),_dealloc(0),_param_for_deallocator(0) { } + MEDCOUPLING_EXPORT MemArray(const MemArray& other); + MEDCOUPLING_EXPORT bool isNull() const { return _pointer.isNull(); } + MEDCOUPLING_EXPORT const T *getConstPointerLoc(std::size_t offset) const { return _pointer.getConstPointerLoc(offset); } + MEDCOUPLING_EXPORT const T *getConstPointer() const { return _pointer.getConstPointer(); } + MEDCOUPLING_EXPORT std::size_t getNbOfElem() const { return _nb_of_elem; } + MEDCOUPLING_EXPORT std::size_t getNbOfElemAllocated() const { return _nb_of_elem_alloc; } + MEDCOUPLING_EXPORT T *getPointer() { return _pointer.getPointer(); } + MEDCOUPLING_EXPORT MemArray &operator=(const MemArray& other); + MEDCOUPLING_EXPORT T operator[](std::size_t id) const { return _pointer.getConstPointer()[id]; } + MEDCOUPLING_EXPORT T& operator[](std::size_t id) { return _pointer.getPointer()[id]; } + MEDCOUPLING_EXPORT bool isEqual(const MemArray& other, T prec, std::string& reason) const; + MEDCOUPLING_EXPORT void repr(int sl, std::ostream& stream) const; + MEDCOUPLING_EXPORT bool reprHeader(int sl, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZip(int sl, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprNotTooLong(int sl, std::ostream& stream) const; + MEDCOUPLING_EXPORT void fillWithValue(const T& val); + MEDCOUPLING_EXPORT T *fromNoInterlace(int nbOfComp) const; + MEDCOUPLING_EXPORT T *toNoInterlace(int nbOfComp) const; + MEDCOUPLING_EXPORT void sort(bool asc); + MEDCOUPLING_EXPORT void reverse(int nbOfComp); + MEDCOUPLING_EXPORT void alloc(std::size_t nbOfElements); + MEDCOUPLING_EXPORT void reserve(std::size_t newNbOfElements); + MEDCOUPLING_EXPORT void reAlloc(std::size_t newNbOfElements); + MEDCOUPLING_EXPORT void useArray(const T *array, bool ownership, DeallocType type, std::size_t nbOfElem); + MEDCOUPLING_EXPORT void useExternalArrayWithRWAccess(const T *array, std::size_t nbOfElem); + MEDCOUPLING_EXPORT void writeOnPlace(std::size_t id, T element0, const T *others, std::size_t sizeOfOthers); template void insertAtTheEnd(InputIterator first, InputIterator last); - void pushBack(T elem); - T popBack(); - void pack() const; - bool isDeallocatorCalled() const { return _ownership; } - Deallocator getDeallocator() const { return _dealloc; } - void setSpecificDeallocator(Deallocator dealloc) { _dealloc=dealloc; } - void setParameterForDeallocator(void *param) { _param_for_deallocator=param; } - void *getParameterForDeallocator() const { return _param_for_deallocator; } - void destroy(); - ~MemArray() { destroy(); } + MEDCOUPLING_EXPORT void pushBack(T elem); + MEDCOUPLING_EXPORT T popBack(); + MEDCOUPLING_EXPORT void pack() const; + MEDCOUPLING_EXPORT bool isDeallocatorCalled() const { return _ownership; } + MEDCOUPLING_EXPORT Deallocator getDeallocator() const { return _dealloc; } + MEDCOUPLING_EXPORT void setSpecificDeallocator(Deallocator dealloc) { _dealloc=dealloc; } + MEDCOUPLING_EXPORT void setParameterForDeallocator(void *param) { _param_for_deallocator=param; } + MEDCOUPLING_EXPORT void *getParameterForDeallocator() const { return _param_for_deallocator; } + MEDCOUPLING_EXPORT void destroy(); + MEDCOUPLING_EXPORT ~MemArray() { destroy(); } public: static void CPPDeallocator(void *pt, void *param); static void CDeallocator(void *pt, void *param); @@ -127,84 +127,84 @@ namespace MEDCoupling class DataArrayInt32; class DataArrayByte; - class MEDCOUPLING_EXPORT DataArray : public RefCountObject, public TimeLabel + class 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 std::size_t 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 DataArrayInt32 *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; + MEDCOUPLING_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const; + MEDCOUPLING_EXPORT std::vector getDirectChildrenWithNull() const; + MEDCOUPLING_EXPORT void setName(const std::string& name); + MEDCOUPLING_EXPORT void copyStringInfoFrom(const DataArray& other); + MEDCOUPLING_EXPORT void copyPartOfStringInfoFrom(const DataArray& other, const std::vector& compoIds); + MEDCOUPLING_EXPORT void copyPartOfStringInfoFrom2(const std::vector& compoIds, const DataArray& other); + MEDCOUPLING_EXPORT bool areInfoEqualsIfNotWhy(const DataArray& other, std::string& reason) const; + MEDCOUPLING_EXPORT bool areInfoEquals(const DataArray& other) const; + MEDCOUPLING_EXPORT std::string cppRepr(const std::string& varName) const; + MEDCOUPLING_EXPORT std::string getName() const { return _name; } + MEDCOUPLING_EXPORT const std::vector &getInfoOnComponents() const { return _info_on_compo; } + MEDCOUPLING_EXPORT std::vector &getInfoOnComponents() { return _info_on_compo; } + MEDCOUPLING_EXPORT void setInfoOnComponents(const std::vector& info); + MEDCOUPLING_EXPORT void setInfoAndChangeNbOfCompo(const std::vector& info); + MEDCOUPLING_EXPORT std::vector getVarsOnComponent() const; + MEDCOUPLING_EXPORT std::vector getUnitsOnComponent() const; + MEDCOUPLING_EXPORT std::string getInfoOnComponent(int i) const; + MEDCOUPLING_EXPORT std::string getVarOnComponent(int i) const; + MEDCOUPLING_EXPORT std::string getUnitOnComponent(int i) const; + MEDCOUPLING_EXPORT void setInfoOnComponent(int i, const std::string& info); + MEDCOUPLING_EXPORT std::size_t getNumberOfComponents() const { return _info_on_compo.size(); } + MEDCOUPLING_EXPORT void setPartOfValuesBase3(const DataArray *aBase, const int *bgTuples, const int *endTuples, int bgComp, int endComp, int stepComp, bool strictCompoCompare=true); + MEDCOUPLING_EXPORT virtual void *getVoidStarPointer() = 0; + MEDCOUPLING_EXPORT virtual DataArray *deepCopy() const = 0; + MEDCOUPLING_EXPORT virtual DataArray *buildNewEmptyInstance() const = 0; + MEDCOUPLING_EXPORT virtual bool isAllocated() const = 0; + MEDCOUPLING_EXPORT virtual void checkAllocated() const = 0; + MEDCOUPLING_EXPORT virtual void desallocate() = 0; + MEDCOUPLING_EXPORT virtual std::size_t getNumberOfTuples() const = 0; + MEDCOUPLING_EXPORT virtual std::size_t getNbOfElems() const = 0; + MEDCOUPLING_EXPORT virtual std::size_t getNbOfElemAllocated() const = 0; + MEDCOUPLING_EXPORT virtual void alloc(std::size_t nbOfTuple, std::size_t nbOfCompo=1) = 0; + MEDCOUPLING_EXPORT virtual void reAlloc(std::size_t newNbOfTuple) = 0; + MEDCOUPLING_EXPORT virtual void renumberInPlace(const int *old2New) = 0; + MEDCOUPLING_EXPORT virtual void renumberInPlaceR(const int *new2Old) = 0; + MEDCOUPLING_EXPORT virtual void setContigPartOfSelectedValues(int tupleIdStart, const DataArray *aBase, const DataArrayInt32 *tuplesSelec) = 0; + MEDCOUPLING_EXPORT virtual void setContigPartOfSelectedValuesSlice(int tupleIdStart, const DataArray *aBase, int bg, int end2, int step) = 0; + MEDCOUPLING_EXPORT virtual DataArray *selectByTupleRanges(const std::vector >& ranges) const = 0; + MEDCOUPLING_EXPORT virtual DataArray *keepSelectedComponents(const std::vector& compoIds) const = 0; + MEDCOUPLING_EXPORT virtual DataArray *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const = 0; + MEDCOUPLING_EXPORT virtual DataArray *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const = 0; + MEDCOUPLING_EXPORT virtual DataArray *selectByTupleIdSafeSlice(int bg, int end2, int step) const = 0; + MEDCOUPLING_EXPORT virtual void rearrange(int newNbOfCompo) = 0; + MEDCOUPLING_EXPORT virtual void circularPermutation(int nbOfShift=1) = 0; + MEDCOUPLING_EXPORT virtual void circularPermutationPerTuple(int nbOfShift=1) = 0; + MEDCOUPLING_EXPORT virtual void reversePerTuple() = 0; + MEDCOUPLING_EXPORT void checkNbOfTuples(int nbOfTuples, const std::string& msg) const; + MEDCOUPLING_EXPORT void checkNbOfComps(int nbOfCompo, const std::string& msg) const; + MEDCOUPLING_EXPORT void checkNbOfTuplesAndComp(const DataArray& other, const std::string& msg) const; + MEDCOUPLING_EXPORT void checkNbOfTuplesAndComp(int nbOfTuples, int nbOfCompo, const std::string& msg) const; + MEDCOUPLING_EXPORT void checkNbOfElems(std::size_t nbOfElems, const std::string& msg) const; + MEDCOUPLING_EXPORT static void GetSlice(int start, int stop, int step, int sliceId, int nbOfSlices, int& startSlice, int& stopSlice); + MEDCOUPLING_EXPORT static int GetNumberOfItemGivenBES(int begin, int end, int step, const std::string& msg); + MEDCOUPLING_EXPORT static int GetNumberOfItemGivenBESRelative(int begin, int end, int step, const std::string& msg); + MEDCOUPLING_EXPORT static int GetPosOfItemGivenBESRelativeNoThrow(int value, int begin, int end, int step); + MEDCOUPLING_EXPORT static std::string GetVarNameFromInfo(const std::string& info); + MEDCOUPLING_EXPORT static std::string GetUnitFromInfo(const std::string& info); + MEDCOUPLING_EXPORT static std::string BuildInfoFromVarAndUnit(const std::string& var, const std::string& unit); + MEDCOUPLING_EXPORT static std::string GetAxisTypeRepr(MEDCouplingAxisType at); + MEDCOUPLING_EXPORT static DataArray *Aggregate(const std::vector& arrs); + MEDCOUPLING_EXPORT virtual void reprStream(std::ostream& stream) const = 0; + MEDCOUPLING_EXPORT virtual void reprZipStream(std::ostream& stream) const = 0; + MEDCOUPLING_EXPORT virtual void reprWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT virtual void reprZipWithoutNameStream(std::ostream& stream) const = 0; + MEDCOUPLING_EXPORT virtual void reprCppStream(const std::string& varName, std::ostream& stream) const = 0; + MEDCOUPLING_EXPORT virtual void reprQuickOverview(std::ostream& stream) const = 0; + MEDCOUPLING_EXPORT 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); + MEDCOUPLING_EXPORT static void CheckValueInRange(int ref, int value, const std::string& msg); + MEDCOUPLING_EXPORT static void CheckValueInRangeEx(int value, int start, int end, const std::string& msg); + MEDCOUPLING_EXPORT static void CheckClosingParInRange(int ref, int value, const std::string& msg); + MEDCOUPLING_EXPORT static int EffectiveCircPerm(int nbOfShift, int nbOfTuples); protected: std::string _name; std::vector _info_on_compo; @@ -221,85 +221,85 @@ namespace MEDCoupling public: typedef T Type; public: - static MCAuto< typename Traits::ArrayTypeCh > NewFromStdVector(const typename std::vector& v); - std::vector< MCAuto< typename Traits::ArrayTypeCh > > explodeComponents() const; + MEDCOUPLING_EXPORT static MCAuto< typename Traits::ArrayTypeCh > NewFromStdVector(const typename std::vector& v); + MEDCOUPLING_EXPORT std::vector< MCAuto< typename Traits::ArrayTypeCh > > explodeComponents() const; // std::size_t getHeapMemorySizeWithoutChildren() const; - void updateTime() const { } + MEDCOUPLING_EXPORT void updateTime() const { } // - std::size_t 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(); } - 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, 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 DataArrayInt32 *tuplesSelec); - void setContigPartOfSelectedValues(int tupleIdStart, const DataArray *aBase, const DataArrayInt32 *tuplesSelec); - void setContigPartOfSelectedValuesSlice(int tupleIdStart, const DataArray *aBase, int bg, int end2, int step); - T getMaxValue(int& tupleId) const; - T getMaxValueInArray() const; - T getMaxAbsValue(std::size_t& tupleId) const; - T getMaxAbsValueInArray() const; - T getMinValue(int& tupleId) const; - T getMinValueInArray() const; - void getTuple(int tupleId, T *res) const { std::copy(_mem.getConstPointerLoc(tupleId*_info_on_compo.size()),_mem.getConstPointerLoc((tupleId+1)*_info_on_compo.size()),res); } + MEDCOUPLING_EXPORT std::size_t getNumberOfTuples() const { return _info_on_compo.empty()?0:_mem.getNbOfElem()/getNumberOfComponents(); } + MEDCOUPLING_EXPORT std::size_t getNbOfElems() const { return _mem.getNbOfElem(); } + MEDCOUPLING_EXPORT bool empty() const; + MEDCOUPLING_EXPORT void *getVoidStarPointer() { return getPointer(); } + MEDCOUPLING_EXPORT const T *getConstPointer() const { return _mem.getConstPointer(); } + MEDCOUPLING_EXPORT const T *begin() const { return getConstPointer(); } + MEDCOUPLING_EXPORT const T *end() const { return getConstPointer()+getNbOfElems(); } + MEDCOUPLING_EXPORT T *rwBegin() { return getPointer(); } + MEDCOUPLING_EXPORT T *rwEnd() { return getPointer()+getNbOfElems(); } + MEDCOUPLING_EXPORT void alloc(std::size_t nbOfTuple, std::size_t nbOfCompo=1); + MEDCOUPLING_EXPORT void useArray(const T *array, bool ownership, DeallocType type, int nbOfTuple, int nbOfCompo); + MEDCOUPLING_EXPORT void useExternalArrayWithRWAccess(const T *array, int nbOfTuple, int nbOfCompo); + MEDCOUPLING_EXPORT T getIJSafe(int tupleId, int compoId) const; + MEDCOUPLING_EXPORT T getIJ(int tupleId, int compoId) const { return _mem[tupleId*_info_on_compo.size()+compoId]; } + MEDCOUPLING_EXPORT void setIJ(int tupleId, int compoId, T newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; declareAsNew(); } + MEDCOUPLING_EXPORT void setIJSilent(int tupleId, int compoId, T newVal) { _mem[tupleId*_info_on_compo.size()+compoId]=newVal; } + MEDCOUPLING_EXPORT T *getPointer() { return _mem.getPointer(); declareAsNew(); } + MEDCOUPLING_EXPORT void pack() const; + MEDCOUPLING_EXPORT bool isAllocated() const; + MEDCOUPLING_EXPORT void checkAllocated() const; + MEDCOUPLING_EXPORT void desallocate(); + MEDCOUPLING_EXPORT void reserve(std::size_t nbOfElems); + MEDCOUPLING_EXPORT void rearrange(int newNbOfCompo); + MEDCOUPLING_EXPORT void transpose(); + MEDCOUPLING_EXPORT void pushBackSilent(T val); + MEDCOUPLING_EXPORT void pushBackValsSilent(const T *valsBg, const T *valsEnd); + MEDCOUPLING_EXPORT T popBackSilent(); + MEDCOUPLING_EXPORT T front() const; + MEDCOUPLING_EXPORT T back() const; + MEDCOUPLING_EXPORT std::size_t getNbOfElemAllocated() const { return _mem.getNbOfElemAllocated(); } + MEDCOUPLING_EXPORT void allocIfNecessary(int nbOfTuple, int nbOfCompo); + MEDCOUPLING_EXPORT void deepCopyFrom(const DataArrayTemplate& other); + MEDCOUPLING_EXPORT void reverse(); + MEDCOUPLING_EXPORT void fillWithValue(T val); + MEDCOUPLING_EXPORT void reAlloc(std::size_t newNbOfTuple); + MEDCOUPLING_EXPORT void renumberInPlace(const int *old2New); + MEDCOUPLING_EXPORT void renumberInPlaceR(const int *new2Old); + MEDCOUPLING_EXPORT void sort(bool asc=true); + MEDCOUPLING_EXPORT typename Traits::ArrayType *renumber(const int *old2New) const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *renumberR(const int *new2Old) const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *renumberAndReduce(const int *old2New, int newNbOfTuple) const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *changeNbOfComponents(int newNbOfComp, T dftValue) const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *subArray(int tupleIdBg, int tupleIdEnd=-1) const; + MEDCOUPLING_EXPORT MCAuto::ArrayTypeCh> selectPartDef(const PartDefinition* pd) const; + MEDCOUPLING_EXPORT void circularPermutation(int nbOfShift=1); + MEDCOUPLING_EXPORT void circularPermutationPerTuple(int nbOfShift=1); + MEDCOUPLING_EXPORT void reversePerTuple(); + MEDCOUPLING_EXPORT void setPartOfValues1(const typename Traits::ArrayType *a, int bgTuples, int endTuples, int stepTuples, int bgComp, int endComp, int stepComp, bool strictCompoCompare=true); + MEDCOUPLING_EXPORT void setPartOfValuesSimple1(T a, int bgTuples, int endTuples, int stepTuples, int bgComp, int endComp, int stepComp); + MEDCOUPLING_EXPORT void setPartOfValues2(const typename Traits::ArrayType *a, const int *bgTuples, const int *endTuples, const int *bgComp, const int *endComp, bool strictCompoCompare=true); + MEDCOUPLING_EXPORT void setPartOfValuesSimple2(T a, const int *bgTuples, const int *endTuples, const int *bgComp, const int *endComp); + MEDCOUPLING_EXPORT void setPartOfValues3(const typename Traits::ArrayType *a, const int *bgTuples, const int *endTuples, int bgComp, int endComp, int stepComp, bool strictCompoCompare=true); + MEDCOUPLING_EXPORT void setPartOfValuesSimple3(T a, const int *bgTuples, const int *endTuples, int bgComp, int endComp, int stepComp); + MEDCOUPLING_EXPORT void setPartOfValues4(const typename Traits::ArrayType *a, int bgTuples, int endTuples, int stepTuples, const int *bgComp, const int *endComp, bool strictCompoCompare=true); + MEDCOUPLING_EXPORT void setPartOfValuesSimple4(T a, int bgTuples, int endTuples, int stepTuples, const int *bgComp, const int *endComp); + MEDCOUPLING_EXPORT void setPartOfValuesAdv(const typename Traits::ArrayType *a, const DataArrayInt32 *tuplesSelec); + MEDCOUPLING_EXPORT void setContigPartOfSelectedValues(int tupleIdStart, const DataArray *aBase, const DataArrayInt32 *tuplesSelec); + MEDCOUPLING_EXPORT void setContigPartOfSelectedValuesSlice(int tupleIdStart, const DataArray *aBase, int bg, int end2, int step); + MEDCOUPLING_EXPORT T getMaxValue(int& tupleId) const; + MEDCOUPLING_EXPORT T getMaxValueInArray() const; + MEDCOUPLING_EXPORT T getMaxAbsValue(std::size_t& tupleId) const; + MEDCOUPLING_EXPORT T getMaxAbsValueInArray() const; + MEDCOUPLING_EXPORT T getMinValue(int& tupleId) const; + MEDCOUPLING_EXPORT T getMinValueInArray() const; + MEDCOUPLING_EXPORT void getTuple(int 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, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); } - void fillWithZero(); + MEDCOUPLING_EXPORT static void SetArrayIn(typename Traits::ArrayType *newArray, typename Traits::ArrayType* &arrayToSet); + MEDCOUPLING_EXPORT void writeOnPlace(std::size_t id, T element0, const T *others, int sizeOfOthers) { _mem.writeOnPlace(id,element0,others,sizeOfOthers); } + MEDCOUPLING_EXPORT void fillWithZero(); public: - MemArray& accessToMemArray() { return _mem; } - const MemArray& accessToMemArray() const { return _mem; } + MEDCOUPLING_EXPORT MemArray& accessToMemArray() { return _mem; } + MEDCOUPLING_EXPORT const MemArray& accessToMemArray() const { return _mem; } protected: typename Traits::ArrayType *mySelectByTupleId(const int *new2OldBg, const int *new2OldEnd) const; typename Traits::ArrayType *mySelectByTupleId(const DataArrayInt32& di) const; @@ -315,44 +315,44 @@ namespace MEDCoupling class DataArrayTemplateClassic : public DataArrayTemplate { public: - MCAuto convertToDblArr() const; - MCAuto convertToIntArr() const; - MCAuto convertToFloatArr() const; - void applyLin(T a, T b, int 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; - DataArrayInt32 *findIdsStrictlyNegative() const; - typename Traits::ArrayType *fromNoInterlace() const; - typename Traits::ArrayType *toNoInterlace() const; - void meldWith(const typename Traits::ArrayType *other); - typename Traits::ArrayType *duplicateEachTupleNTimes(int 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 reprNotTooLong() const; + MEDCOUPLING_EXPORT MCAuto convertToDblArr() const; + MEDCOUPLING_EXPORT MCAuto convertToIntArr() const; + MEDCOUPLING_EXPORT MCAuto convertToFloatArr() const; + MEDCOUPLING_EXPORT void applyLin(T a, T b, int compoId); + MEDCOUPLING_EXPORT void applyLin(T a, T b); + MEDCOUPLING_EXPORT typename Traits::ArrayType *negate() const; + MEDCOUPLING_EXPORT void addEqual(const typename Traits::ArrayType *other); + MEDCOUPLING_EXPORT void substractEqual(const typename Traits::ArrayType *other); + MEDCOUPLING_EXPORT void multiplyEqual(const typename Traits::ArrayType *other); + MEDCOUPLING_EXPORT void divideEqual(const typename Traits::ArrayType *other); + MEDCOUPLING_EXPORT static typename Traits::ArrayType *Substract(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + MEDCOUPLING_EXPORT static typename Traits::ArrayType *Divide(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + MEDCOUPLING_EXPORT static typename Traits::ArrayType *Add(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + MEDCOUPLING_EXPORT static typename Traits::ArrayType *Multiply(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + MEDCOUPLING_EXPORT static typename Traits::ArrayType *Meld(const typename Traits::ArrayType *a1, const typename Traits::ArrayType *a2); + MEDCOUPLING_EXPORT static typename Traits::ArrayType *Meld(const std::vector::ArrayType *>& arr); + MEDCOUPLING_EXPORT MCAuto findIdsGreaterOrEqualTo(T val) const; + MEDCOUPLING_EXPORT MCAuto findIdsGreaterThan(T val) const; + MEDCOUPLING_EXPORT MCAuto findIdsLowerOrEqualTo(T val) const; + MEDCOUPLING_EXPORT MCAuto findIdsLowerThan(T val) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsStrictlyNegative() const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *fromNoInterlace() const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *toNoInterlace() const; + MEDCOUPLING_EXPORT void meldWith(const typename Traits::ArrayType *other); + MEDCOUPLING_EXPORT typename Traits::ArrayType *duplicateEachTupleNTimes(int nbTimes) const; + MEDCOUPLING_EXPORT void aggregate(const typename Traits::ArrayType *other); + MEDCOUPLING_EXPORT void abs(); + MEDCOUPLING_EXPORT typename Traits::ArrayType *computeAbs() const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *performCopyOrIncrRef(bool dCpy) const; + MEDCOUPLING_EXPORT typename Traits::ArrayType *sumPerTuple() const; + MEDCOUPLING_EXPORT void iota(T init=(T)0); + MEDCOUPLING_EXPORT void reprStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZipStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprNotTooLongStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZipWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprNotTooLongWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT std::string reprNotTooLong() const; template MCAuto< typename Traits::ArrayType > convertToOtherTypeOfArr() const; protected: @@ -368,34 +368,34 @@ namespace MEDCoupling class DataArrayTemplateFP : public DataArrayTemplateClassic { public: - bool isUniform(T val, T eps) const; + MEDCOUPLING_EXPORT bool isUniform(T val, T eps) const; }; } namespace MEDCoupling { class DataArrayFloatIterator; - class MEDCOUPLING_EXPORT DataArrayFloat : public DataArrayTemplateFP + class DataArrayFloat : public DataArrayTemplateFP { public: - static DataArrayFloat *New(); + MEDCOUPLING_EXPORT static DataArrayFloat *New(); public:// abstract method overload - DataArrayFloat *deepCopy() const; - 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 int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleId(new2OldBg,new2OldEnd); } - DataArrayFloat *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } - DataArrayFloat *selectByTupleIdSafeSlice(int bg, int end2, int 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; + MEDCOUPLING_EXPORT DataArrayFloat *deepCopy() const; + MEDCOUPLING_EXPORT DataArrayFloat *buildNewEmptyInstance() const { return DataArrayFloat::New(); } + MEDCOUPLING_EXPORT DataArrayFloat *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplateFP::mySelectByTupleRanges(ranges); } + MEDCOUPLING_EXPORT DataArrayFloat *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplateFP::myKeepSelectedComponents(compoIds); } + MEDCOUPLING_EXPORT DataArrayFloat *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleId(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayFloat *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayFloat *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplateFP::mySelectByTupleIdSafeSlice(bg,end2,step); } + MEDCOUPLING_EXPORT void reprCppStream(const std::string& varName, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; + MEDCOUPLING_EXPORT 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; + MEDCOUPLING_EXPORT bool isEqual(const DataArrayFloat& other, float prec) const; + MEDCOUPLING_EXPORT bool isEqualIfNotWhy(const DataArrayFloat& other, float prec, std::string& reason) const; + MEDCOUPLING_EXPORT bool isEqualWithoutConsideringStr(const DataArrayFloat& other, float prec) const; public: - DataArrayFloatIterator *iterator(); + MEDCOUPLING_EXPORT DataArrayFloatIterator *iterator(); private: ~DataArrayFloat() { } DataArrayFloat() { } @@ -405,109 +405,109 @@ namespace MEDCoupling namespace MEDCoupling { class DataArrayDoubleIterator; - class MEDCOUPLING_EXPORT DataArrayDouble : public DataArrayTemplateFP + class DataArrayDouble : public DataArrayTemplateFP { public: - static DataArrayDouble *New(); - double doubleValue() const; - DataArrayDouble *deepCopy() const; - DataArrayDouble *buildNewEmptyInstance() const { return DataArrayDouble::New(); } - void checkMonotonic(bool increasing, double eps) const; - bool isMonotonic(bool increasing, double eps) const; - std::string repr() const; - std::string reprZip() const; - void writeVTK(std::ostream& ofs, int 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 int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleId(new2OldBg,new2OldEnd); } - DataArrayDouble *selectByTupleId(const DataArrayInt32& di) const { return DataArrayTemplateFP::mySelectByTupleId(di); } - DataArrayDouble *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } - DataArrayDouble *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplateFP::myKeepSelectedComponents(compoIds); } - DataArrayDouble *selectByTupleIdSafeSlice(int bg, int end2, int 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, DataArrayInt32 *&tupleIds) const; - void findCommonTuples(double prec, int limitTupleId, DataArrayInt32 *&comm, DataArrayInt32 *&commIndex) const; - double minimalDistanceTo(const DataArrayDouble *other, int& thisTupleId, int& otherTupleId) const; - DataArrayDouble *getDifferentValues(double prec, int limitTupleId=-1) const; - DataArrayInt32 *findClosestTupleId(const DataArrayDouble *other) const; - DataArrayInt32 *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, DataArrayInt32 *& c, DataArrayInt32 *& cI) const; - void recenterForMaxPrecision(double eps); - double getMaxValue2(DataArrayInt32*& tupleIds) const; - double getMinValue2(DataArrayInt32*& 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 *maxPerTuple() const; - DataArrayDouble *maxPerTupleWithCompoId(DataArrayInt32* &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(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; - DataArrayInt32 *findIdsInRange(double vmin, double vmax) const; - DataArrayInt32 *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, 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); + MEDCOUPLING_EXPORT static DataArrayDouble *New(); + MEDCOUPLING_EXPORT double doubleValue() const; + MEDCOUPLING_EXPORT DataArrayDouble *deepCopy() const; + MEDCOUPLING_EXPORT DataArrayDouble *buildNewEmptyInstance() const { return DataArrayDouble::New(); } + MEDCOUPLING_EXPORT void checkMonotonic(bool increasing, double eps) const; + MEDCOUPLING_EXPORT bool isMonotonic(bool increasing, double eps) const; + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT std::string reprZip() const; + MEDCOUPLING_EXPORT void writeVTK(std::ostream& ofs, int indent, const std::string& nameInFile, DataArrayByte *byteArr) const; + MEDCOUPLING_EXPORT void reprCppStream(const std::string& varName, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + MEDCOUPLING_EXPORT bool isEqual(const DataArrayDouble& other, double prec) const; + MEDCOUPLING_EXPORT bool isEqualIfNotWhy(const DataArrayDouble& other, double prec, std::string& reason) const; + MEDCOUPLING_EXPORT bool isEqualWithoutConsideringStr(const DataArrayDouble& other, double prec) const; + MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleId(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleId(const DataArrayInt32& di) const { return DataArrayTemplateFP::mySelectByTupleId(di); } + MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplateFP::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayDouble *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplateFP::myKeepSelectedComponents(compoIds); } + MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplateFP::mySelectByTupleIdSafeSlice(bg,end2,step); } + MEDCOUPLING_EXPORT DataArrayDouble *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplateFP::mySelectByTupleRanges(ranges); } + MEDCOUPLING_EXPORT bool areIncludedInMe(const DataArrayDouble *other, double prec, DataArrayInt32 *&tupleIds) const; + MEDCOUPLING_EXPORT void findCommonTuples(double prec, int limitTupleId, DataArrayInt32 *&comm, DataArrayInt32 *&commIndex) const; + MEDCOUPLING_EXPORT double minimalDistanceTo(const DataArrayDouble *other, int& thisTupleId, int& otherTupleId) const; + MEDCOUPLING_EXPORT DataArrayDouble *getDifferentValues(double prec, int limitTupleId=-1) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findClosestTupleId(const DataArrayDouble *other) const; + MEDCOUPLING_EXPORT DataArrayInt32 *computeNbOfInteractionsWith(const DataArrayDouble *otherBBoxFrmt, double eps) const; + MEDCOUPLING_EXPORT void setSelectedComponents(const DataArrayDouble *a, const std::vector& compoIds); + MEDCOUPLING_EXPORT DataArrayDoubleIterator *iterator(); + MEDCOUPLING_EXPORT void checkNoNullValues() const; + MEDCOUPLING_EXPORT void getMinMaxPerComponent(double *bounds) const; + MEDCOUPLING_EXPORT DataArrayDouble *computeBBoxPerTuple(double epsilon=0.0) const; + MEDCOUPLING_EXPORT void computeTupleIdsNearTuples(const DataArrayDouble *other, double eps, DataArrayInt32 *& c, DataArrayInt32 *& cI) const; + MEDCOUPLING_EXPORT void recenterForMaxPrecision(double eps); + MEDCOUPLING_EXPORT double getMaxValue2(DataArrayInt32*& tupleIds) const; + MEDCOUPLING_EXPORT double getMinValue2(DataArrayInt32*& tupleIds) const; + MEDCOUPLING_EXPORT int count(double value, double eps) const; + MEDCOUPLING_EXPORT double getAverageValue() const; + MEDCOUPLING_EXPORT double norm2() const; + MEDCOUPLING_EXPORT double normMax() const; + MEDCOUPLING_EXPORT double normMin() const; + MEDCOUPLING_EXPORT void accumulate(double *res) const; + MEDCOUPLING_EXPORT double accumulate(int compId) const; + MEDCOUPLING_EXPORT DataArrayDouble *accumulatePerChunck(const int *bgOfIndex, const int *endOfIndex) const; + MEDCOUPLING_EXPORT MCAuto cumSum() const; + MEDCOUPLING_EXPORT double distanceToTuple(const double *tupleBg, const double *tupleEnd, int& tupleId) const; + MEDCOUPLING_EXPORT DataArrayDouble *fromPolarToCart() const; + MEDCOUPLING_EXPORT DataArrayDouble *fromCylToCart() const; + MEDCOUPLING_EXPORT DataArrayDouble *fromSpherToCart() const; + MEDCOUPLING_EXPORT DataArrayDouble *cartesianize(MEDCouplingAxisType atOfThis) const; + MEDCOUPLING_EXPORT DataArrayDouble *fromCartToPolar() const; + MEDCOUPLING_EXPORT DataArrayDouble *fromCartToCyl() const; + MEDCOUPLING_EXPORT DataArrayDouble *fromCartToSpher() const; + MEDCOUPLING_EXPORT DataArrayDouble *fromCartToCylGiven(const DataArrayDouble *coords, const double center[3], const double vect[3]) const; + MEDCOUPLING_EXPORT DataArrayDouble *doublyContractedProduct() const; + MEDCOUPLING_EXPORT DataArrayDouble *determinant() const; + MEDCOUPLING_EXPORT DataArrayDouble *eigenValues() const; + MEDCOUPLING_EXPORT DataArrayDouble *eigenVectors() const; + MEDCOUPLING_EXPORT DataArrayDouble *inverse() const; + MEDCOUPLING_EXPORT DataArrayDouble *trace() const; + MEDCOUPLING_EXPORT DataArrayDouble *deviator() const; + MEDCOUPLING_EXPORT DataArrayDouble *magnitude() const; + MEDCOUPLING_EXPORT DataArrayDouble *maxPerTuple() const; + MEDCOUPLING_EXPORT DataArrayDouble *maxPerTupleWithCompoId(DataArrayInt32* &compoIdOfMaxPerTuple) const; + MEDCOUPLING_EXPORT DataArrayDouble *buildEuclidianDistanceDenseMatrix() const; + MEDCOUPLING_EXPORT DataArrayDouble *buildEuclidianDistanceDenseMatrixWith(const DataArrayDouble *other) const; + MEDCOUPLING_EXPORT void asArcOfCircle(double center[2], double& radius, double& ang) const; + MEDCOUPLING_EXPORT void sortPerTuple(bool asc); + MEDCOUPLING_EXPORT void applyInv(double numerator); + MEDCOUPLING_EXPORT void applyPow(double val); + MEDCOUPLING_EXPORT void applyRPow(double val); + MEDCOUPLING_EXPORT DataArrayDouble *applyFunc(int nbOfComp, FunctionToEvaluate func) const; + MEDCOUPLING_EXPORT DataArrayDouble *applyFunc(int nbOfComp, const std::string& func, bool isSafe=true) const; + MEDCOUPLING_EXPORT DataArrayDouble *applyFunc(const std::string& func, bool isSafe=true) const; + MEDCOUPLING_EXPORT void applyFuncOnThis(const std::string& func, bool isSafe=true); + MEDCOUPLING_EXPORT DataArrayDouble *applyFuncCompo(int nbOfComp, const std::string& func, bool isSafe=true) const; + MEDCOUPLING_EXPORT DataArrayDouble *applyFuncNamedCompo(int nbOfComp, const std::vector& varsOrder, const std::string& func, bool isSafe=true) const; + MEDCOUPLING_EXPORT void applyFuncFast32(const std::string& func); + MEDCOUPLING_EXPORT void applyFuncFast64(const std::string& func); + MEDCOUPLING_EXPORT MCAuto symmetry3DPlane(const double point[3], const double normalVector[3]) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsInRange(double vmin, double vmax) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsNotInRange(double vmin, double vmax) const; + MEDCOUPLING_EXPORT static DataArrayDouble *Aggregate(const DataArrayDouble *a1, const DataArrayDouble *a2); + MEDCOUPLING_EXPORT static DataArrayDouble *Aggregate(const std::vector& arr); + MEDCOUPLING_EXPORT static DataArrayDouble *Dot(const DataArrayDouble *a1, const DataArrayDouble *a2); + MEDCOUPLING_EXPORT static DataArrayDouble *CrossProduct(const DataArrayDouble *a1, const DataArrayDouble *a2); + MEDCOUPLING_EXPORT static DataArrayDouble *Max(const DataArrayDouble *a1, const DataArrayDouble *a2); + MEDCOUPLING_EXPORT static DataArrayDouble *Min(const DataArrayDouble *a1, const DataArrayDouble *a2); + MEDCOUPLING_EXPORT static DataArrayDouble *Pow(const DataArrayDouble *a1, const DataArrayDouble *a2); + MEDCOUPLING_EXPORT void powEqual(const DataArrayDouble *other); + MEDCOUPLING_EXPORT std::vector toVectorOfBool(double eps) const; + MEDCOUPLING_EXPORT static void Rotate2DAlg(const double *center, double angle, int nbNodes, const double *coordsIn, double *coordsOut); + MEDCOUPLING_EXPORT static void Rotate3DAlg(const double *center, const double *vect, double angle, int nbNodes, const double *coordsIn, double *coordsOut); + MEDCOUPLING_EXPORT static void Symmetry3DPlane(const double point[3], const double normalVector[3], int nbNodes, const double *coordsIn, double *coordsOut); + MEDCOUPLING_EXPORT static void GiveBaseForPlane(const double normalVector[3], double baseOfPlane[9]); + public: + MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector& tinyInfoI); + MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); public: template void findCommonTuplesAlg(const double *bbox, int nbNodes, int limitNodeId, double prec, DataArrayInt32 *c, DataArrayInt32 *cI) const; @@ -525,18 +525,18 @@ namespace MEDCoupling class DataArrayDiscrete : public DataArrayTemplateClassic { public: - 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 *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; + MEDCOUPLING_EXPORT bool isEqual(const DataArrayDiscrete& other) const; + MEDCOUPLING_EXPORT bool isEqualIfNotWhy(const DataArrayDiscrete& other, std::string& reason) const; + MEDCOUPLING_EXPORT bool isEqualWithoutConsideringStr(const DataArrayDiscrete& other) const; + MEDCOUPLING_EXPORT bool isEqualWithoutConsideringStrAndOrder(const typename Traits::ArrayType& other) const; + MEDCOUPLING_EXPORT void switchOnTupleEqualTo(T val, std::vector& vec) const; + MEDCOUPLING_EXPORT void switchOnTupleNotEqualTo(T val, std::vector& vec) const; + MEDCOUPLING_EXPORT DataArrayIdType *buildPermutationArr(const DataArrayDiscrete& other) const; + MEDCOUPLING_EXPORT DataArrayIdType *indicesOfSubPart(const DataArrayDiscrete& partOfThis) const; + MEDCOUPLING_EXPORT void checkMonotonic(bool increasing) const; + MEDCOUPLING_EXPORT bool isMonotonic(bool increasing) const; + MEDCOUPLING_EXPORT void checkStrictlyMonotonic(bool increasing) const; + MEDCOUPLING_EXPORT bool isStrictlyMonotonic(bool increasing) const; protected: template void switchOnTupleAlg(T val, std::vector& vec, ALG algo) const; @@ -548,125 +548,125 @@ namespace MEDCoupling class DataArrayDiscreteSigned : public DataArrayDiscrete { public: - bool isFittingWith(const std::vector& v) const; + MEDCOUPLING_EXPORT bool isFittingWith(const std::vector& v) const; protected: ~DataArrayDiscreteSigned() { } }; class DataArrayInt32Iterator; - class MEDCOUPLING_EXPORT DataArrayInt32 : public DataArrayDiscreteSigned + class DataArrayInt32 : public DataArrayDiscreteSigned { public: - static DataArrayInt32 *New(); - int intValue() const; - int getHashCode() const; - DataArrayInt32 *deepCopy() const;//ok - DataArrayInt32 *buildNewEmptyInstance() const { return DataArrayInt32::New(); }//ok - std::string repr() const; - std::string reprZip() const; - void writeVTK(std::ostream& ofs, int indent, const std::string& type, 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; - void transformWithIndArr(const int *indArrBg, const int *indArrEnd); - void transformWithIndArr(const MapKeyVal& m); - DataArrayInt32 *transformWithIndArrR(const int *indArrBg, const int *indArrEnd) const; - void splitByValueRange(const int *arrBg, const int *arrEnd, + MEDCOUPLING_EXPORT static DataArrayInt32 *New(); + MEDCOUPLING_EXPORT int intValue() const; + MEDCOUPLING_EXPORT int getHashCode() const; + MEDCOUPLING_EXPORT DataArrayInt32 *deepCopy() const;//ok + MEDCOUPLING_EXPORT DataArrayInt32 *buildNewEmptyInstance() const { return DataArrayInt32::New(); }//ok + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT std::string reprZip() const; + MEDCOUPLING_EXPORT void writeVTK(std::ostream& ofs, int indent, const std::string& type, const std::string& nameInFile, DataArrayByte *byteArr) const; + MEDCOUPLING_EXPORT void reprCppStream(const std::string& varName, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + MEDCOUPLING_EXPORT void transformWithIndArr(const int *indArrBg, const int *indArrEnd); + MEDCOUPLING_EXPORT void transformWithIndArr(const MapKeyVal& m); + MEDCOUPLING_EXPORT DataArrayInt32 *transformWithIndArrR(const int *indArrBg, const int *indArrEnd) const; + MEDCOUPLING_EXPORT void splitByValueRange(const int *arrBg, const int *arrEnd, DataArrayInt32 *& castArr, DataArrayInt32 *& rankInsideCast, DataArrayInt32 *& castsPresent) const; - bool isRange(int& strt, int& sttoopp, int& stteepp) const; - DataArrayInt32 *invertArrayO2N2N2O(int newNbOfElem) const; - DataArrayInt32 *invertArrayN2O2O2N(int oldNbOfElem) const; - MCAuto< MapKeyVal > invertArrayN2O2O2NOptimized() const; - DataArrayInt32 *invertArrayO2N2N2OBis(int newNbOfElem) const; - DataArrayInt32 *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleId(new2OldBg,new2OldEnd); } - DataArrayInt32 *selectByTupleId(const DataArrayInt32& di) const { return DataArrayTemplate::mySelectByTupleId(di); } - DataArrayInt32 *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } - DataArrayInt32 *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } - DataArrayInt32 *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } - DataArrayInt32 *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } - DataArrayInt32 *checkAndPreparePermutation() const; - static DataArrayInt32 *FindPermutationFromFirstToSecond(const DataArrayInt32 *ids1, const DataArrayInt32 *ids2); - void changeSurjectiveFormat(int targetNb, DataArrayInt32 *&arr, DataArrayInt32 *&arrI) const; - static DataArrayInt32 *ConvertIndexArrayToO2N(int nbOfOldTuples, const int *arr, const int *arrIBg, const int *arrIEnd, int &newNbOfTuples); - DataArrayInt32 *buildPermArrPerLevel() const; - bool isIota(int sizeExpected) const; - bool isUniform(int val) const; - int checkUniformAndGuess() const; - bool hasUniqueValues() const; - void setSelectedComponents(const DataArrayInt32 *a, const std::vector& compoIds); - DataArrayInt32Iterator *iterator(); - DataArrayInt32 *findIdsEqual(int val) const; - DataArrayInt32 *findIdsNotEqual(int val) const; - DataArrayInt32 *findIdsEqualList(const int *valsBg, const int *valsEnd) const; - DataArrayInt32 *findIdsNotEqualList(const int *valsBg, const int *valsEnd) const; - DataArrayInt32 *findIdsEqualTuple(const int *tupleBg, const int *tupleEnd) const; - MCAuto findIdForEach(const int *valsBg, const int *valsEnd) 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; - DataArrayInt32 *accumulatePerChunck(const int *bgOfIndex, const int *endOfIndex) const; - void getMinMaxValues(int& minValue, int& maxValue) const; - void applyInv(int numerator); - void applyDivideBy(int val); - void applyModulus(int val); - void applyRModulus(int val); - void applyPow(int val); - void applyRPow(int val); - DataArrayInt32 *findIdsInRange(int vmin, int vmax) const; - DataArrayInt32 *findIdsNotInRange(int vmin, int vmax) const; - bool checkAllIdsInRange(int vmin, int vmax) const; - static DataArrayInt32 *Aggregate(const DataArrayInt32 *a1, const DataArrayInt32 *a2, int offsetA2); - static DataArrayInt32 *Aggregate(const std::vector& arr); - static DataArrayInt32 *AggregateIndexes(const std::vector& arrs); - static DataArrayInt32 *MakePartition(const std::vector& groups, int newNb, std::vector< std::vector >& fidsOfGroups); - static DataArrayInt32 *BuildUnion(const std::vector& arr); - static DataArrayInt32 *BuildIntersection(const std::vector& arr); - static DataArrayInt32 *BuildListOfSwitchedOn(const std::vector& v); - static DataArrayInt32 *BuildListOfSwitchedOff(const std::vector& v); - static void PutIntoToSkylineFrmt(const std::vector< std::vector >& v, DataArrayInt32 *& data, DataArrayInt32 *& dataIndex); - DataArrayInt32 *buildComplement(int nbOfElement) const; - DataArrayInt32 *buildSubstraction(const DataArrayInt32 *other) const; - DataArrayInt32 *buildSubstractionOptimized(const DataArrayInt32 *other) const; - DataArrayInt32 *buildUnion(const DataArrayInt32 *other) const; - DataArrayInt32 *buildIntersection(const DataArrayInt32 *other) const; - DataArrayInt32 *buildUnique() const; - DataArrayInt32 *buildUniqueNotSorted() const; - DataArrayInt32 *deltaShiftIndex() const; - void computeOffsets(); - void computeOffsetsFull(); - void findIdsRangesInListOfIds(const DataArrayInt32 *listOfIds, DataArrayInt32 *& rangeIdsFetched, DataArrayInt32 *& idsInInputListThatFetch) const; - DataArrayInt32 *buildExplicitArrByRanges(const DataArrayInt32 *offsets) const; - DataArrayInt32 *buildExplicitArrOfSliceOnScaledArr(int begin, int stop, int step) const; - DataArrayInt32 *findRangeIdForEachTuple(const DataArrayInt32 *ranges) const; - DataArrayInt32 *findIdInRangeForEachTuple(const DataArrayInt32 *ranges) const; - void sortEachPairToMakeALinkedList(); - MCAuto fromLinkedListOfPairToList() const; - DataArrayInt32 *getDifferentValues() const; - std::vector partitionByDifferentValues(std::vector& differentIds) const; - std::vector< std::pair > splitInBalancedSlices(int nbOfSlices) const; - static DataArrayInt32 *Modulus(const DataArrayInt32 *a1, const DataArrayInt32 *a2); - void modulusEqual(const DataArrayInt32 *other); - static DataArrayInt32 *Pow(const DataArrayInt32 *a1, const DataArrayInt32 *a2); - void powEqual(const DataArrayInt32 *other); - MemArray& accessToMemArray() { return _mem; } - const MemArray& accessToMemArray() const { return _mem; } - public: - static int *CheckAndPreparePermutation(const int *start, const int *end); - static DataArrayInt32 *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); + MEDCOUPLING_EXPORT bool isRange(int& strt, int& sttoopp, int& stteepp) const; + MEDCOUPLING_EXPORT DataArrayInt32 *invertArrayO2N2N2O(int newNbOfElem) const; + MEDCOUPLING_EXPORT DataArrayInt32 *invertArrayN2O2O2N(int oldNbOfElem) const; + MEDCOUPLING_EXPORT MCAuto< MapKeyVal > invertArrayN2O2O2NOptimized() const; + MEDCOUPLING_EXPORT DataArrayInt32 *invertArrayO2N2N2OBis(int newNbOfElem) const; + MEDCOUPLING_EXPORT DataArrayInt32 *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleId(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayInt32 *selectByTupleId(const DataArrayInt32& di) const { return DataArrayTemplate::mySelectByTupleId(di); } + MEDCOUPLING_EXPORT DataArrayInt32 *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayInt32 *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } + MEDCOUPLING_EXPORT DataArrayInt32 *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } + MEDCOUPLING_EXPORT DataArrayInt32 *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } + MEDCOUPLING_EXPORT DataArrayInt32 *checkAndPreparePermutation() const; + MEDCOUPLING_EXPORT static DataArrayInt32 *FindPermutationFromFirstToSecond(const DataArrayInt32 *ids1, const DataArrayInt32 *ids2); + MEDCOUPLING_EXPORT void changeSurjectiveFormat(int targetNb, DataArrayInt32 *&arr, DataArrayInt32 *&arrI) const; + MEDCOUPLING_EXPORT static DataArrayInt32 *ConvertIndexArrayToO2N(int nbOfOldTuples, const int *arr, const int *arrIBg, const int *arrIEnd, int &newNbOfTuples); + MEDCOUPLING_EXPORT DataArrayInt32 *buildPermArrPerLevel() const; + MEDCOUPLING_EXPORT bool isIota(int sizeExpected) const; + MEDCOUPLING_EXPORT bool isUniform(int val) const; + MEDCOUPLING_EXPORT int checkUniformAndGuess() const; + MEDCOUPLING_EXPORT bool hasUniqueValues() const; + MEDCOUPLING_EXPORT void setSelectedComponents(const DataArrayInt32 *a, const std::vector& compoIds); + MEDCOUPLING_EXPORT DataArrayInt32Iterator *iterator(); + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsEqual(int val) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsNotEqual(int val) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsEqualList(const int *valsBg, const int *valsEnd) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsNotEqualList(const int *valsBg, const int *valsEnd) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsEqualTuple(const int *tupleBg, const int *tupleEnd) const; + MEDCOUPLING_EXPORT MCAuto findIdForEach(const int *valsBg, const int *valsEnd) const; + MEDCOUPLING_EXPORT int changeValue(int oldValue, int newValue); + MEDCOUPLING_EXPORT int findIdFirstEqualTuple(const std::vector& tupl) const; + MEDCOUPLING_EXPORT int findIdFirstEqual(int value) const; + MEDCOUPLING_EXPORT int findIdFirstEqual(const std::vector& vals) const; + MEDCOUPLING_EXPORT int findIdSequence(const std::vector& vals) const; + MEDCOUPLING_EXPORT bool presenceOfTuple(const std::vector& tupl) const; + MEDCOUPLING_EXPORT bool presenceOfValue(int value) const; + MEDCOUPLING_EXPORT bool presenceOfValue(const std::vector& vals) const; + MEDCOUPLING_EXPORT int count(int value) const; + MEDCOUPLING_EXPORT void accumulate(int *res) const; + MEDCOUPLING_EXPORT int accumulate(int compId) const; + MEDCOUPLING_EXPORT DataArrayInt32 *accumulatePerChunck(const int *bgOfIndex, const int *endOfIndex) const; + MEDCOUPLING_EXPORT void getMinMaxValues(int& minValue, int& maxValue) const; + MEDCOUPLING_EXPORT void applyInv(int numerator); + MEDCOUPLING_EXPORT void applyDivideBy(int val); + MEDCOUPLING_EXPORT void applyModulus(int val); + MEDCOUPLING_EXPORT void applyRModulus(int val); + MEDCOUPLING_EXPORT void applyPow(int val); + MEDCOUPLING_EXPORT void applyRPow(int val); + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsInRange(int vmin, int vmax) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdsNotInRange(int vmin, int vmax) const; + MEDCOUPLING_EXPORT bool checkAllIdsInRange(int vmin, int vmax) const; + MEDCOUPLING_EXPORT static DataArrayInt32 *Aggregate(const DataArrayInt32 *a1, const DataArrayInt32 *a2, int offsetA2); + MEDCOUPLING_EXPORT static DataArrayInt32 *Aggregate(const std::vector& arr); + MEDCOUPLING_EXPORT static DataArrayInt32 *AggregateIndexes(const std::vector& arrs); + MEDCOUPLING_EXPORT static DataArrayInt32 *MakePartition(const std::vector& groups, int newNb, std::vector< std::vector >& fidsOfGroups); + MEDCOUPLING_EXPORT static DataArrayInt32 *BuildUnion(const std::vector& arr); + MEDCOUPLING_EXPORT static DataArrayInt32 *BuildIntersection(const std::vector& arr); + MEDCOUPLING_EXPORT static DataArrayInt32 *BuildListOfSwitchedOn(const std::vector& v); + MEDCOUPLING_EXPORT static DataArrayInt32 *BuildListOfSwitchedOff(const std::vector& v); + MEDCOUPLING_EXPORT static void PutIntoToSkylineFrmt(const std::vector< std::vector >& v, DataArrayInt32 *& data, DataArrayInt32 *& dataIndex); + MEDCOUPLING_EXPORT DataArrayInt32 *buildComplement(int nbOfElement) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildSubstraction(const DataArrayInt32 *other) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildSubstractionOptimized(const DataArrayInt32 *other) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildUnion(const DataArrayInt32 *other) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildIntersection(const DataArrayInt32 *other) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildUnique() const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildUniqueNotSorted() const; + MEDCOUPLING_EXPORT DataArrayInt32 *deltaShiftIndex() const; + MEDCOUPLING_EXPORT void computeOffsets(); + MEDCOUPLING_EXPORT void computeOffsetsFull(); + MEDCOUPLING_EXPORT void findIdsRangesInListOfIds(const DataArrayInt32 *listOfIds, DataArrayInt32 *& rangeIdsFetched, DataArrayInt32 *& idsInInputListThatFetch) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildExplicitArrByRanges(const DataArrayInt32 *offsets) const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildExplicitArrOfSliceOnScaledArr(int begin, int stop, int step) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findRangeIdForEachTuple(const DataArrayInt32 *ranges) const; + MEDCOUPLING_EXPORT DataArrayInt32 *findIdInRangeForEachTuple(const DataArrayInt32 *ranges) const; + MEDCOUPLING_EXPORT void sortEachPairToMakeALinkedList(); + MEDCOUPLING_EXPORT MCAuto fromLinkedListOfPairToList() const; + MEDCOUPLING_EXPORT DataArrayInt32 *getDifferentValues() const; + MEDCOUPLING_EXPORT std::vector partitionByDifferentValues(std::vector& differentIds) const; + MEDCOUPLING_EXPORT std::vector< std::pair > splitInBalancedSlices(int nbOfSlices) const; + MEDCOUPLING_EXPORT static DataArrayInt32 *Modulus(const DataArrayInt32 *a1, const DataArrayInt32 *a2); + MEDCOUPLING_EXPORT void modulusEqual(const DataArrayInt32 *other); + MEDCOUPLING_EXPORT static DataArrayInt32 *Pow(const DataArrayInt32 *a1, const DataArrayInt32 *a2); + MEDCOUPLING_EXPORT void powEqual(const DataArrayInt32 *other); + MEDCOUPLING_EXPORT MemArray& accessToMemArray() { return _mem; } + MEDCOUPLING_EXPORT const MemArray& accessToMemArray() const { return _mem; } + public: + MEDCOUPLING_EXPORT static int *CheckAndPreparePermutation(const int *start, const int *end); + MEDCOUPLING_EXPORT static DataArrayInt32 *Range(int begin, int end, int step); + public: + MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector& tinyInfoI); + MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); private: ~DataArrayInt32() { } DataArrayInt32() { } @@ -692,71 +692,71 @@ namespace MEDCoupling return ret; } - class MEDCOUPLING_EXPORT DataArrayChar : public DataArrayTemplate + class 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; - 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); } - 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); - 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); + MEDCOUPLING_EXPORT virtual DataArrayChar *buildEmptySpecializedDAChar() const = 0; + MEDCOUPLING_EXPORT int getHashCode() const; + MEDCOUPLING_EXPORT bool isEqual(const DataArrayChar& other) const; + MEDCOUPLING_EXPORT virtual bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; + MEDCOUPLING_EXPORT bool isEqualWithoutConsideringStr(const DataArrayChar& other) const; + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT std::string reprZip() const; + MEDCOUPLING_EXPORT DataArrayInt *convertToIntArr() const; + MEDCOUPLING_EXPORT DataArrayChar *selectByTupleId(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleId(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayChar *selectByTupleId(const DataArrayInt& di) const { return DataArrayTemplate::mySelectByTupleId(di); } + MEDCOUPLING_EXPORT DataArrayChar *selectByTupleIdSafe(const int *new2OldBg, const int *new2OldEnd) const { return DataArrayTemplate::mySelectByTupleIdSafe(new2OldBg,new2OldEnd); } + MEDCOUPLING_EXPORT DataArrayChar *keepSelectedComponents(const std::vector& compoIds) const { return DataArrayTemplate::myKeepSelectedComponents(compoIds); } + MEDCOUPLING_EXPORT DataArrayChar *selectByTupleIdSafeSlice(int bg, int end2, int step) const { return DataArrayTemplate::mySelectByTupleIdSafeSlice(bg,end2,step); } + MEDCOUPLING_EXPORT bool isUniform(char val) const; + MEDCOUPLING_EXPORT void meldWith(const DataArrayChar *other); + MEDCOUPLING_EXPORT DataArray *selectByTupleRanges(const std::vector >& ranges) const { return DataArrayTemplate::mySelectByTupleRanges(ranges); } + MEDCOUPLING_EXPORT DataArrayInt *findIdsEqual(char val) const; + MEDCOUPLING_EXPORT DataArrayInt *findIdsNotEqual(char val) const; + MEDCOUPLING_EXPORT int findIdSequence(const std::vector& vals) const; + MEDCOUPLING_EXPORT int findIdFirstEqualTuple(const std::vector& tupl) const; + MEDCOUPLING_EXPORT int findIdFirstEqual(char value) const; + MEDCOUPLING_EXPORT int findIdFirstEqual(const std::vector& vals) const; + MEDCOUPLING_EXPORT bool presenceOfTuple(const std::vector& tupl) const; + MEDCOUPLING_EXPORT bool presenceOfValue(char value) const; + MEDCOUPLING_EXPORT bool presenceOfValue(const std::vector& vals) const; + MEDCOUPLING_EXPORT DataArrayInt *findIdsInRange(char vmin, char vmax) const; + MEDCOUPLING_EXPORT static DataArrayChar *Aggregate(const DataArrayChar *a1, const DataArrayChar *a2); + MEDCOUPLING_EXPORT static DataArrayChar *Aggregate(const std::vector& arr); + MEDCOUPLING_EXPORT static DataArrayChar *Meld(const DataArrayChar *a1, const DataArrayChar *a2); + MEDCOUPLING_EXPORT static DataArrayChar *Meld(const std::vector& arr); + MEDCOUPLING_EXPORT MemArray& accessToMemArray() { return _mem; } + MEDCOUPLING_EXPORT const MemArray& accessToMemArray() const { return _mem; } + public: + //MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector& tinyInfo) const; + //MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector& tinyInfo) const; + //MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector& tinyInfoI); + //MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); protected: DataArrayChar() { } }; class DataArrayByteIterator; - class MEDCOUPLING_EXPORT DataArrayByte : public DataArrayChar + class 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; + MEDCOUPLING_EXPORT static DataArrayByte *New(); + MEDCOUPLING_EXPORT DataArrayChar *buildEmptySpecializedDAChar() const; + MEDCOUPLING_EXPORT DataArrayByteIterator *iterator(); + MEDCOUPLING_EXPORT DataArrayByte *deepCopy() const; + MEDCOUPLING_EXPORT DataArrayByte *performCopyOrIncrRef(bool deepCopy) const; + MEDCOUPLING_EXPORT DataArrayByte *buildNewEmptyInstance() const { return DataArrayByte::New(); } + MEDCOUPLING_EXPORT char byteValue() const; + MEDCOUPLING_EXPORT void reprStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZipStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZipWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprCppStream(const std::string& varName, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + MEDCOUPLING_EXPORT bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; + MEDCOUPLING_EXPORT std::vector toVectorOfBool() const; private: ~DataArrayByte() { } DataArrayByte() { } @@ -764,26 +764,26 @@ namespace MEDCoupling class DataArrayAsciiCharIterator; - class MEDCOUPLING_EXPORT DataArrayAsciiChar : public DataArrayChar + class DataArrayAsciiChar : public DataArrayChar { 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; + MEDCOUPLING_EXPORT static DataArrayAsciiChar *New(); + MEDCOUPLING_EXPORT static DataArrayAsciiChar *New(const std::string& st); + MEDCOUPLING_EXPORT static DataArrayAsciiChar *New(const std::vector& vst, char defaultChar); + MEDCOUPLING_EXPORT DataArrayChar *buildEmptySpecializedDAChar() const; + MEDCOUPLING_EXPORT DataArrayAsciiCharIterator *iterator(); + MEDCOUPLING_EXPORT DataArrayAsciiChar *deepCopy() const; + MEDCOUPLING_EXPORT DataArrayAsciiChar *performCopyOrIncrRef(bool deepCopy) const; + MEDCOUPLING_EXPORT DataArrayAsciiChar *buildNewEmptyInstance() const { return DataArrayAsciiChar::New(); } + MEDCOUPLING_EXPORT char asciiCharValue() const; + MEDCOUPLING_EXPORT void reprStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZipStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprZipWithoutNameStream(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprCppStream(const std::string& varName, std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; + MEDCOUPLING_EXPORT void reprQuickOverviewData(std::ostream& stream, std::size_t maxNbOfByteInRepr) const; + MEDCOUPLING_EXPORT bool isEqualIfNotWhy(const DataArrayChar& other, std::string& reason) const; private: ~DataArrayAsciiChar() { } DataArrayAsciiChar() { } @@ -797,7 +797,7 @@ namespace MEDCoupling public: DataArrayIterator(typename Traits::ArrayType *da); ~DataArrayIterator(); - typename Traits::ArrayTuple *nextt(); + MEDCOUPLING_EXPORT typename Traits::ArrayTuple *nextt(); private: typename Traits::ArrayType *_da; T *_pt; @@ -810,12 +810,12 @@ namespace MEDCoupling class DataArrayTuple { public: - DataArrayTuple(T *pt, int nbOfComp); - std::string repr() const; - int getNumberOfCompo() const { return _nb_of_compo; } - const T *getConstPointer() const { return _pt; } - T *getPointer() { return _pt; } - typename Traits::ArrayType *buildDA(int nbOfTuples, int nbOfCompo) const; + MEDCOUPLING_EXPORT DataArrayTuple(T *pt, int nbOfComp); + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT int getNumberOfCompo() const { return _nb_of_compo; } + MEDCOUPLING_EXPORT const T *getConstPointer() const { return _pt; } + MEDCOUPLING_EXPORT T *getPointer() { return _pt; } + MEDCOUPLING_EXPORT typename Traits::ArrayType *buildDA(int nbOfTuples, int nbOfCompo) const; protected: T zeValue() const; protected: @@ -825,66 +825,66 @@ namespace MEDCoupling class DataArrayDoubleTuple; - class MEDCOUPLING_EXPORT DataArrayDoubleIterator : public DataArrayIterator + class DataArrayDoubleIterator : public DataArrayIterator { public: - DataArrayDoubleIterator(DataArrayDouble *da); - ~DataArrayDoubleIterator() { } + MEDCOUPLING_EXPORT DataArrayDoubleIterator(DataArrayDouble *da); + MEDCOUPLING_EXPORT ~DataArrayDoubleIterator() { } }; - class MEDCOUPLING_EXPORT DataArrayDoubleTuple : public DataArrayTuple + class DataArrayDoubleTuple : public DataArrayTuple { public: - DataArrayDoubleTuple(double *pt, int nbOfComp); - std::string repr() const; - double doubleValue() const; - DataArrayDouble *buildDADouble(int nbOfTuples, int nbOfCompo) const; + MEDCOUPLING_EXPORT DataArrayDoubleTuple(double *pt, int nbOfComp); + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT double doubleValue() const; + MEDCOUPLING_EXPORT DataArrayDouble *buildDADouble(int nbOfTuples, int nbOfCompo) const; }; class DataArrayFloatTuple; - class MEDCOUPLING_EXPORT DataArrayFloatIterator : public DataArrayIterator + class DataArrayFloatIterator : public DataArrayIterator { public: - DataArrayFloatIterator(DataArrayFloat *da); - ~DataArrayFloatIterator() { } + MEDCOUPLING_EXPORT DataArrayFloatIterator(DataArrayFloat *da); + MEDCOUPLING_EXPORT ~DataArrayFloatIterator() { } }; - class MEDCOUPLING_EXPORT DataArrayFloatTuple : public DataArrayTuple + class DataArrayFloatTuple : public DataArrayTuple { public: - DataArrayFloatTuple(float *pt, int nbOfComp); - std::string repr() const; - float floatValue() const; - DataArrayFloat *buildDAFloat(int nbOfTuples, int nbOfCompo) const; + MEDCOUPLING_EXPORT DataArrayFloatTuple(float *pt, int nbOfComp); + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT float floatValue() const; + MEDCOUPLING_EXPORT DataArrayFloat *buildDAFloat(int nbOfTuples, int nbOfCompo) const; }; - class MEDCOUPLING_EXPORT DataArrayIntIterator : public DataArrayIterator + class DataArrayIntIterator : public DataArrayIterator { public: - DataArrayIntIterator(DataArrayInt *da); - ~DataArrayIntIterator() { } + MEDCOUPLING_EXPORT DataArrayIntIterator(DataArrayInt *da); + MEDCOUPLING_EXPORT ~DataArrayIntIterator() { } }; - class MEDCOUPLING_EXPORT DataArrayInt32Tuple : public DataArrayTuple + class DataArrayInt32Tuple : public DataArrayTuple { public: - DataArrayInt32Tuple(int *pt, int nbOfComp); - std::string repr() const; - int intValue() const; - DataArrayInt32 *buildDAInt(int nbOfTuples, int nbOfCompo) const; + MEDCOUPLING_EXPORT DataArrayInt32Tuple(int *pt, int nbOfComp); + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT int intValue() const; + MEDCOUPLING_EXPORT DataArrayInt32 *buildDAInt(int nbOfTuples, int nbOfCompo) const; }; typedef DataArrayInt32Tuple DataArrayIntTuple; class DataArrayAsciiCharTuple; - class MEDCOUPLING_EXPORT DataArrayAsciiCharIterator + class DataArrayAsciiCharIterator { public: - DataArrayAsciiCharIterator(DataArrayAsciiChar *da); - ~DataArrayAsciiCharIterator(); - DataArrayAsciiCharTuple *nextt(); + MEDCOUPLING_EXPORT DataArrayAsciiCharIterator(DataArrayAsciiChar *da); + MEDCOUPLING_EXPORT ~DataArrayAsciiCharIterator(); + MEDCOUPLING_EXPORT DataArrayAsciiCharTuple *nextt(); private: DataArrayAsciiChar *_da; char *_pt; @@ -893,16 +893,16 @@ namespace MEDCoupling int _nb_tuple; }; - class MEDCOUPLING_EXPORT DataArrayAsciiCharTuple + class 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; + MEDCOUPLING_EXPORT DataArrayAsciiCharTuple(char *pt, int nbOfComp); + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT int getNumberOfCompo() const { return _nb_of_compo; } + MEDCOUPLING_EXPORT const char *getConstPointer() const { return _pt; } + MEDCOUPLING_EXPORT char *getPointer() { return _pt; } + MEDCOUPLING_EXPORT char asciiCharValue() const; + MEDCOUPLING_EXPORT DataArrayAsciiChar *buildDAAsciiChar(int nbOfTuples, int nbOfCompo) const; private: char *_pt; int _nb_of_compo; @@ -910,12 +910,12 @@ namespace MEDCoupling class DataArrayByteTuple; - class MEDCOUPLING_EXPORT DataArrayByteIterator + class DataArrayByteIterator { public: - DataArrayByteIterator(DataArrayByte *da); - ~DataArrayByteIterator(); - DataArrayByteTuple *nextt(); + MEDCOUPLING_EXPORT DataArrayByteIterator(DataArrayByte *da); + MEDCOUPLING_EXPORT ~DataArrayByteIterator(); + MEDCOUPLING_EXPORT DataArrayByteTuple *nextt(); private: DataArrayByte *_da; char *_pt; @@ -924,16 +924,16 @@ namespace MEDCoupling int _nb_tuple; }; - class MEDCOUPLING_EXPORT DataArrayByteTuple + class DataArrayByteTuple { 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; + MEDCOUPLING_EXPORT DataArrayByteTuple(char *pt, int nbOfComp); + MEDCOUPLING_EXPORT std::string repr() const; + MEDCOUPLING_EXPORT int getNumberOfCompo() const { return _nb_of_compo; } + MEDCOUPLING_EXPORT const char *getConstPointer() const { return _pt; } + MEDCOUPLING_EXPORT char *getPointer() { return _pt; } + MEDCOUPLING_EXPORT char byteValue() const; + MEDCOUPLING_EXPORT DataArrayByte *buildDAByte(int nbOfTuples, int nbOfCompo) const; private: char *_pt; int _nb_of_compo; diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx index 94db55df8..94d59ecea 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx @@ -30,10 +30,6 @@ #include #include -#ifdef WIN32 -#include "MEDCouplingMemArray.txx" -#endif - using namespace MEDCoupling; void MEDCouplingBasicsTest1::testArray() diff --git a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx index 996ea502a..359bc7ecd 100644 --- a/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx +++ b/src/MEDCoupling_Swig/MEDCouplingDataArrayTraits.hxx @@ -23,10 +23,6 @@ #include "MEDCouplingMemArray.hxx" -#ifdef WIN32 -#include -#endif - #include #ifdef WITH_NUMPY diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i index 8a9b71ccc..476d4ab6a 100644 --- a/src/RENUMBER_Swig/MEDRenumberCommon.i +++ b/src/RENUMBER_Swig/MEDRenumberCommon.i @@ -22,7 +22,6 @@ %include std_string.i %{ -#include "MEDCouplingMemArray.txx" #include "MCAuto.hxx" #include "MEDCouplingDataArrayTypemaps.i" -- 2.39.2