CombiningParticlePotentialParsing
Last change
on this file since ff4fff9 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.