Changes in src/molecule_pointcloud.cpp [c72112:71b20e]

File:

• src/molecule_pointcloud.cpp (modified) (2 diffs)

src/molecule_pointcloud.cpp

@@ -8 +8 @@
 #include "atom.hpp"
 #include "config.hpp"
-#include "info.hpp"
 #include "memoryallocator.hpp"
 #include "molecule.hpp"
@@ -32 +31 @@
 };
 
-
-/** PointCloud implementation of GoPoint
- * Uses atoms and STL stuff.
+/** Return current atom in the list.
+ * \return pointer to atom or NULL if none present
  */
-TesselPoint* molecule::GetPoint() const
+TesselPoint *molecule::GetPoint() const
 {
-  Info FunctionInfo(__func__);
-  return (*InternalPointer);
+  if ((InternalPointer != start) && (InternalPointer != end))
+    return InternalPointer;
+  else
+    return NULL;
 };
 
-/** PointCloud implementation of GoToNext.
- * Uses atoms and STL stuff.
+/** Return pointer to one after last atom in the list.
+ * \return pointer to end marker
+ */
+TesselPoint *molecule::GetTerminalPoint() const
+{
+  return end;
+};
+
+/** Return the greatest index of all atoms in the list.
+ * \return greatest index
+ */
+int molecule::GetMaxId() const
+{
+  return last_atom;
+};
+
+/** Go to next atom.
+ * Stops at last one.
  */
 void molecule::GoToNext() const
 {
-  Info FunctionInfo(__func__);
-  if (InternalPointer != atoms.end())
-    InternalPointer++;
+  if (InternalPointer != end)
+    InternalPointer = InternalPointer->next;
 };
 
-/** PointCloud implementation of GoToFirst.
- * Uses atoms and STL stuff.
+/** Go to previous atom.
+ * Stops at first one.
+ */
+void molecule::GoToPrevious() const
+{
+  if (InternalPointer->previous != start)
+    InternalPointer = InternalPointer->previous;
+};
+
+/** Goes to first atom.
  */
 void molecule::GoToFirst() const
 {
-  Info FunctionInfo(__func__);
-  InternalPointer = atoms.begin();
+  InternalPointer = start->next;
 };
 
-/** PointCloud implementation of IsEmpty.
- * Uses atoms and STL stuff.
+/** Goes to last atom.
+ */
+void molecule::GoToLast() const
+{
+  InternalPointer = end->previous;
+};
+
+/** Checks whether we have any atoms in molecule.
+ * \return true - no atoms, false - not empty
  */
 bool molecule::IsEmpty() const
 {
-  Info FunctionInfo(__func__);
-  return (empty());
+  return (start->next == end);
 };
 
-/** PointCloud implementation of IsLast.
- * Uses atoms and STL stuff.
+/** Checks whether we are at the last atom
+ * \return true - current atom is last one, false - is not last one
  */
 bool molecule::IsEnd() const
 {
-  Info FunctionInfo(__func__);
-  return (InternalPointer == atoms.end());
+  return (InternalPointer == end);
 };
-
-int molecule::GetMaxId() const {
-  return getAtomCount();
-}