X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FMEDPARTITIONER_Graph.hxx;h=a2f56a0f0be75182eb74a0fdbd0d7c9f04eb3f93;hb=1b5fb5650409b0ad3a61da3215496f2adf2dae02;hp=a00d09131ac66fdc949d0dc4c3343f60747dc346;hpb=1123dccd6613b2e8abba35182759d5c4a11ecc8d;p=tools%2Fmedcoupling.git

diff --git a/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx b/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx
index a00d09131..a2f56a0f0 100644
--- a/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,40 +21,52 @@
 #define __MEDPARTITIONER_GRAPH_HXX__
 
 #include "MEDPARTITIONER.hxx"
-#include "MEDPARTITIONER_SkyLineArray.hxx"
+#include "MCAuto.hxx"
+#include "MCType.hxx"
 
 #include <string>
 
+namespace MEDCoupling
+{
+  class MEDCouplingSkyLineArray;
+}
+
+using namespace MEDCoupling;
+
 namespace MEDPARTITIONER 
 {
   class ParaDomainSelector;
   class MEDPARTITIONER_EXPORT Graph
   {
   public:
-    typedef enum {METIS,SCOTCH} splitter_type;
+    typedef enum {METIS,SCOTCH,PTSCOTCH} splitter_type;
 
-    Graph() { }
-    //creates a graph from a SKYLINEARRAY
-    Graph(MEDPARTITIONER::SkyLineArray* graph, int* edgeweight=0);
+    Graph();
+    //creates a graph from a SKYLINEARRAY- WARNING!! Graph takes ownership of the array.
+    Graph(MEDCouplingSkyLineArray* graph, int* edgeweight=0);
     virtual ~Graph();
 
     void setEdgesWeights(int *edgeweight) { _edge_weight=edgeweight; }
     void setVerticesWeights(int *cellweight) { _cell_weight=cellweight; }
     
     //computes partitioning of the graph
-    virtual void partGraph(int ndomain, const std::string&, ParaDomainSelector *sel=0) = 0;
+    virtual void partGraph(int ndomain, const std::string& options_string="", ParaDomainSelector *sel=0) = 0;
     
     //returns the partitioning
-    const int *getPart() const { return _partition->getValue(); }
+    const mcIdType *getPart() const;
     
     //returns the number of graph vertices (which can correspond to the cells in the mesh!)
-    int nbVertices() const { return _graph->getNumberOf(); }
-    
-    const SkyLineArray *getGraph() const { return _graph; }
+    mcIdType nbVertices() const;
+
+    // returns nb of domains in _partition
+    int nbDomains() const;
+
+    const MEDCouplingSkyLineArray *getGraph() const { return (const MEDCouplingSkyLineArray*)_graph; }
+    const MEDCouplingSkyLineArray *getPartition() const { return (const MEDCouplingSkyLineArray*)_partition; }
 
   protected:
-    SkyLineArray* _graph;
-    SkyLineArray* _partition;
+    MCAuto<MEDCouplingSkyLineArray> _graph;
+    MCAuto<MEDCouplingSkyLineArray> _partition;
     int* _edge_weight;  
     int* _cell_weight;
   };