Changeset 0e2190 for molecuilder/src/molecules.hpp

Timestamp:

Aug 3, 2009, 6:58:46 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

f4a346

Parents:

4e4940 (diff), e8de2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ConcaveHull' of ​ssh://heber@192.168.194.2/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/atom.cpp
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/molecules.hpp
molecuilder/src/vector.hpp

• added Saskia Metzler's code that finds whether a point is in- or outside.
• The code is not yet incorporated, but I rather want to continue with merging TesselationRefactoring first.

File:

• molecuilder/src/molecules.hpp (modified) (1 diff)

molecuilder/src/molecules.hpp

@@ -156 +156 @@
   bool OutputXYZLine(ofstream *out) const;
   atom *GetTrueFather();
-  bool Compare(atom &ptr);
+  bool Compare(const atom &ptr);
 
   private: