source: src/Atom/atom_bondedparticleinfo.cpp@ 97dff0

Last change on this file since 97dff0 was d760bb, checked in by Frederik Heber <heber@…>, 12 years ago

REFACTOR: PowerSetGenerator now creates all orders in one go, not limited to one by one increments.

  • atom_bondedparticle's MaxOrder is not a bool but an int containing the desired final order set by CheckOrderAtSite and compared to AdaptiveOrder to obtain its old meaning.
  • UniqueFragments now contains a vector of n Graphs to place n-body fragments in that are later combined. Also, cleaned up a lot of old functions and merged stuff into cstor. FreeAllOrdersList() and CombineAllOrderListIntoOne() have been adapted accordingly.
  • Fragmentation::FragmentBOSSANOVA now uses fully again FragmentLowerOrdersList which now has the above n slots to place n-body fragments in and which is passed by ref to UniqueFragments.
  • SPFragmentGenerator now always stores the current fragment, only in a specific slot in UniqueFragment's Graphs, and it recurses if there are enough SP levels and plces left.
  • FIX: BondsPerShortestPath properly prints and informs about resetting the path list.
  • We checked extra that BondFragments come out exactly as before (same order because of the Graph being a map naturally). The only difference is the OrderAtSite file which now has more than 0/1 values in the second entry.
  • Property mode set to 100644
File size: 2.9 KB
Line 
1/*
2 * Project: MoleCuilder
3 * Description: creates and alters molecular systems
4 * Copyright (C) 2010-2012 University of Bonn. All rights reserved.
5 *
6 *
7 * This file is part of MoleCuilder.
8 *
9 * MoleCuilder is free software: you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation, either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * MoleCuilder is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with MoleCuilder. If not, see <http://www.gnu.org/licenses/>.
21 */
22
23/*
24 * atom_bondedparticleinfo.cpp
25 *
26 * Created on: Oct 19, 2009
27 * Author: heber
28 */
29
30// include config.h
31#ifdef HAVE_CONFIG_H
32#include <config.h>
33#endif
34
35#include "CodePatterns/MemDebug.hpp"
36
37#include "CodePatterns/Assert.hpp"
38#include "CodePatterns/Log.hpp"
39
40#include "WorldTime.hpp"
41
42#include "atom_bondedparticleinfo.hpp"
43
44
45BondList BondedParticleInfo::emptyList;
46
47/** Constructor of class BondedParticleInfo.
48 */
49BondedParticleInfo::BondedParticleInfo() :
50 AdaptiveOrder(0),
51 MaxOrder(0)
52{}
53
54/** Destructor of class BondedParticleInfo.
55 */
56BondedParticleInfo::~BondedParticleInfo()
57{}
58
59void BondedParticleInfo::AppendTrajectoryStep()
60{
61 ListOfBonds.push_back(BondList());
62 LOG(5,"BondedParticleInfo::AppendTrajectoryStep() called, size is " << ListOfBonds.size());
63}
64
65const BondList& BondedParticleInfo::getListOfBonds() const
66{
67 if(WorldTime::getTime() < ListOfBonds.size())
68 return ListOfBonds[WorldTime::getTime()];
69 else
70 return emptyList;
71}
72
73//BondList& BondedParticleInfo::getListOfBonds()
74//{
75// // todo: here we actually need a container on whose destruction notifiy is emitted, i.e.
76// // similar or simply an ObservedContainer.
77// OBSERVE;
78// NOTIFY(AtomObservable::BondsAdded);
79// const unsigned int size = ListOfBonds.size();
80// ASSERT(WorldTime::getTime() <= size,
81// "BondedParticleInfo::getBondsAtStep() - Access out of range: "
82// +toString(WorldTime::getTime())
83// +" not in [0,"+toString(size)+"].");
84// if (WorldTime::getTime() == size) {
85// UpdateSteps();
86// }
87// return ListOfBonds[WorldTime::getTime()];
88//}
89
90const BondList& BondedParticleInfo::getListOfBondsAtStep(unsigned int _step) const
91{
92 if(_step < ListOfBonds.size())
93 return ListOfBonds[_step];
94 else
95 return emptyList;
96}
97
98//BondList& BondedParticleInfo::getListOfBondsAtStep(unsigned int _step)
99//{
100// const unsigned int size = ListOfBonds.size();
101// ASSERT(_step <= size,
102// "BondedParticleInfo::getBondsAtStep() - Access out of range: "
103// +toString(_step)
104// +" not in [0,"+toString(size)+"].");
105// if (_step == size) {
106// UpdateSteps();
107// }
108// return ListOfBonds[_step];
109//}
Note: See TracBrowser for help on using the repository browser.