--- trunk/OOPSE/libmdtools/Exclude.hpp	2003/03/28 19:33:37	435
+++ trunk/OOPSE/libmdtools/Exclude.hpp	2004/04/12 20:32:20	1097
@@ -1,34 +1,34 @@
 #ifndef __EXCLUDE_H__
 #define __EXCLUDE_H__
 
+#include <set>
+#include <utility>
+
+using namespace std;
+
 class Exclude{
   
-public:
-  Exclude(int theIndex);
-  ~Exclude(){}
+ public:
 
-  static int* exPairs;  // The Excludes array
-  static int nExcludes;
-
-  static void createArray( int nExludes );
-  static void destroyArray( void );
-  static int* getArray( void ){ return exPairs; }
+  ~Exclude();
+   
+  void addPair(int i, int j);
+  int  hasPair(int i, int j);
+  void printMe( void );
+  int  getSize( void );  
+  int* getFortranArray( void );
+  static Exclude* Instance();
  
-  static void addExcludePairs(int nAdded, int* AexPair);
-  static void deleteExcludePair(int theIndex);
-  static void deleteRange(int startIndex, int stopIndex);
+ protected:
 
-  void setPair( int i, int j);
-  void printMe( void );
+  set<pair<int, int> > excludeSet;
+  int* exPairs;
+  bool newFortranArrayNeeded;
+  Exclude();
 
-protected:
-  
-  int index;
-  int exI;
-  int exJ;
-};  
-  
+ private:
+  static Exclude* _instance;  
 
-  
+};     
 
 #endif // __EXCLUDE_H__