Changes in src/Descriptors/AtomDescriptor_impl.hpp [24a5e0:7a1ce5]

File:

• src/Descriptors/AtomDescriptor_impl.hpp (modified) (7 diffs)

src/Descriptors/AtomDescriptor_impl.hpp

@@ -1 @@
-#ifndef ATOMDESCRIPTOR_IMPL_HPP
-#define ATOMDESCRIPTOR_IMPL_HPP
-
 #include "Descriptors/AtomDescriptor.hpp"
 
@@ -14 +11 @@
   virtual ~AtomDescriptor_impl();
 
-  virtual bool predicate(std::pair<atomId_t,atom*>)=0;
+  virtual bool predicate(std::pair<int,atom*>)=0;
 
 protected:
   virtual atom* find();
   virtual std::vector<atom*> findAll();
-  World::AtomSet& getAtoms();
+  std::map<int,atom*>& getAtoms();
 };
 
@@ -28 +25 @@
   AtomAllDescriptor_impl();
   virtual ~AtomAllDescriptor_impl();
-  virtual bool predicate(std::pair<atomId_t,atom*>);
+  virtual bool predicate(std::pair<int,atom*>);
 };
 
@@ -35 +32 @@
   AtomNoneDescriptor_impl();
   virtual ~AtomNoneDescriptor_impl();
-  virtual bool predicate(std::pair<atomId_t,atom*>);
+  virtual bool predicate(std::pair<int,atom*>);
 };
 
@@ -45 +42 @@
   AtomAndDescriptor_impl(AtomDescriptor::impl_ptr _lhs, AtomDescriptor::impl_ptr _rhs);
   ~AtomAndDescriptor_impl();
-  virtual bool predicate(std::pair<atomId_t,atom*>);
+  virtual bool predicate(std::pair<int,atom*>);
 
 private:
@@ -57 +54 @@
   AtomOrDescriptor_impl(AtomDescriptor::impl_ptr _lhs, AtomDescriptor::impl_ptr _rhs);
   virtual ~AtomOrDescriptor_impl();
-  virtual bool predicate(std::pair<atomId_t,atom*>);
+  virtual bool predicate(std::pair<int,atom*>);
 
 private:
@@ -70 +67 @@
   virtual ~AtomNotDescriptor_impl();
 
-  virtual bool predicate(std::pair<atomId_t,atom*>);
+  virtual bool predicate(std::pair<int,atom*>);
 
 private:
   AtomDescriptor::impl_ptr arg;
 };
-
-#endif //ATOMDESCRIPTOR_IMPL_HPP