Changeset 02ce36 for src


Ignore:
Timestamp:
Jan 2, 2012, 1:00:04 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:
d82961
Parents:
b3fb31
git-author:
Frederik Heber <heber@…> (01/02/12 12:57:32)
git-committer:
Frederik Heber <heber@…> (01/02/12 13:00:04)
Message:

We now require CodePatterns 1.2.0.

  • this is due to the updated Observer structure and multi_array MemDebug bugfix.
Location:
src
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Process.hpp

    rb3fb31 r02ce36  
    2222#include <set>
    2323
    24 #include "CodePatterns/Observer.hpp"
     24#include "CodePatterns/Observer/Observable.hpp"
     25#include "CodePatterns/Observer/Observer.hpp"
    2526#include "Actions/Action.hpp"
    2627

  • src/Atom/atom_observable.cpp

    rb3fb31 r02ce36  
    3030  Observable("Atom")
    3131{
    32   NotificationChannels = new Channels(this);
     32  Channels *OurChannel = new Channels;
     33  NotificationChannels.insert( std::make_pair(this, OurChannel) );
    3334  // add instance for each notification type
    3435  for (size_t type = 0; type < NotificationType_MAX; ++type)
    35     NotificationChannels->addChannel(type);
     36    OurChannel->addChannel(type);
    3637}
    3738
    3839AtomObservable::~AtomObservable()
    3940{
    40   delete NotificationChannels;
     41  std::map<Observable *, Channels*>::iterator iter = NotificationChannels.find(this);
     42  delete iter->second;
     43  NotificationChannels.erase(iter);
    4144}

  • src/Atom/atom_observable.hpp

    rb3fb31 r02ce36  
    1414#endif
    1515
    16 #include "CodePatterns/Observer.hpp"
     16#include "CodePatterns/Observer/Channels.hpp"
     17#include "CodePatterns/Observer/Observable.hpp"
    1718
    1819#include <map>

  • src/Descriptors/AtomDescriptor.cpp

    rb3fb31 r02ce36  
    2525#include "World.hpp"
    2626#include "Atom/atom.hpp"
    27 #include "CodePatterns/ObservedContainer_impl.hpp"
     27#include "CodePatterns/Observer/ObservedContainer_impl.hpp"
    2828
    2929#include <boost/bind.hpp>

  • src/Descriptors/AtomIdDescriptor.cpp

    rb3fb31 r02ce36  
    2424
    2525#include "Atom/atom.hpp"
    26 #include "CodePatterns/ObservedContainer_impl.hpp"
     26#include "CodePatterns/Observer/ObservedContainer_impl.hpp"
    2727
    2828using namespace std;

  • src/Descriptors/MoleculeDescriptor.cpp

    rb3fb31 r02ce36  
    2424
    2525#include "World.hpp"
    26 #include "CodePatterns/ObservedContainer_impl.hpp"
     26#include "CodePatterns/Observer/ObservedContainer_impl.hpp"
    2727
    2828#include "molecule.hpp"

  • src/Descriptors/MoleculeIdDescriptor.cpp

    rb3fb31 r02ce36  
    2323#include "MoleculeIdDescriptor_impl.hpp"
    2424
    25 #include "CodePatterns/ObservedContainer_impl.hpp"
     25#include "CodePatterns/Observer/ObservedContainer_impl.hpp"
    2626
    2727#include "molecule.hpp"

  • src/Descriptors/MoleculePtrDescriptor.cpp

    rb3fb31 r02ce36  
    2323#include "MoleculePtrDescriptor_impl.hpp"
    2424
    25 #include "CodePatterns/ObservedContainer_impl.hpp"
     25#include "CodePatterns/Observer/ObservedContainer_impl.hpp"
    2626
    2727#include "molecule.hpp"

  • src/MoleculeListClass.hpp

    rb3fb31 r02ce36  
    1717#include <string>
    1818
    19 #include "CodePatterns/Observer.hpp"
    20 #include "CodePatterns/ObservedIterator.hpp"
     19#include "CodePatterns/Observer/Observable.hpp"
     20#include "CodePatterns/Observer/ObservedIterator.hpp"
    2121#include "CodePatterns/Cacheable.hpp"
    2222

  • src/Parser/ChangeTracker.hpp

    rb3fb31 r02ce36  
    1515
    1616
    17 #include "CodePatterns/Observer.hpp"
     17#include "CodePatterns/Observer/Observer.hpp"
    1818#include "World.hpp"
    1919

  • src/Parser/FormatParser_common.cpp

    rb3fb31 r02ce36  
    2222#include <iostream>
    2323
    24 #include "CodePatterns/Observer.hpp"
     24#include "CodePatterns/Observer/Notification.hpp"
    2525#include "World.hpp"
    2626#include "ChangeTracker.hpp"
    … …  
    3838  parameters = _parameters;
    3939  ChangeTracker::getInstance().signOn(this);
    40   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
    41   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomRemoved));
     40  World::getInstance().signOn(this, World::AtomInserted);
     41  World::getInstance().signOn(this, World::AtomRemoved);
    4242}
    4343
    … …  
    4848{
    4949  ChangeTracker::getInstance().signOff(this);
    50   World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomInserted));
    51   World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomRemoved));
     50  World::getInstance().signOff(this, World::AtomInserted);
     51  World::getInstance().signOff(this, World::AtomRemoved);
    5252  if (parameters != NULL)
    5353    delete parameters;

  • src/Parser/FormatParser_common.hpp

    rb3fb31 r02ce36  
    1616#include <iosfwd>
    1717
    18 #include "CodePatterns/Observer.hpp"
     18#include "CodePatterns/Observer/Observer.hpp"
    1919#include "FormatParserInterface.hpp"
    2020#include "FormatParser_Parameters.hpp"

  • src/UIElements/CommandLineUI/CommandLineStatusIndicator.cpp

    rb3fb31 r02ce36  
    2525
    2626#include "Actions/Process.hpp"
     27#include "CodePatterns/Observer/Observable.hpp"
    2728
    2829using namespace MoleCuilder;

  • src/UIElements/CommandLineUI/CommandLineStatusIndicator.hpp

    rb3fb31 r02ce36  
    1515
    1616
    17 #include "CodePatterns/Observer.hpp"
     17#include "CodePatterns/Observer/Observer.hpp"
     18
     19class Observable;
    1820
    1921class CommandLineStatusIndicator : public Observer

  • src/UIElements/TextUI/TextStatusIndicator.hpp

    rb3fb31 r02ce36  
    1515
    1616
    17 #include "CodePatterns/Observer.hpp"
     17#include "CodePatterns/Observer/Observer.hpp"
    1818
    1919class TextStatusIndicator : public Observer

  • src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp

    rb3fb31 r02ce36  
    2828#include "CodePatterns/Assert.hpp"
    2929#include "CodePatterns/Log.hpp"
     30#include "CodePatterns/Observer/Notification.hpp"
    3031
    3132#include "Descriptors/AtomIdDescriptor.hpp"
    … …  
    4748{
    4849  // sign on as observer (obtain non-const instance before)
    49   atomref->signOn(this, atomref->getChannel(AtomObservable::IndexChanged));
    50   atomref->signOn(this, atomref->getChannel(AtomObservable::PositionChanged));
    51   atomref->signOn(this, atomref->getChannel(AtomObservable::ElementChanged));
    52   atomref->signOn(this, atomref->getChannel(AtomObservable::BondsChanged));
     50  atomref->signOn(this, AtomObservable::IndexChanged);
     51  atomref->signOn(this, AtomObservable::PositionChanged);
     52  atomref->signOn(this, AtomObservable::ElementChanged);
     53  atomref->signOn(this, AtomObservable::BondsChanged);
    5354
    5455  // set the object's id
    … …  
    6263GLMoleculeObject_atom::~GLMoleculeObject_atom()
    6364{
    64   _atom->signOff(this, _atom->getChannel(AtomObservable::IndexChanged));
    65   _atom->signOff(this, _atom->getChannel(AtomObservable::PositionChanged));
    66   _atom->signOff(this, _atom->getChannel(AtomObservable::ElementChanged));
    67   _atom->signOff(this, _atom->getChannel(AtomObservable::BondsChanged));
     65  _atom->signOff(this, AtomObservable::IndexChanged);
     66  _atom->signOff(this, AtomObservable::PositionChanged);
     67  _atom->signOff(this, AtomObservable::ElementChanged);
     68  _atom->signOff(this, AtomObservable::BondsChanged);
    6869}
    6970

  • src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp

    rb3fb31 r02ce36  
    1616#include "GLMoleculeObject.hpp"
    1717
    18 #include "CodePatterns/Observer.hpp"
     18#include "CodePatterns/Observer/Observer.hpp"
    1919
    2020#include "Atom/atom.hpp"

  • src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

    rb3fb31 r02ce36  
    2727
    2828#include "CodePatterns/Log.hpp"
     29#include "CodePatterns/Observer/Notification.hpp"
    2930
    3031#include "World.hpp"
    … …  
    4546  // sign on to changes in the world
    4647  World::getInstance().signOn(this);
    47   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
    48   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomRemoved));
     48  World::getInstance().signOn(this, World::AtomInserted);
     49  World::getInstance().signOn(this, World::AtomRemoved);
    4950}
    5051
    … …  
    5253{
    5354  World::getInstance().signOff(this);
    54   World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomInserted));
    55   World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomRemoved));
     55  World::getInstance().signOff(this, World::AtomInserted);
     56  World::getInstance().signOff(this, World::AtomRemoved);
    5657  delete worldscene;
    5758}

  • src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp

    rb3fb31 r02ce36  
    1616#include <Qt3D/qglview.h>
    1717
    18 #include "CodePatterns/Observer.hpp"
     18#include "CodePatterns/Observer/Observer.hpp"
    1919
    2020#include "World.hpp"
    … …  
    6161
    6262
    63 //#include "CodePatterns/Observer.hpp"
     63//#include "CodePatterns/Observer/Observer.hpp"
    6464//#include "LinearAlgebra/Vector.hpp"
    6565//#include "changetypes.hpp"

  • src/UIElements/Views/Qt4/QtMoleculeView.hpp

    rb3fb31 r02ce36  
    1717#include <string>
    1818#include <QtGui/QTabWidget>
    19 #include "CodePatterns/Observer.hpp"
     19#include "CodePatterns/Observer/Observer.hpp"
    2020
    2121class molecule;

  • src/UIElements/Views/Qt4/QtStatusBar.hpp

    rb3fb31 r02ce36  
    2020#include <QtGui/QStatusBar>
    2121
    22 #include "CodePatterns/Observer.hpp"
     22#include "CodePatterns/Observer/Observer.hpp"
    2323
    2424class QLabel;

  • src/UIElements/Views/Qt4/QtWorldView.hpp

    rb3fb31 r02ce36  
    1616
    1717#include <QtGui/QTableWidget>
    18 #include "CodePatterns/Observer.hpp"
     18#include "CodePatterns/Observer/Observer.hpp"
    1919
    2020class molecule;

  • src/World.cpp

    rb3fb31 r02ce36  
    4848
    4949#include "CodePatterns/Singleton_impl.hpp"
    50 #include "CodePatterns/ObservedContainer_impl.hpp"
     50#include "CodePatterns/Observer/Channels.hpp"
     51#include "CodePatterns/Observer/ObservedContainer_impl.hpp"
    5152
    5253using namespace MoleCuilder;
    … …  
    635636  cell_size->setM(domain);
    636637  defaultName = "none";
    637   NotificationChannels = new Channels(this);
     638  Channels *OurChannel = new Channels;
     639  NotificationChannels.insert( std::make_pair( this, OurChannel) );
    638640  for (size_t type = 0; type < (size_t)NotificationType_MAX; ++type)
    639     NotificationChannels->addChannel(type);
     641    OurChannel->addChannel(type);
    640642  molecules_deprecated->signOn(this);
    641643}
    … …  
    658660
    659661  // empty notifications
    660   delete NotificationChannels;
     662  std::map<Observable *, Channels*>::iterator iter = NotificationChannels.find(this);
     663  ASSERT(iter != NotificationChannels.end(),
     664      "World::~World() - cannot find our Channels in NotificationChannels.");
     665  delete iter->second;
     666  NotificationChannels.erase(iter);
    661667
    662668  delete BG;

  • src/World.hpp

    rb3fb31 r02ce36  
    2626#include "Atom/AtomSet.hpp"
    2727#include "Descriptors/SelectiveIterator.hpp"
    28 #include "CodePatterns/Observer.hpp"
     28#include "CodePatterns/Observer/Observable.hpp"
     29#include "CodePatterns/Observer/Observer.hpp"
    2930#include "CodePatterns/Cacheable.hpp"
    3031#include "CodePatterns/Singleton.hpp"
    31 #include "CodePatterns/ObservedContainer.hpp"
     32#include "CodePatterns/Observer/ObservedContainer.hpp"
    3233#include "CodePatterns/Range.hpp"
    3334#include "IdPool.hpp"

  • src/molecule.hpp

    rb3fb31 r02ce36  
    2626
    2727#include "Atom/AtomSet.hpp"
    28 #include "CodePatterns/Observer.hpp"
    29 #include "CodePatterns/ObservedIterator.hpp"
    3028#include "CodePatterns/Cacheable.hpp"
     29#include "CodePatterns/Observer/Observable.hpp"
     30#include "CodePatterns/Observer/ObservedIterator.hpp"
    3131#include "Descriptors/AtomIdDescriptor.hpp"
    3232#include "Fragmentation/HydrogenSaturation_enum.hpp"
Note: See TracChangeset for help on using the changeset viewer.