Fix: getCellsContainingPoints() in case of polyhedron with a face containing colinear...

[tools/medcoupling.git] / src / MEDCoupling_Swig / DataArrayInt.i

diff --git a/src/MEDCoupling_Swig/DataArrayInt.i b/src/MEDCoupling_Swig/DataArrayInt.i
index 6017f1559e84c38988a50e3f0c5d19a6407d31a2..920f996575661eb6ccd7caaffe7fd92373724315 100644 (file)
--- a/src/MEDCoupling_Swig/DataArrayInt.i
+++ b/src/MEDCoupling_Swig/DataArrayInt.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,6 +44,7 @@
     bool isEqual(const ARRAY& other) const;
     bool isEqualWithoutConsideringStr(const ARRAY& other) const;
     bool isEqualWithoutConsideringStrAndOrder(const ARRAY& other) const;
+    DataArrayIdType *occurenceRankInThis() const;
     DataArrayIdType *buildPermutationArr(const ARRAY& other) const;
     ARRAY *sumPerTuple() const;
     void sort(bool asc=true);
@@ -126,11 +127,13 @@
     static ARRAY *BuildUnion(const std::vector<const ARRAY *>& arr);
     static ARRAY *BuildIntersection(const std::vector<const ARRAY *>& arr);
     static DataArrayIdType *FindPermutationFromFirstToSecond(const ARRAY *ids1, const ARRAY *ids2);
+    static DataArrayIdType *FindPermutationFromFirstToSecondDuplicate(const ARRAY *ids1, const ARRAY *ids2);
     DataArrayIdType *buildComplement(mcIdType nbOfElement) const;
     ARRAY *buildSubstraction(const ARRAY *other) const;
     ARRAY *buildSubstractionOptimized(const ARRAY *other) const;
     ARRAY *buildUnion(const ARRAY *other) const;
     ARRAY *buildIntersection(const ARRAY *other) const;
+    DataArrayIdType *indexOfSameConsecutiveValueGroups() const;
     ARRAY *buildUnique() const;
     ARRAY *buildUniqueNotSorted() const;
     ARRAY *deltaShiftIndex() const;
@@ -140,6 +143,7 @@
     DataArrayIdType *findRangeIdForEachTuple(const ARRAY *ranges) const;
     ARRAY *findIdInRangeForEachTuple(const ARRAY *ranges) const;
     void sortEachPairToMakeALinkedList();
+    void sortToHaveConsecutivePairs();
     ARRAY *duplicateEachTupleNTimes(mcIdType nbTimes) const;
     ARRAY *getDifferentValues() const;
     static ARRAY *Add(const ARRAY *a1, const ARRAY *a2);
@@ -255,10 +259,12 @@
                 return ret.retn();
               }
           }
+#if defined(WITH_NUMPY)
         else if(MEDCouplingHasNumPyBindings() && PyArray_Check(elt0) && nbOfTuples==NULL && nbOfComp==NULL)
           {//ARRAY.New(numpyArray)
             return BuildNewInstance<ARRAY,INT>(elt0,NPYTraits<INT>::NPYObjectType,NPYTraits<INT>::NPYFunc,MEDCoupling::Traits<INT>::NPYStr);
           }
+#endif
         else
           throw INTERP_KERNEL::Exception(msg.c_str());
         throw INTERP_KERNEL::Exception(msg.c_str());//to make g++ happy
@@ -2013,6 +2019,11 @@
         return pyRet;
       }
       
+      DataArrayIdType *locateComponentId(const ARRAY *valToSearchIntoTuples, const DataArrayIdType *tupleIdHint) const
+      {
+        return self->locateComponentId(valToSearchIntoTuples,tupleIdHint);
+      }
+      
       PyObject *findIdsRangesInListOfIds(const ARRAY *listOfIds) const
       {
         DataArrayIdType *ret0=0;
@@ -2555,8 +2566,11 @@ void transformWithIndArr(PyObject *li)
 namespace MEDCoupling
 {
   typedef int      Int32;
-  typedef long int Int64;
-
+#ifdef WIN32
+  typedef long long Int64;
+#else
+  typedef long int  Int64;
+#endif
 
   class DataArrayInt32Iterator;
 
@@ -2565,6 +2579,11 @@ namespace MEDCoupling
     ARRAYDEF( DataArrayInt32, Int32 )
   };
   %extend DataArrayInt32 {
+    DataArrayInt64 *convertToInt64Arr() const
+    {
+      MCAuto<DataArrayInt64> ret(self->convertToInt64Arr());
+      return ret.retn();
+    }
 #ifdef WITH_NUMPY
     PyObject *toNumPyArray() // not const. It is not a bug !
     {
@@ -2591,6 +2610,11 @@ namespace MEDCoupling
     ARRAYDEF( DataArrayInt64, Int64 )
   };
   %extend DataArrayInt64 {
+    DataArrayInt32 *convertToInt32Arr() const
+    {
+      MCAuto<DataArrayInt32> ret(self->convertToInt32Arr());
+      return ret.retn();
+    }
 #ifdef WITH_NUMPY
     PyObject *toNumPyArray() // not const. It is not a bug !
     {