Changeset 360c8b for src/Parser/FormatParser_common.cpp

Timestamp:

Oct 20, 2011, 10:42:16 PM (14 years ago)

Author:

Frederik Heber <heber@…>

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, Candidate_v1.7.0, 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:

f94953

Parents:

fa9d1d (diff), 752bb4 (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@…> (10/20/11 22:40:59)

git-committer:

Frederik Heber <heber@…> (10/20/11 22:42:16)

Message:

Merge branch 'Adding_Psi3Parser' into stable

Conflicts:

src/Parser/FormatParser.hpp
src/Parser/unittests/ParserTremoloUnitTest.cpp

Issues:

• Element and periodentafel have been moved to folder src/Element.

File:

• src/Parser/FormatParser_common.cpp (moved) (moved from src/Parser/FormatParser.cpp ) (9 diffs)

src/Parser/FormatParser_common.cpp

@@ -7 +7 @@
 
 /*
- * FormatParser.cpp
+ * FormatParser_common_common.cpp
  *
  *  Created on: Mar 1, 2010
@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "FormatParser.hpp"
 #include <iostream>
+
+#include "CodePatterns/Observer.hpp"
+#include "World.hpp"
+#include "ChangeTracker.hpp"
+#include "FormatParser_common.hpp"
 
 using namespace std;
@@ -28 +32 @@
  * Constructor.
  */
-FormatParser::FormatParser() :
-  Observer("FormatParser"),
-  parameters(NULL),
-  saveStream(NULL)
+FormatParser_common::FormatParser_common(FormatParser_Parameters *_parameters) :
+  Observer("FormatParser_common")
 {
+  parameters = _parameters;
   ChangeTracker::getInstance().signOn(this);
   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
@@ -41 +44 @@
  * Destructor.
  */
-FormatParser::~FormatParser() {
+FormatParser_common::~FormatParser_common() 
+{
   ChangeTracker::getInstance().signOff(this);
   World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomInserted));
   World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomRemoved));
+  if (parameters != NULL)
+    delete parameters;
 }
 
@@ -51 +57 @@
  * change tracker here).
  */
-void FormatParser::update(Observable *publisher) {
+void FormatParser_common::update(Observable *publisher) {
   if (!saveStream) {
     cerr << "Please invoke setOstream() so the parser knows where to save the World's data." << endl;
@@ -64 +70 @@
  * With this, each format parser is informed about specific changes in the World.
  */
-void FormatParser::recieveNotification(Observable *publisher, Notification_ptr notification) {
+void FormatParser_common::recieveNotification(Observable *publisher, Notification_ptr notification) {
   switch (notification->getChannelNo()) {
     case World::AtomInserted:
@@ -74 +80 @@
     default:
       ASSERT(0,
-          "FormatParser::recieveNotification() - unknown notification "
+          "FormatParser_common::recieveNotification() - unknown notification "
           +toString(notification->getChannelNo())+" received.");
       break;
@@ -83 +89 @@
  * The observable can tell when it dies.
  */
-void FormatParser::subjectKilled(Observable *publisher) {}
-
+void FormatParser_common::subjectKilled(Observable *publisher) {}
 
 /**
@@ -92 +97 @@
  * \param ostream where to save the World's state
  */
-void FormatParser::setOstream(ostream* output) {
+void FormatParser_common::setOstream(ostream* output) {
   saveStream = output;
 }