Changeset bf497f for molecuilder/src/builder.cpp

Timestamp:

Oct 5, 2009, 2:59:11 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5dda23, 729279, 8afe31

Parents:

7794d8 (diff), 39d983 (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://stud64d-02/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/memoryusageobserver.cpp
molecuilder/src/memoryusageobserver.hpp
molecuilder/src/memoryusageobserverunittest.cpp
molecuilder/src/memoryusageobserverunittest.hpp

This conflict arised, because the #19 commit was already pushed to the server, but the commit was later "amended" locally. This is fixed, there were no real overlaps anyway.

File:

• molecuilder/src/builder.cpp (modified) (2 diffs)

molecuilder/src/builder.cpp

@@ -2017 +2017 @@
       delete(molecules); // also free's all molecules contained
       delete(periode);
-      return j;
+      cout << Verbose(0) <<  "Maximum of allocated memory: "
+        << MemoryUsageObserver::getInstance()->getMaximumUsedMemory() << endl;
+      cout << Verbose(0) <<  "Remaining non-freed memory: "
+        << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
+     return j;
       break;
     case 1:  // just for -v and -h options
       delete(molecules); // also free's all molecules contained
       delete(periode);
+      cout << Verbose(0) <<  "Maximum of allocated memory: "
+        << MemoryUsageObserver::getInstance()->getMaximumUsedMemory() << endl;
       cout << Verbose(0) <<  "Remaining non-freed memory: "
         << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
@@ -2123 +2129 @@
   delete(periode);
 
+  cout << Verbose(0) <<  "Maximum of allocated memory: "
+    << MemoryUsageObserver::getInstance()->getMaximumUsedMemory() << endl;
   cout << Verbose(0) <<  "Remaining non-freed memory: "
     << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;