Changeset 865a945
- Timestamp:
- Feb 18, 2010, 1:21:35 PM (15 years ago)
- 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:
- b2cfdb
- Parents:
- 7dad10
- Location:
- src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified src/Descriptors/AtomDescriptor.hpp ¶
r7dad10 r865a945 15 15 #include "World.hpp" 16 16 17 class World; 17 18 class atom; 18 19 … … 21 22 22 23 class AtomDescriptor { 24 // close coupling to the world to allow access 23 25 friend atom* World::getAtom(AtomDescriptor descriptor); 24 26 friend std::vector<atom*> World::getAllAtoms(AtomDescriptor descriptor); 27 friend class World::AtomIterator; 25 28 26 29 friend AtomDescriptor operator&&(const AtomDescriptor &lhs, const AtomDescriptor &rhs); -
TabularUnified src/Descriptors/AtomDescriptor_impl.hpp ¶
r7dad10 r865a945 1 #include "Descriptors/AtomDescriptor.hpp"2 3 1 /************************ Declarations of implementation Objects ************************/ 4 2 -
TabularUnified src/Descriptors/AtomIdDescriptor_impl.hpp ¶
r7dad10 r865a945 1 #include "Descriptors/AtomIdDescriptor.hpp"2 1 #include "Descriptors/AtomDescriptor_impl.hpp" 3 2 -
TabularUnified src/World.cpp ¶
r7dad10 r865a945 12 12 #include "periodentafel.hpp" 13 13 #include "Descriptors/AtomDescriptor.hpp" 14 #include "Descriptors/AtomDescriptor_impl.hpp" 14 15 15 16 using namespace std; … … 46 47 } 47 48 49 /******************************* Iterators ********************************/ 50 51 World::AtomIterator::AtomIterator(AtomDescriptor _descr, World* _world) : 52 descr(_descr.get_impl()), 53 world(_world) 54 { 55 state = world->atoms.begin(); 56 advanceState(); 57 } 58 59 World::AtomIterator::AtomIterator(const AtomIterator& rhs) : 60 state(rhs.state), 61 descr(rhs.descr) 62 {} 63 64 World::AtomIterator& World::AtomIterator::operator++(){ 65 advanceState(); 66 } 67 68 bool World::AtomIterator::operator==(const AtomIterator& rhs){ 69 return state==rhs.state; 70 } 71 72 bool World::AtomIterator::operator!=(const AtomIterator& rhs){ 73 return state!=rhs.state; 74 } 75 76 atom* World::AtomIterator::operator*(){ 77 return (*state).second; 78 } 79 80 void World::AtomIterator::advanceState(){ 81 while(state!=world->atoms.end() && !descr->predicate(*state)) 82 state++; 83 } 84 85 World::AtomIterator World::getAtomIter(AtomDescriptor descr){ 86 return AtomIterator(descr,this); 87 } 48 88 49 89 /******************************* Singleton Stuff **************************/ -
TabularUnified src/World.hpp ¶
r7dad10 r865a945 13 13 #include <vector> 14 14 #include <set> 15 #include <boost/shared_ptr.hpp> 15 16 16 17 #include "Patterns/Observer.hpp" … … 28 29 { 29 30 friend class AtomDescriptor_impl; 31 friend class AtomDescriptor; 32 33 typedef std::map<int,atom*> AtomList; 30 34 public: 31 35 … … 40 44 /***** Methods to work with the World *****/ 41 45 molecule *createMolecule(); 46 47 protected: 48 /**** Iterators to use internal data structures */ 49 class AtomIterator { 50 public: 51 AtomIterator(AtomDescriptor, World*); 52 AtomIterator(const AtomIterator&); 53 AtomIterator& operator++(); 54 bool operator==(const AtomIterator&); 55 bool operator!=(const AtomIterator&); 56 atom* operator*(); 57 protected: 58 void advanceState(); 59 World* world; 60 AtomList::iterator state; 61 boost::shared_ptr<AtomDescriptor_impl> descr; 62 }; 63 64 AtomIterator getAtomIter(AtomDescriptor descr); 65 42 66 private: 43 67 periodentafel *periode; 44 std::map<int,atom*>atoms;68 AtomList atoms; 45 69 std::set<molecule*> molecules; 46 70
Note:
See TracChangeset
for help on using the changeset viewer.