X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingMemArray.cxx;h=1c20ae77a9f198dd182c98c20607c6e5faa5e5a2;hb=ac1df6b0ba8b337555fb39610c89f678d889580d;hp=24142a4b285a0f35ef5055242e9b4dd5cfc83d9b;hpb=3531e8f47b047f0176ec094e51ab2474284f3cd9;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx index 24142a4b2..1c20ae77a 100644 --- a/src/MEDCoupling/MEDCouplingMemArray.cxx +++ b/src/MEDCoupling/MEDCouplingMemArray.cxx @@ -25,6 +25,12 @@ #include "InterpKernelAutoPtr.hxx" #include "InterpKernelExprParser.hxx" +#include "InterpKernelAutoPtr.hxx" +#include "InterpKernelGeo2DEdgeArcCircle.hxx" +#include "InterpKernelAutoPtr.hxx" +#include "InterpKernelGeo2DNode.hxx" +#include "InterpKernelGeo2DEdgeLin.hxx" + #include #include #include @@ -572,7 +578,7 @@ void DataArray::setInfoAndChangeNbOfCompo(const std::vector& info) void DataArray::checkNbOfTuples(int nbOfTuples, const std::string& msg) const { - if(getNumberOfTuples()!=nbOfTuples) + if((int)getNumberOfTuples()!=nbOfTuples) { std::ostringstream oss; oss << msg << " : mismatch number of tuples : expected " << nbOfTuples << " having " << getNumberOfTuples() << " !"; throw INTERP_KERNEL::Exception(oss.str().c_str()); @@ -631,7 +637,7 @@ void DataArray::CheckValueInRange(int ref, int value, const std::string& msg) /*! * This method checks that [\b start, \b end) is compliant with ref length \b value. - * typicaly start in [0,\b value) and end in [0,\b value). If value==start and start==end, it is supported. + * typically start in [0,\b value) and end in [0,\b value). If value==start and start==end, it is supported. */ void DataArray::CheckValueInRangeEx(int value, int start, int end, const std::string& msg) { @@ -809,16 +815,6 @@ DataArrayDouble *DataArrayDouble::deepCopy() const return new DataArrayDouble(*this); } -/*! - * Assign zero to all values in \a this array. To know more on filling arrays see - * \ref MEDCouplingArrayFill. - * \throw If \a this is not allocated. - */ -void DataArrayDouble::fillWithZero() -{ - fillWithValue(0.); -} - /*! * Checks that \a this array is consistently **increasing** or **decreasing** in value, * with at least absolute difference value of |\a eps| at each step. @@ -906,18 +902,6 @@ std::string DataArrayDouble::reprZip() const return ret.str(); } -/*! - * This method is close to repr method except that when \a this has more than 1000 tuples, all tuples are not - * printed out to avoid to consume too much space in interpretor. - * \sa repr - */ -std::string DataArrayDouble::reprNotTooLong() const -{ - std::ostringstream ret; - reprNotTooLongStream(ret); - return ret.str(); -} - void DataArrayDouble::writeVTK(std::ostream& ofs, int indent, const std::string& nameInFile, DataArrayByte *byteArr) const { static const char SPACE[4]={' ',' ',' ',' '}; @@ -955,45 +939,6 @@ void DataArrayDouble::writeVTK(std::ostream& ofs, int indent, const std::string& ofs << std::endl << idt << "\n"; } -void DataArrayDouble::reprStream(std::ostream& stream) const -{ - stream << "Name of double array : \"" << _name << "\"\n"; - reprWithoutNameStream(stream); -} - -void DataArrayDouble::reprZipStream(std::ostream& stream) const -{ - stream << "Name of double array : \"" << _name << "\"\n"; - reprZipWithoutNameStream(stream); -} - -void DataArrayDouble::reprNotTooLongStream(std::ostream& stream) const -{ - stream << "Name of double array : \"" << _name << "\"\n"; - reprNotTooLongWithoutNameStream(stream); -} - -void DataArrayDouble::reprWithoutNameStream(std::ostream& stream) const -{ - DataArray::reprWithoutNameStream(stream); - stream.precision(17); - _mem.repr(getNumberOfComponents(),stream); -} - -void DataArrayDouble::reprZipWithoutNameStream(std::ostream& stream) const -{ - DataArray::reprWithoutNameStream(stream); - stream.precision(17); - _mem.reprZip(getNumberOfComponents(),stream); -} - -void DataArrayDouble::reprNotTooLongWithoutNameStream(std::ostream& stream) const -{ - DataArray::reprWithoutNameStream(stream); - stream.precision(17); - _mem.reprNotTooLong(getNumberOfComponents(),stream); -} - void DataArrayDouble::reprCppStream(const std::string& varName, std::ostream& stream) const { int nbTuples(getNumberOfTuples()),nbComp(getNumberOfComponents()); @@ -1309,8 +1254,7 @@ DataArrayInt *DataArrayDouble::computeNbOfInteractionsWith(const DataArrayDouble throw INTERP_KERNEL::Exception("DataArrayDouble::computeNbOfInteractionsWith : input array is NULL !"); if(!isAllocated() || !otherBBoxFrmt->isAllocated()) throw INTERP_KERNEL::Exception("DataArrayDouble::computeNbOfInteractionsWith : this and input array must be allocated !"); - std::size_t nbOfComp(getNumberOfComponents()); - int nbOfTuples(getNumberOfTuples()); + std::size_t nbOfComp(getNumberOfComponents()),nbOfTuples(getNumberOfTuples()); if(nbOfComp!=otherBBoxFrmt->getNumberOfComponents()) { std::ostringstream oss; oss << "DataArrayDouble::computeNbOfInteractionsWith : this number of components (" << nbOfComp << ") must be equal to the number of components of input array (" << otherBBoxFrmt->getNumberOfComponents() << ") !"; @@ -1329,21 +1273,21 @@ DataArrayInt *DataArrayDouble::computeNbOfInteractionsWith(const DataArrayDouble case 3: { BBTree<3,int> bbt(otherBBoxFrmt->begin(),0,0,otherBBoxFrmt->getNumberOfTuples(),eps); - for(int i=0;i bbt(otherBBoxFrmt->begin(),0,0,otherBBoxFrmt->getNumberOfTuples(),eps); - for(int i=0;i bbt(otherBBoxFrmt->begin(),0,0,otherBBoxFrmt->getNumberOfTuples(),eps); - for(int i=0;i::max() is returned. * \return double - the value of the minimum norm, i.e. * the minimal absolute value among values of \a this array (whatever its number of components). @@ -2103,7 +2047,7 @@ DataArrayDouble *DataArrayDouble::fromCartToCylGiven(const DataArrayDouble *coor throw INTERP_KERNEL::Exception("DataArrayDouble::fromCartToCylGiven : input coords are NULL !"); MCAuto ret(DataArrayDouble::New()); checkAllocated(); coords->checkAllocated(); - int nbOfComp(getNumberOfComponents()),nbTuples(getNumberOfTuples()); + std::size_t nbOfComp(getNumberOfComponents()),nbTuples(getNumberOfTuples()); if(nbOfComp!=3) throw INTERP_KERNEL::Exception("DataArrayDouble::fromCartToCylGiven : must be an array with exactly 3 components !"); if(coords->getNumberOfComponents()!=3) @@ -2406,28 +2350,6 @@ DataArrayDouble *DataArrayDouble::magnitude() const return ret; } -/*! - * Computes for each tuple the sum of number of components values in the tuple and return it. - * - * \return DataArrayDouble * - the new instance of DataArrayDouble containing the - * same number of tuples as \a this array and one component. - * The caller is to delete this result array using decrRef() as it is no more - * needed. - * \throw If \a this is not allocated. - */ -DataArrayDouble *DataArrayDouble::sumPerTuple() const -{ - checkAllocated(); - int nbOfComp(getNumberOfComponents()),nbOfTuple(getNumberOfTuples()); - MCAuto ret(DataArrayDouble::New()); - ret->alloc(nbOfTuple,1); - const double *src(getConstPointer()); - double *dest(ret->getPointer()); - for(int i=0;i n0(new INTERP_KERNEL::Node(pt[0],pt[1])),n1(new INTERP_KERNEL::Node(pt[2],pt[3])),n2(new INTERP_KERNEL::Node(pt[4],pt[5])); + { + INTERP_KERNEL::AutoCppPtr e1(new INTERP_KERNEL::EdgeLin(n0,n2)),e2(new INTERP_KERNEL::EdgeLin(n2,n1)); + INTERP_KERNEL::SegSegIntersector inters(*e1,*e2); + bool colinearity(inters.areColinears()); + if(colinearity) + throw INTERP_KERNEL::Exception("DataArrayDouble::asArcOfCircle : 3 points in this have been detected as colinear !"); + } + INTERP_KERNEL::AutoCppPtr ret(new INTERP_KERNEL::EdgeArcCircle(n0,n2,n1)); + const double *c(ret->getCenter()); + center[0]=c[0]; center[1]=c[1]; + radius=ret->getRadius(); + ang=ret->getAngle(); +} + /*! * Sorts value within every tuple of \a this array. * \param [in] asc - if \a true, the values are sorted in ascending order, else, @@ -3232,15 +3186,14 @@ DataArrayDouble *DataArrayDouble::Dot(const DataArrayDouble *a1, const DataArray std::size_t nbOfComp(a1->getNumberOfComponents()); if(nbOfComp!=a2->getNumberOfComponents()) throw INTERP_KERNEL::Exception("Nb of components mismatch for array Dot !"); - int nbOfTuple=a1->getNumberOfTuples(); + std::size_t nbOfTuple(a1->getNumberOfTuples()); if(nbOfTuple!=a2->getNumberOfTuples()) throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array Dot !"); DataArrayDouble *ret=DataArrayDouble::New(); ret->alloc(nbOfTuple,1); double *retPtr=ret->getPointer(); - const double *a1Ptr=a1->getConstPointer(); - const double *a2Ptr=a2->getConstPointer(); - for(int i=0;ibegin(),*a2Ptr(a2->begin()); + for(std::size_t i=0;igetNumberOfTuples(); + std::size_t nbOfTuple(a1->getNumberOfTuples()); if(nbOfTuple!=a2->getNumberOfTuples()) throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array crossProduct !"); DataArrayDouble *ret=DataArrayDouble::New(); ret->alloc(nbOfTuple,3); double *retPtr=ret->getPointer(); - const double *a1Ptr=a1->getConstPointer(); - const double *a2Ptr=a2->getConstPointer(); - for(int i=0;ibegin()),*a2Ptr(a2->begin()); + for(std::size_t i=0;igetNumberOfComponents()); if(nbOfComp!=a2->getNumberOfComponents()) throw INTERP_KERNEL::Exception("Nb of components mismatch for array Max !"); - int nbOfTuple=a1->getNumberOfTuples(); + std::size_t nbOfTuple(a1->getNumberOfTuples()); if(nbOfTuple!=a2->getNumberOfTuples()) throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array Max !"); - DataArrayDouble *ret=DataArrayDouble::New(); + MCAuto ret(DataArrayDouble::New()); ret->alloc(nbOfTuple,nbOfComp); - double *retPtr=ret->getPointer(); - const double *a1Ptr=a1->getConstPointer(); - const double *a2Ptr=a2->getConstPointer(); - int nbElem=nbOfTuple*nbOfComp; - for(int i=0;igetPointer()); + const double *a1Ptr(a1->begin()),*a2Ptr(a2->begin()); + std::size_t nbElem(nbOfTuple*nbOfComp); + for(std::size_t i=0;icopyStringInfoFrom(*a1); - return ret; + return ret.retn(); } /*! @@ -3351,19 +3302,18 @@ DataArrayDouble *DataArrayDouble::Min(const DataArrayDouble *a1, const DataArray std::size_t nbOfComp(a1->getNumberOfComponents()); if(nbOfComp!=a2->getNumberOfComponents()) throw INTERP_KERNEL::Exception("Nb of components mismatch for array min !"); - int nbOfTuple=a1->getNumberOfTuples(); + std::size_t nbOfTuple(a1->getNumberOfTuples()); if(nbOfTuple!=a2->getNumberOfTuples()) throw INTERP_KERNEL::Exception("Nb of tuples mismatch for array min !"); - DataArrayDouble *ret=DataArrayDouble::New(); + MCAuto ret(DataArrayDouble::New()); ret->alloc(nbOfTuple,nbOfComp); - double *retPtr=ret->getPointer(); - const double *a1Ptr=a1->getConstPointer(); - const double *a2Ptr=a2->getConstPointer(); - int nbElem=nbOfTuple*nbOfComp; - for(int i=0;igetPointer()); + const double *a1Ptr(a1->begin()),*a2Ptr(a2->begin()); + std::size_t nbElem(nbOfTuple*nbOfComp); + for(std::size_t i=0;icopyStringInfoFrom(*a1); - return ret; + return ret.retn(); } /*! @@ -3748,35 +3698,6 @@ DataArrayInt32 *DataArrayInt32::deepCopy() const return new DataArrayInt32(*this); } -/*! - * Assign zero to all values in \a this array. To know more on filling arrays see - * \ref MEDCouplingArrayFill. - * \throw If \a this is not allocated. - */ -void DataArrayInt::fillWithZero() -{ - fillWithValue(0); -} - -/*! - * Set all values in \a this array so that the i-th element equals to \a init + i - * (i starts from zero). To know more on filling arrays see \ref MEDCouplingArrayFill. - * \param [in] init - value to assign to the first element of array. - * \throw If \a this->getNumberOfComponents() != 1 - * \throw If \a this is not allocated. - */ -void DataArrayInt::iota(int init) -{ - checkAllocated(); - if(getNumberOfComponents()!=1) - throw INTERP_KERNEL::Exception("DataArrayInt::iota : works only for arrays with only one component, you can call 'rearrange' method before !"); - int *ptr=getPointer(); - int ntuples=getNumberOfTuples(); - for(int i=0;i\n"; } -void DataArrayInt::reprStream(std::ostream& stream) const -{ - stream << "Name of int array : \"" << _name << "\"\n"; - reprWithoutNameStream(stream); -} - -void DataArrayInt::reprZipStream(std::ostream& stream) const -{ - stream << "Name of int array : \"" << _name << "\"\n"; - reprZipWithoutNameStream(stream); -} - -void DataArrayInt::reprNotTooLongStream(std::ostream& stream) const -{ - stream << "Name of int array : \"" << _name << "\"\n"; - reprNotTooLongWithoutNameStream(stream); -} - -void DataArrayInt::reprWithoutNameStream(std::ostream& stream) const -{ - DataArray::reprWithoutNameStream(stream); - _mem.repr(getNumberOfComponents(),stream); -} - -void DataArrayInt::reprZipWithoutNameStream(std::ostream& stream) const -{ - DataArray::reprWithoutNameStream(stream); - _mem.reprZip(getNumberOfComponents(),stream); -} - -void DataArrayInt::reprNotTooLongWithoutNameStream(std::ostream& stream) const -{ - DataArray::reprWithoutNameStream(stream); - stream.precision(17); - _mem.reprNotTooLong(getNumberOfComponents(),stream); -} - void DataArrayInt::reprCppStream(const std::string& varName, std::ostream& stream) const { int nbTuples=getNumberOfTuples(),nbComp=getNumberOfComponents(); @@ -4350,232 +4222,6 @@ MCAuto< MapKeyVal > DataArrayInt::invertArrayN2O2O2NOptimized() const return ret; } -/*! - * Computes for each tuple the sum of number of components values in the tuple and return it. - * - * \return DataArrayInt * - the new instance of DataArrayInt containing the - * same number of tuples as \a this array and one component. - * The caller is to delete this result array using decrRef() as it is no more - * needed. - * \throw If \a this is not allocated. - */ -DataArrayInt *DataArrayInt::sumPerTuple() const -{ - checkAllocated(); - int nbOfComp(getNumberOfComponents()),nbOfTuple(getNumberOfTuples()); - MCAuto ret(DataArrayInt::New()); - ret->alloc(nbOfTuple,1); - const int *src(getConstPointer()); - int *dest(ret->getPointer()); - for(int i=0;igetNumberOfComponents() != 1. - * \throw If \a this is not allocated. - */ -void DataArrayInt::checkMonotonic(bool increasing) const -{ - if(!isMonotonic(increasing)) - { - if (increasing) - throw INTERP_KERNEL::Exception("DataArrayInt::checkMonotonic : 'this' is not INCREASING monotonic !"); - else - throw INTERP_KERNEL::Exception("DataArrayInt::checkMonotonic : 'this' is not DECREASING monotonic !"); - } -} - -/*! - * Checks that \a this array is consistently **increasing** or **decreasing** in value. - * \param [in] increasing - if \a true, array values should be increasing. - * \return bool - \a true if values change in accordance with \a increasing arg. - * \throw If \a this->getNumberOfComponents() != 1. - * \throw If \a this is not allocated. - */ -bool DataArrayInt::isMonotonic(bool increasing) const -{ - checkAllocated(); - if(getNumberOfComponents()!=1) - throw INTERP_KERNEL::Exception("DataArrayInt::isMonotonic : only supported with 'this' array with ONE component !"); - int nbOfElements=getNumberOfTuples(); - const int *ptr=getConstPointer(); - if(nbOfElements==0) - return true; - int ref=ptr[0]; - if(increasing) - { - for(int i=1;i=ref) - ref=ptr[i]; - else - return false; - } - } - else - { - for(int i=1;iref) - ref=ptr[i]; - else - return false; - } - } - else - { - for(int i=1;i other.getIJ(i,0) == this->getIJ(ret->getIJ(i),0). If such a permutation is - * not possible because some element in \a other is not in \a this, an exception is thrown. - * \param [in] other - an array to compute permutation to. - * \return DataArrayInt * - a new instance of DataArrayInt, which is a permutation array - * from \a this to \a other. The caller is to delete this array using decrRef() as it is - * no more needed. - * \throw If \a this->getNumberOfComponents() != 1. - * \throw If \a other->getNumberOfComponents() != 1. - * \throw If \a this->getNumberOfTuples() != \a other->getNumberOfTuples(). - * \throw If \a other includes a value which is not in \a this array. - * - * \if ENABLE_EXAMPLES - * \ref cpp_mcdataarrayint_buildpermutationarr "Here is a C++ example". - * - * \ref py_mcdataarrayint_buildpermutationarr "Here is a Python example". - * \endif - */ -DataArrayInt *DataArrayInt::buildPermutationArr(const DataArrayInt& other) const -{ - checkAllocated(); - if(getNumberOfComponents()!=1 || other.getNumberOfComponents()!=1) - throw INTERP_KERNEL::Exception("DataArrayInt::buildPermutationArr : 'this' and 'other' have to have exactly ONE component !"); - int nbTuple=getNumberOfTuples(); - other.checkAllocated(); - if(nbTuple!=other.getNumberOfTuples()) - throw INTERP_KERNEL::Exception("DataArrayInt::buildPermutationArr : 'this' and 'other' must have the same number of tuple !"); - MCAuto ret=DataArrayInt::New(); - ret->alloc(nbTuple,1); - ret->fillWithValue(-1); - const int *pt=getConstPointer(); - std::map mm; - for(int i=0;igetPointer(); - for(int i=0;i::const_iterator it=mm.find(pt[i]); - if(it==mm.end()) - { - std::ostringstream oss; oss << "DataArrayInt::buildPermutationArr : Arrays mismatch : element (" << pt[i] << ") in 'other' not findable in 'this' !"; - throw INTERP_KERNEL::Exception(oss.str().c_str()); - } - retToFill[i]=(*it).second; - } - return ret.retn(); -} - -/*! - * Elements of \a partOfThis are expected to be included in \a this. - * The returned array \a ret is so that this[ret]==partOfThis - * - * For example, if \a this array contents are [9,10,0,6,4,11,3,8] and if \a partOfThis contains [6,0,11,8] - * the return array will contain [3,2,5,7]. - * - * \a this is expected to be a 1 compo allocated array. - * \param [in] partOfThis - A 1 compo allocated array - * \return - A newly allocated array to be dealed by caller having the same number of tuples than \a partOfThis. - * \throw if two same element is present twice in \a this - * \throw if an element in \a partOfThis is \b NOT in \a this. - */ -DataArrayInt *DataArrayInt::indicesOfSubPart(const DataArrayInt& partOfThis) const -{ - if(getNumberOfComponents()!=1 || partOfThis.getNumberOfComponents()!=1) - throw INTERP_KERNEL::Exception("DataArrayInt::indicesOfSubPart : this and input array must be one component array !"); - checkAllocated(); partOfThis.checkAllocated(); - int thisNbTuples(getNumberOfTuples()),nbTuples(partOfThis.getNumberOfTuples()); - const int *thisPt(begin()),*pt(partOfThis.begin()); - MCAuto ret(DataArrayInt::New()); - ret->alloc(nbTuples,1); - int *retPt(ret->getPointer()); - std::map m; - for(int i=0;i::const_iterator it(m.find(*pt)); - if(it!=m.end()) - *retPt=(*it).second; - else - { - std::ostringstream oss; oss << "DataArrayInt::indicesOfSubPart : At pos #" << i << " of input array value is " << *pt << " not in this !"; - throw INTERP_KERNEL::Exception(oss.str()); - } - } - return ret.retn(); -} - /*! * Returns a new DataArrayInt containing a renumbering map in "Old to New" mode. * This map, if applied to \a this array, would make it sorted. For example, if @@ -4604,7 +4250,7 @@ DataArrayInt *DataArrayInt::checkAndPreparePermutation() const } /*! - * This method tries to find the permutation to apply to the first input \a ids1 to obtain the same array (without considering strings informations) the second + * This method tries to find the permutation to apply to the first input \a ids1 to obtain the same array (without considering strings information) the second * input array \a ids2. * \a ids1 and \a ids2 are expected to be both a list of ids (both with number of components equal to one) not sorted and with values that can be negative. * This method will throw an exception is no such permutation array can be obtained. It is typically the case if there is some ids in \a ids1 not in \a ids2 or @@ -4914,9 +4560,9 @@ bool DataArrayInt::hasUniqueValues() const checkAllocated(); if(getNumberOfComponents()!=1) throw INTERP_KERNEL::Exception("DataArrayInt::hasOnlyUniqueValues: must be applied on DataArrayInt with only one component, you can call 'rearrange' method before !"); - int nbOfTuples(getNumberOfTuples()); + std::size_t nbOfTuples(getNumberOfTuples()); std::set s(begin(),end()); // in C++11, should use unordered_set (O(1) complexity) - if ((int)s.size() != nbOfTuples) + if (s.size() != nbOfTuples) return false; return true; } @@ -5401,14 +5047,13 @@ DataArrayInt *DataArrayInt::Aggregate(const DataArrayInt *a1, const DataArrayInt std::size_t nbOfComp(a1->getNumberOfComponents()); if(nbOfComp!=a2->getNumberOfComponents()) throw INTERP_KERNEL::Exception("Nb of components mismatch for array Aggregation !"); - int nbOfTuple1=a1->getNumberOfTuples(); - int nbOfTuple2=a2->getNumberOfTuples(); - DataArrayInt *ret=DataArrayInt::New(); + std::size_t nbOfTuple1(a1->getNumberOfTuples()),nbOfTuple2(a2->getNumberOfTuples()); + MCAuto ret(DataArrayInt::New()); ret->alloc(nbOfTuple1+nbOfTuple2-offsetA2,nbOfComp); - int *pt=std::copy(a1->getConstPointer(),a1->getConstPointer()+nbOfTuple1*nbOfComp,ret->getPointer()); + int *pt=std::copy(a1->begin(),a1->end(),ret->getPointer()); std::copy(a2->getConstPointer()+offsetA2*nbOfComp,a2->getConstPointer()+nbOfTuple2*nbOfComp,pt); ret->copyStringInfoFrom(*a1); - return ret; + return ret.retn(); } /*! @@ -5435,8 +5080,7 @@ DataArrayInt *DataArrayInt::Aggregate(const std::vector& a if(a.empty()) throw INTERP_KERNEL::Exception("DataArrayInt::Aggregate : input list must be NON EMPTY !"); std::vector::const_iterator it=a.begin(); - std::size_t nbOfComp((*it)->getNumberOfComponents()); - int nbt=(*it++)->getNumberOfTuples(); + std::size_t nbOfComp((*it)->getNumberOfComponents()),nbt((*it++)->getNumberOfTuples()); for(int i=1;it!=a.end();it++,i++) { if((*it)->getNumberOfComponents()!=nbOfComp) @@ -5961,7 +5605,7 @@ DataArrayInt *DataArrayInt::BuildListOfSwitchedOff(const std::vector& v) } /*! - * This method allows to put a vector of vector of integer into a more compact data stucture (skyline). + * This method allows to put a vector of vector of integer into a more compact data structure (skyline). * This method is not available into python because no available optimized data structure available to map std::vector< std::vector >. * * \param [in] v the input data structure to be translate into skyline format. @@ -6185,7 +5829,7 @@ DataArrayInt *DataArrayInt::buildUniqueNotSorted() const * "MEDCouplingUMesh::buildDescendingConnectivity" and * \ref MEDCoupling::MEDCouplingUMesh::getNodalConnectivityIndex * "MEDCouplingUMesh::getNodalConnectivityIndex" etc. - * This method preforms the reverse operation of DataArrayInt::computeOffsetsFull. + * This method performs the reverse operation of DataArrayInt::computeOffsetsFull. * \return DataArrayInt * - a new instance of DataArrayInt, whose number of tuples * equals to \a this->getNumberOfComponents() - 1, and number of components is 1. * The caller is to delete this array using decrRef() as it is no more needed. @@ -6261,7 +5905,7 @@ void DataArrayInt::computeOffsets() * components remains the same and number of tuples is inceamented by one.
* This method is useful for allToAllV in MPI with contiguous policy. This method * differs from computeOffsets() in that the number of tuples is changed by this one. - * This method preforms the reverse operation of DataArrayInt::deltaShiftIndex. + * This method performs the reverse operation of DataArrayInt::deltaShiftIndex. * \throw If \a this is not allocated. * \throw If \a this->getNumberOfComponents() != 1. *