Changeset 84b811 for molecuilder/src/config.hpp

Timestamp:

Aug 20, 2009, 7:48:07 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5f4960, 6c6d84

Parents:

78dac6 (diff), d6b011 (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.

git-author:

Frederik Heber <heber@…> (08/19/09 14:40:33)

git-committer:

Frederik Heber <heber@…> (08/20/09 07:48:07)

Message:

Merge branch 'ConcaveHull' of ​ssh://stud64d-02/home/metzler/workspace/espack into Ticket14

Conflicts:

molecuilder/src/boundary.cpp
molecuilder/src/tesselation.cpp

• in boundary.cpp: FindConvexBorder() - overlay due to PickFarthestofTwoBaselines()
• in tesselation.cpp: CheckConvexityCriterion() - overlay due to verbosity change on return, getAngle() -> GetAngle()

File:

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

molecuilder/src/config.hpp

@@ -18 +18 @@
 #include "molecules.hpp"
 #include "periodentafel.hpp"
+
+class ConfigFileBuffer {
+  public:
+    char **buffer;
+    int *LineMapping;
+    int CurrentLine;
+    int NoLines;
+
+    ConfigFileBuffer();
+    ConfigFileBuffer(char *filename);
+    ~ConfigFileBuffer();
+
+    void InitMapping();
+    void MapIonTypesInBuffer(int NoAtoms);
+};
 
 /** The config file.