X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshIDFactory.cxx;h=88b9ce38d55e6931ea39301692c9c291c3affb95;hp=9cd72d412d26d31d789570c65147da5ef1a8483b;hb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;hpb=8b4ba0cdff7660465a9ea7b26ef0df0757afed97

diff --git a/src/SMDS/SMDS_MeshIDFactory.cxx b/src/SMDS/SMDS_MeshIDFactory.cxx
index 9cd72d412..88b9ce38d 100644
--- a/src/SMDS/SMDS_MeshIDFactory.cxx
+++ b/src/SMDS/SMDS_MeshIDFactory.cxx
@@ -1,19 +1,87 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+//  SMESH SMDS : implementaion of Salome mesh data structure
+//  File   : SMDS_MeshIDFactory.cxx
+//  Author : Jean-Michel BOULCOURT
+//  Module : SMESH
+//
+#include "SMDS_MeshIDFactory.hxx"
+
 using namespace std;
-// File:	SMDS_MeshIDFactory.cxx
-// Created:	Thu Jan 24 12:09:12 2002
-// Author:	Jean-Michel BOULCOURT
-//		<jmb@coulox.paris1.matra-dtv.fr>
 
+//=======================================================================
+//function : SMDS_MeshIDFactory
+//purpose  : 
+//=======================================================================
 
-#include "SMDS_MeshIDFactory.ixx"
+SMDS_MeshIDFactory::SMDS_MeshIDFactory():myMaxID(0)
+{
+}
 
+int SMDS_MeshIDFactory::GetFreeID()
+{
+	if (myPoolOfID.empty()) return ++myMaxID;
+	else
+	{
+                set<int>::iterator i = myPoolOfID.begin();
+		int ID = *i;//myPoolOfID.top();
+		myPoolOfID.erase( i );//myPoolOfID.pop();
+		return ID;
+	}
+}
 
 //=======================================================================
-//function : SMDS_MeshIDFactory
+//function : ReleaseID
 //purpose  : 
 //=======================================================================
-
-SMDS_MeshIDFactory::SMDS_MeshIDFactory() : myMaxID(0)
+void SMDS_MeshIDFactory::ReleaseID(const int ID)
 {
+  if ( ID > 0 )
+  {
+    if ( ID < myMaxID )
+    {
+      myPoolOfID.insert(ID);
+    }
+    else if ( ID == myMaxID )
+    {
+      --myMaxID;
+      if ( !myPoolOfID.empty() ) // assure that myMaxID is not in myPoolOfID
+      {
+        set<int>::iterator i = --myPoolOfID.end();
+        while ( i != myPoolOfID.begin() && myMaxID == *i ) {
+          --myMaxID; --i;
+        }
+        if ( myMaxID == *i )
+          --myMaxID; // begin of myPoolOfID reached
+        else
+          ++i;
+        myPoolOfID.erase( i, myPoolOfID.end() );
+      }
+    }
+  }
 }
 
+void SMDS_MeshIDFactory::Clear()
+{
+  myMaxID = 0;
+  myPoolOfID.clear();
+}