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
Last change
on this file since 74d179 was b97a60, checked in by Frederik Heber <heber@…>, 13 years ago |
Modified IdPool implementation to give either unique or continuous ids.
- added two class uniqueId and continuousId that get the id type via a template
and contain a getNextId_impl(). Also, contains typedef is is_IdPool_trait:
- uniqueId always return a greater id.
- continuousId implements the old way.
- IdPool is now based on two templates, the second is the template that is
inherited and its contained function used in getNextId().
- for atoms the id is the sole identifier for which we can guarantee
uniqueness. For molecules uniqueness does not make sense.
- updated World's documentation on its id pools.
- TESTFIX: Filling/FillVoidWithMolecule - both changed because the order of the
ids has changed. In one case the bonding id flipped, in the other one atom
changed places in .xyz file. (Actually, it's surprising that this is the
only glitch occuring due to the changing of the id policy).
|
-
Property mode
set to
100644
|
File size:
1.0 KB
|
Line | |
---|
1 | /*
|
---|
2 | * IdPool_policy.hpp
|
---|
3 | *
|
---|
4 | * Created on: Feb 7, 2012
|
---|
5 | * Author: heber
|
---|
6 | */
|
---|
7 |
|
---|
8 | #ifndef IDPOOL_POLICY_HPP_
|
---|
9 | #define IDPOOL_POLICY_HPP_
|
---|
10 |
|
---|
11 | // include config.h
|
---|
12 | #ifdef HAVE_CONFIG_H
|
---|
13 | #include <config.h>
|
---|
14 | #endif
|
---|
15 |
|
---|
16 | #include "CodePatterns/Range.hpp"
|
---|
17 |
|
---|
18 | class uniqueId{
|
---|
19 | public:
|
---|
20 | typedef void is_IdPool_policy;
|
---|
21 | template <class T> T getNextId_impl(std::set<range<T> > &pool, T&currId)
|
---|
22 | {
|
---|
23 | return currId++;
|
---|
24 | }
|
---|
25 | };
|
---|
26 |
|
---|
27 | class continuousId{
|
---|
28 | public:
|
---|
29 | typedef void is_IdPool_policy;
|
---|
30 |
|
---|
31 | template <class T> T getNextId_impl(std::set<range<T> > &pool, T&currId)
|
---|
32 | {
|
---|
33 | // try to find an Id in the pool;
|
---|
34 | if(!pool.empty()) {
|
---|
35 | typename std::set<range<T> >::iterator iter=pool.begin();
|
---|
36 | T id = iter->first;
|
---|
37 | range<T> newRange = makeRange(id+1,iter->last);
|
---|
38 | // we wont use this iterator anymore, so we don't care about invalidating
|
---|
39 | pool.erase(iter);
|
---|
40 | if(newRange.first<newRange.last)
|
---|
41 | pool.insert(newRange);
|
---|
42 | return id;
|
---|
43 | }
|
---|
44 | // Nothing in the pool... we are out of luck
|
---|
45 | return currId++;
|
---|
46 | }
|
---|
47 | };
|
---|
48 |
|
---|
49 |
|
---|
50 | #endif /* IDPOOL_POLICY_HPP_ */
|
---|
Note:
See
TracBrowser
for help on using the repository browser.