Fix due to last commit

[tools/medcoupling.git] / src / RENUMBER_Swig / MEDRenumberCommon.i

diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i
index 5de2c28a0e7b61b4d8828457e3fdcdb9a4f925bb..382c1b057b1871bc4fd0e7e8a26970df1014146c 100644 (file)
--- a/src/RENUMBER_Swig/MEDRenumberCommon.i
+++ b/src/RENUMBER_Swig/MEDRenumberCommon.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -18,22 +18,20 @@
 //
 // Author : Anthony Geay (CEA/DEN)
 
-%module MEDRenumber
-
 %include std_vector.i
 %include std_string.i
 
+%include "MEDCouplingCommon.i"
+
 %{
+#ifndef WIN32
 #include "MEDCouplingMemArray.txx"
+#endif
 #include "MCAuto.hxx"
 #include "MEDCouplingDataArrayTypemaps.i"
 
-#include "RenumberingFactory.hxx"
-#include "RENUMBER_Renumbering.hxx"
-
 using namespace MEDCoupling;
 using namespace INTERP_KERNEL;
- using namespace MED_RENUMBER;
 %}
 
 %template(ivec) std::vector<int>;
@@ -44,13 +42,11 @@ using namespace INTERP_KERNEL;
 %init %{ import_array(); %}
 #endif
 
-%init %{ initializeMe(); %}
+%init %{ initializeMe_renumber(); %}
 
 %feature("autodoc", "1");
 %feature("docstring");
 
-%newobject MED_RENUMBER::RenumberingFactory;
-
 %nodefaultctor;
 
 %rename (InterpKernelException) INTERP_KERNEL::Exception;
@@ -59,59 +55,19 @@ using namespace INTERP_KERNEL;
 %include "MEDCouplingMemArray.i"
 
 %{
-  void initializeMe()
+  void initializeMe_renumber()
   {// AGY : here initialization of C++ traits in MEDCouplingDataArrayTypemaps.i for code factorization. Awful, I know, but no other solutions.
     SWIGTITraits<double>::TI=SWIGTYPE_p_MEDCoupling__DataArrayDouble;
     SWIGTITraits<float>::TI=SWIGTYPE_p_MEDCoupling__DataArrayFloat;
   }
 %}
 
-class Renumbering
-{
-public:
-  %extend
-  {
-    virtual PyObject *renumber(const MEDCoupling::DataArrayInt *graph, const MEDCoupling::DataArrayInt *index_graph) throw(INTERP_KERNEL::Exception)
-    {
-      if(!graph || !index_graph)
-        throw INTERP_KERNEL::Exception("wrap of Renumbering::renumber : One of the input arrays is NULL !");
-      if(!graph->isAllocated() || !index_graph->isAllocated())
-        throw INTERP_KERNEL::Exception("wrap of Renumbering::renumber : One of the input arrays is not allocated !");
-      MEDCoupling::DataArrayInt *out0(0),*out1(0);
-      self->renumber(graph->begin(),index_graph->begin(),index_graph->getNumberOfTuples()-1,out0,out1);
-      PyObject *ret=PyTuple_New(2);
-      PyTuple_SetItem(ret,0,SWIG_NewPointerObj(SWIG_as_voidptr(out0),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ));
-      PyTuple_SetItem(ret,1,SWIG_NewPointerObj(SWIG_as_voidptr(out1),SWIGTYPE_p_MEDCoupling__DataArrayInt, SWIG_POINTER_OWN | 0 ));
-      return ret;
-    }
-  }
-  virtual ~Renumbering();
-};
-
-namespace MED_RENUMBER
-{
-  Renumbering *RenumberingFactory(const std::string& s) throw(INTERP_KERNEL::Exception);
-}
-
-%inline
-{
-  std::vector<std::string> RenumberAvailableMethods()throw(INTERP_KERNEL::Exception)
-  {
-    std::vector<std::string> ret;
-#ifdef HAS_BOOST
-    ret.push_back(std::string("BOOST"));
-#endif
-#ifdef HAS_METIS
-    ret.push_back(std::string("METIS"));
-#endif
-    return ret;
-  }
-}
+%include "MEDRenumberImpl.i"
 
 %pythoncode %{
 import os
 __filename=os.environ.get('PYTHONSTARTUP')
 if __filename and os.path.isfile(__filename):
-  exec(open(__filename).read())
-  pass
+  with open(__filename) as __fp:
+        exec(__fp.read())
 %}