-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015 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
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+#include "RENUMBER_BOOSTRenumbering.hxx"
+
+#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingAutoRefCountObjectPtr.hxx"
+
#include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/cuthill_mckee_ordering.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/bandwidth.hpp>
-#include "RENUMBER_BOOSTRenumbering.hxx"
-
-void BOOSTRenumbering::renumber(const int* graph,const int* index_graph,int nb_cell,std::vector<int>& iperm,std::vector<int>& perm)
+void BOOSTRenumbering::renumber(const int *graph, const int *index_graph, int nbCell, MEDCoupling::DataArrayInt *&iperm, MEDCoupling::DataArrayInt *&perm)
{
- iperm.resize(nb_cell,0);
- perm.resize(nb_cell,0);
-
+ MEDCoupling::MEDCouplingAutoRefCountObjectPtr<MEDCoupling::DataArrayInt> out0(MEDCoupling::DataArrayInt::New()),out1(MEDCoupling::DataArrayInt::New());
+ out0->alloc(nbCell,1); out1->alloc(nbCell,1);
+ out0->fillWithZero(); out1->fillWithZero();
+ //
typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS,
boost::property<boost::vertex_color_t, boost::default_color_type,
boost::property<boost::vertex_degree_t,int> > > Graph;
typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
typedef boost::graph_traits<Graph>::vertices_size_type size_type;
- Graph G(nb_cell);
- for (int i=0;i<nb_cell;++i)
- for (int j=index_graph[i]-1;j<index_graph[i+1]-1;++j)
- add_edge(i,graph[j]-1,G);
+ Graph G(nbCell);
+ for (int i=0;i<nbCell;++i)
+ for (int j=index_graph[i];j<index_graph[i+1];++j)
+ add_edge(i,graph[j],G);
boost::property_map<Graph, boost::vertex_index_t>::type
index_map = boost::get(boost::vertex_index, G);
- boost::cuthill_mckee_ordering(G, iperm.rbegin(), boost::get(boost::vertex_color, G),
+ boost::cuthill_mckee_ordering(G, out0->getPointer(), boost::get(boost::vertex_color, G),
boost::make_degree_map(G));
- for (size_type c = 0; c != iperm.size(); ++c)
- perm[index_map[iperm[c]]] = c;
- for(int i=0;i<nb_cell;++i)
- {
- perm[i]+=1;
- iperm[i]+=1;
- }
+ int *out0Ptr(out0->getPointer()),*out1Ptr(out1->getPointer());
+ for(int c=0;c!=nbCell;++c)
+ out1Ptr[index_map[out0Ptr[nbCell-c-1]]]=c;
+ out0->reverse();
+ iperm=out0.retn(); perm=out1.retn();
}