Changeset 36166d

Timestamp:

Jul 2, 2010, 1:09:37 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

986ed3

Parents:

5ec8e3

Message:

Removed left over parts from old memory-tracker

Location:

src

Files:

• Actions/AnalysisAction/PairCorrelationAction.cpp (modified) (1 diff)
• Actions/MoleculeAction/BondFileAction.cpp (modified) (1 diff)
• Actions/MoleculeAction/SuspendInWaterAction.cpp (modified) (1 diff)
• ConfigFileBuffer.cpp (modified) (1 diff)
• Parser/PcpParser.cpp (modified) (1 diff)
• UIElements/Dialog.cpp (modified) (1 diff)
• UIElements/QT4/QTMainWindow.cpp (modified) (1 diff)
• analysis_bonds.cpp (modified) (1 diff)
• analysis_correlation.cpp (modified) (1 diff)
• analysis_correlation.hpp (modified) (1 diff)
• analyzer.cpp (modified) (1 diff)
• atom.cpp (modified) (2 diffs)
• atom_graphnodeinfo.cpp (modified) (1 diff)
• atom_particleinfo.cpp (modified) (1 diff)
• bond.cpp (modified) (1 diff)
• bondgraph.cpp (modified) (1 diff)
• boundary.cpp (modified) (2 diffs)
• builder.cpp (modified) (1 diff)
• config.cpp (modified) (1 diff)
• datacreator.cpp (modified) (1 diff)
• graph.cpp (modified) (1 diff)
• helpers.cpp (modified) (1 diff)
• helpers.hpp (modified) (1 diff)
• joiner.cpp (modified) (1 diff)
• linkedcell.cpp (modified) (1 diff)
• memoryallocator.cpp (deleted)
• memoryallocator.hpp (deleted)
• memoryusageobserver.cpp (deleted)
• memoryusageobserver.hpp (deleted)
• molecule.cpp (modified) (1 diff)
• molecule.hpp (modified) (2 diffs)
• molecule_dynamics.cpp (modified) (1 diff)
• molecule_fragmentation.cpp (modified) (2 diffs)
• molecule_geometry.cpp (modified) (1 diff)
• molecule_graph.cpp (modified) (2 diffs)
• molecule_pointcloud.cpp (modified) (1 diff)
• moleculelist.cpp (modified) (1 diff)
• parser.cpp (modified) (1 diff)
• stackclass.hpp (modified) (1 diff)
• tesselation.cpp (modified) (1 diff)
• triangleintersectionlist.cpp (modified) (1 diff)
• unittests/ActOnAllUnitTest.cpp (modified) (1 diff)
• unittests/Makefile.am (modified) (5 diffs)
• unittests/tesselation_insideoutsideunittest.cpp (modified) (1 diff)
• unittests/vectorunittest.cpp (modified) (1 diff)

src/Actions/AnalysisAction/PairCorrelationAction.cpp

@@ -12 +12 @@
 #include "boundary.hpp"
 #include "linkedcell.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "element.hpp"

src/Actions/MoleculeAction/BondFileAction.cpp

@@ -24 +24 @@
 #include "config.hpp"
 #include "defs.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"

src/Actions/MoleculeAction/SuspendInWaterAction.cpp

@@ -22 +22 @@
 #include "boundary.hpp"
 #include "config.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "config.hpp"

src/ConfigFileBuffer.cpp

@@ -9 +9 @@
 #include "helpers.hpp"
 #include "lists.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "World.hpp"

src/Parser/PcpParser.cpp

@@ -7 +7 @@
 
 #include <iostream>
+#include <iomanip>
 
 #include "atom.hpp"

src/UIElements/Dialog.cpp

@@ -10 +10 @@
 #include "Dialog.hpp"
 
+#include "verbose.hpp"
 #include "atom.hpp"
 #include "element.hpp"

src/UIElements/QT4/QTMainWindow.cpp

@@ -21 +21 @@
 #include "atom.hpp"
 #include "molecule.hpp"
+#include "verbose.hpp"
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"

src/analysis_bonds.cpp

@@ -13 +13 @@
 #include "element.hpp"
 #include "info.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"

src/analysis_correlation.cpp

@@ -9 +9 @@
 
 #include <iostream>
+#include <iomanip>
 
 #include "analysis_correlation.hpp"

src/analysis_correlation.hpp

@@ -26 +26 @@
 
 #include "atom.hpp"
+#include "verbose.hpp"
 
 /****************************************** forward declarations *****************************/

src/analyzer.cpp

@@ -14 +14 @@
 #include "datacreator.hpp"
 #include "helpers.hpp"
-#include "memoryallocator.hpp"
 #include "parser.hpp"
 #include "periodentafel.hpp"
+#include "verbose.hpp"
 
 // include config.h

src/atom.cpp

@@ -12 +12 @@
 #include "element.hpp"
 #include "lists.hpp"
-#include "memoryallocator.hpp"
 #include "parser.hpp"
 #include "vector.hpp"
@@ -18 +17 @@
 #include "molecule.hpp"
 #include "Shapes/Shape.hpp"
+
+#include <iomanip>
 
 /************************************* Functions for class atom *************************************/

src/atom_graphnodeinfo.cpp

@@ -9 +9 @@
 
 #include "atom_graphnodeinfo.hpp"
-#include "memoryallocator.hpp"
 
 /** Constructor of class GraphNodeInfo.

src/atom_particleinfo.cpp

@@ -9 +9 @@
 
 #include "atom_particleinfo.hpp"
-#include "memoryallocator.hpp"
 
 /** Constructor of ParticleInfo.

src/bond.cpp

@@ -7 +7 @@
 #include "Helpers/MemDebug.hpp"
 
+#include "verbose.hpp"
 #include "atom.hpp"
 #include "bond.hpp"

src/bondgraph.cpp

@@ -15 +15 @@
 #include "element.hpp"
 #include "info.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"

src/boundary.cpp

@@ -15 +15 @@
 #include "info.hpp"
 #include "linkedcell.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 #include "tesselation.hpp"
@@ -24 +24 @@
 #include "Matrix.hpp"
 #include "Box.hpp"
+
+#include <iomanip>
 
 #include<gsl/gsl_poly.h>

src/builder.cpp

@@ -60 +60 @@
 #include "config.hpp"
 #include "log.hpp"
-#include "memoryusageobserver.hpp"
 #include "molecule.hpp"
 #include "periodentafel.hpp"

src/config.cpp

@@ -19 +19 @@
 #include "info.hpp"
 #include "lists.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 #include "periodentafel.hpp"

src/datacreator.cpp

@@ -12 +12 @@
 #include "helpers.hpp"
 #include "parser.hpp"
+#include "verbose.hpp"
+
+#include <iomanip>
 
 //=========================== FUNCTIONS============================

src/graph.cpp

@@ -13 +13 @@
 #include "config.hpp"
 #include "graph.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"

src/helpers.cpp

@@ -8 +8 @@
 #include "helpers.hpp"
 #include "Helpers/fast_functions.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
-#include "memoryusageobserver.hpp"
 
 /********************************************** helpful functions *********************************/

src/helpers.hpp

@@ -20 +20 @@
 #include "defs.hpp"
 #include "log.hpp"
-#include "memoryallocator.hpp"
 
 /********************************************** definitions *********************************/

src/joiner.cpp

@@ -14 +14 @@
 #include "datacreator.hpp"
 #include "helpers.hpp"
-#include "memoryallocator.hpp"
 #include "parser.hpp"
 #include "periodentafel.hpp"
+#include "verbose.hpp"
 
 //============================== MAIN =============================

src/linkedcell.cpp

@@ -10 +10 @@
 #include "helpers.hpp"
 #include "linkedcell.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"

src/molecule.cpp

@@ -23 +23 @@
 #include "log.hpp"
 #include "molecule.hpp"
-#include "memoryallocator.hpp"
+
 #include "periodentafel.hpp"
 #include "stackclass.hpp"

src/molecule.hpp

@@ -31 +31 @@
 #include "types.hpp"
 #include "graph.hpp"
-#include "stackclass.hpp"
 #include "tesselation.hpp"
 #include "Patterns/Observer.hpp"
@@ -54 +53 @@
 class Vector;
 class Shape;
+template <class> class StackClass;
 
 /******************************** Some definitions for easier reading **********************************/

src/molecule_dynamics.cpp

@@ -13 +13 @@
 #include "element.hpp"
 #include "info.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 #include "parser.hpp"

src/molecule_fragmentation.cpp

@@ -17 +17 @@
 #include "helpers.hpp"
 #include "lists.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 #include "periodentafel.hpp"
@@ -24 +24 @@
 #include "Matrix.hpp"
 #include "Box.hpp"
+#include "stackclass.hpp"
 
 /************************************* Functions for class molecule *********************************/

src/molecule_geometry.cpp

@@ -14 +14 @@
 #include "helpers.hpp"
 #include "leastsquaremin.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 #include "World.hpp"

src/molecule_graph.cpp

@@ -18 +18 @@
 #include "linkedcell.hpp"
 #include "lists.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 #include "World.hpp"
@@ -26 +26 @@
 #include "Matrix.hpp"
 #include "Box.hpp"
-
+#include "stackclass.hpp"
 
 struct BFSAccounting

src/molecule_pointcloud.cpp

@@ -11 +11 @@
 #include "config.hpp"
 #include "info.hpp"
-#include "memoryallocator.hpp"
 #include "molecule.hpp"
 

src/moleculelist.cpp

@@ -19 +19 @@
 #include "linkedcell.hpp"
 #include "lists.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"
-#include "memoryallocator.hpp"
 #include "periodentafel.hpp"
 #include "Helpers/Assert.hpp"
 #include "Matrix.hpp"
 #include "Box.hpp"
+#include "stackclass.hpp"
 
 #include "Helpers/Assert.hpp"

src/parser.cpp

@@ -12 +12 @@
 
 #include "helpers.hpp"
-#include "memoryallocator.hpp"
 #include "parser.hpp"
+#include "verbose.hpp"
 
 // include config.h

src/stackclass.hpp

@@ -12 +12 @@
 
 #include "verbose.hpp"
-#include "memoryallocator.hpp"
+#include "log.hpp"
 
 /****************************************** forward declarations *****************************/

src/tesselation.cpp

@@ -9 +9 @@
 
 #include <fstream>
+#include <iomanip>
 
 #include "helpers.hpp"

src/triangleintersectionlist.cpp

@@ -16 +16 @@
 #include "tesselation.hpp"
 #include "vector.hpp"
+#include "verbose.hpp"
 
 /** Constructor for class TriangleIntersectionList.

src/unittests/ActOnAllUnitTest.cpp

@@ -14 +14 @@
 #include "../test/ActOnAlltest.hpp"
 #include "ActOnAllUnitTest.hpp"
-#include "memoryallocator.hpp"
 #include "vector.hpp"
 

src/unittests/Makefile.am

@@ -31 +31 @@
   LogUnitTest \
   manipulateAtomsTest \
-  MemoryUsageObserverUnitTest \
-  MemoryAllocatorUnitTest \
   MoleculeDescriptorTest \
   ObserverTest \
@@ -77 +75 @@
   logunittest.cpp \
   manipulateAtomsTest.cpp \
-  memoryallocatorunittest.cpp  \
-  memoryusageobserverunittest.cpp \
   MoleculeDescriptorTest.cpp \
   ObserverTest.cpp \
@@ -114 +110 @@
   logunittest.hpp \
   manipulateAtomsTest.hpp \
-  memoryallocatorunittest.hpp  \
-  memoryusageobserverunittest.hpp \
   MoleculeDescriptorTest.hpp \
   periodentafelTest.hpp \
@@ -191 +185 @@
 manipulateAtomsTest_LDADD = ${ALLLIBS}
 
-MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp ../memoryallocator.hpp ../memoryallocator.cpp ../memoryusageobserver.cpp ../memoryusageobserver.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp 
-MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
-
-MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp ../memoryallocator.hpp ../memoryusageobserver.cpp ../memoryusageobserver.hpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp 
-MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
-
 MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
 MoleculeDescriptorTest_LDADD = ${ALLLIBS}
@@ -230 +218 @@
 Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
 
-TestRunner_SOURCES = TestRunnerMain.cpp ../memoryallocator.hpp ../memoryallocator.cpp ../memoryusageobserver.cpp ../memoryusageobserver.hpp $(TESTSOURCES) $(TESTHEADERS)
+TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
 TestRunner_LDADD = ${ALLLIBS}
 

src/unittests/tesselation_insideoutsideunittest.cpp

@@ -17 +17 @@
 #include "tesselation.hpp"
 #include "tesselation_insideoutsideunittest.hpp"
+#include "verbose.hpp"
 
 #ifdef HAVE_TESTRUNNER

src/unittests/vectorunittest.cpp

@@ -15 +15 @@
 #include "defs.hpp"
 #include "log.hpp"
-#include "memoryusageobserver.hpp"
 #include "vector.hpp"
 #include "vector_ops.hpp"