source: src/Fragmentation/Summation/IndexSetContainer.cpp@ 87d6bd

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 87d6bd was 781408, checked in by Frederik Heber <heber@…>, 12 years ago

FIX: Added inline comparators for IndexSet::ptr, fixed IndexSetContainer cstors.

  • we simply use those of IndexSet.
  • this is important to allow IndexSet::ptr as (sensible) keys in maps.
  • IndexSetContainer created superset AllIndices only when instantiated from a KeySetsContainer, not when from SortedVector. Copy&pasted createSuperSet() for these cases. Sadly, all very similar but immense work to avoid the c&p.
  • this issue appeared because the inline comparators dereference IndexSet::ptr, hence uncovering that AllIndices is still NULL.
  • Property mode set to 100644
File size: 4.6 KB
Line 
1/*
2 * Project: MoleCuilder
3 * Description: creates and alters molecular systems
4 * Copyright (C) 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 * IndexSetContainer.cpp
25 *
26 * Created on: Aug 2, 2012
27 * Author: heber
28 */
29
30
31// include config.h
32#ifdef HAVE_CONFIG_H
33#include <config.h>
34#endif
35
36#include "CodePatterns/MemDebug.hpp"
37
38#include "IndexSetContainer.hpp"
39
40#include <iterator>
41
42#include "CodePatterns/Log.hpp"
43
44#include "Fragmentation/Summation/IndexSet.hpp"
45#include "Fragmentation/KeySetsContainer.hpp"
46
47IndexSet::ptr IndexSetContainer::createSuperSet(const KeySetsContainer &_keysets) const
48{
49 // create superset
50 IndexSet::ptr _AllIndices(new IndexSet);
51 for (KeySetsContainer::ArrayOfIntVectors::const_iterator iter = _keysets.KeySets.begin();
52 iter != _keysets.KeySets.end(); ++iter)
53 for(KeySetsContainer::IntVector::const_iterator keyiter = (*iter).begin();
54 keyiter != (*iter).end(); ++keyiter) {
55 if (*keyiter != -1)
56 _AllIndices->insert((Index_t)*keyiter);
57 }
58 LOG(2, "DEBUG: AllIndices is " << *_AllIndices << ".");
59
60 return _AllIndices;
61}
62
63IndexSet::ptr IndexSetContainer::createSuperSet(const std::vector<IndexSet> &_container) const
64{
65 // create superset
66 IndexSet::ptr _AllIndices(new IndexSet);
67 for (std::vector<IndexSet>::const_iterator iter = _container.begin();
68 iter != _container.end(); ++iter)
69 for(IndexSet::const_iterator keyiter = (*iter).begin();
70 keyiter != (*iter).end(); ++keyiter) {
71 if (*keyiter != -1)
72 _AllIndices->insert((Index_t)*keyiter);
73 }
74 LOG(2, "DEBUG: AllIndices is " << *_AllIndices << ".");
75
76 return _AllIndices;
77}
78
79IndexSet::ptr IndexSetContainer::createSuperSet(const std::vector<IndexSet::ptr> &_container) const
80{
81 // create superset
82 IndexSet::ptr _AllIndices(new IndexSet);
83 for (std::vector<IndexSet::ptr>::const_iterator iter = _container.begin();
84 iter != _container.end(); ++iter)
85 for(IndexSet::const_iterator keyiter = (*iter)->begin();
86 keyiter != (*iter)->end(); ++keyiter) {
87 if (*keyiter != -1)
88 _AllIndices->insert((Index_t)*keyiter);
89 }
90 LOG(2, "DEBUG: AllIndices is " << *_AllIndices << ".");
91
92 return _AllIndices;
93}
94
95IndexSetContainer::IndexSetContainer(const KeySetsContainer &_keysets) :
96 AllIndices(createSuperSet(_keysets))
97{
98 const size_t SupersetSize = AllIndices->size();
99 // create container with all keysets
100 for (KeySetsContainer::ArrayOfIntVectors::const_iterator iter = _keysets.KeySets.begin();
101 iter != _keysets.KeySets.end(); ++iter) {
102 // create the IndexSets ...
103 IndexSet tempset;
104 for(KeySetsContainer::IntVector::const_iterator keyiter = (*iter).begin();
105 keyiter != (*iter).end(); ++keyiter)
106 if (*keyiter != -1)
107 tempset.insert((Index_t)*keyiter);
108 // ... and insert, making sure that super set is AllIndices when present
109 if (tempset.size() < SupersetSize)
110 insert(tempset);
111 else
112 insert(AllIndices);
113 }
114}
115
116size_t IndexSetContainer::countSetsTillLevel(const size_t level) const
117{
118 // check if any sets are present
119 if (getContainer().empty())
120 return 0;
121 // define ends of interval
122 SortedVector<IndexSet>::Container_t::const_iterator start = getContainer().begin();
123 SortedVector<IndexSet>::Container_t::const_iterator end = --getContainer().end();
124 // check whether all are smaller
125 if ((*end)->size() <= level)
126 return getContainer().size();
127 // check whether all are larger
128 if ((*start)->size() > level)
129 return 0;
130 // continue as long as interval has more than one element
131 while (std::distance(start, end) > 1) {
132 // create iterator in between
133 SortedVector<IndexSet>::Container_t::const_iterator midpoint = start;
134 std::advance( midpoint, std::distance(start, end)/2 );
135 // check iter and half the interval
136 if ((*midpoint)->size() <= level)
137 start = midpoint;
138 else
139 end = midpoint;
140 }
141 return std::distance(getContainer().begin(), end);
142}
Note: See TracBrowser for help on using the repository browser.