source: src/Fragmentation/Summation/SetValues/Eigenvalues.cpp@ e2925fd

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

Eigenvalue summation uses two sets: added and subtracted values.

  • Property mode set to 100644
File size: 3.4 KB
Line 
1/*
2 * Project: MoleCuilder
3 * Description: creates and alters molecular systems
4 * Copyright (C) 2013 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 * Eigenvalues.cpp
25 *
26 * Created on: Mar 8, 2013
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 "Eigenvalues.hpp"
38
39#include <algorithm>
40#include <iostream>
41#include <vector>
42
43//Eigenvalues& Eigenvalues::operator+=(const Eigenvalues &other) {
44// {
45// samples_t samples(other.addedsamples.begin(), other.addedsamples.end());
46// samples_t::iterator it =
47// std::set_difference(samples.begin(), samples.end(),
48// other.subtractedsamples.begin(), other.subtractedsamples.end(),
49// samples.begin());
50// samples.resize(it-samples.begin());
51// addedsamples.insert(samples.begin(), samples.end());
52// }
53// return *this;
54//}
55//
56Eigenvalues& Eigenvalues::operator-=(const Eigenvalues &other) {
57 {
58 samples_t samples(other.addedsamples.begin(), other.addedsamples.end());
59 samples_t::iterator it =
60 std::set_difference(samples.begin(), samples.end(),
61 other.subtractedsamples.begin(), other.subtractedsamples.end(),
62 samples.begin());
63 samples.resize(it-samples.begin());
64 subtractedsamples.insert(samples.begin(), samples.end());
65 }
66 return *this;
67}
68
69std::ostream & operator<<(std::ostream &ost, const Eigenvalues &eigenvalues)
70{
71 // now subtract all eigenvalues stored in subtractedsamples from addedsamples
72 {
73 Eigenvalues::samples_t samples(eigenvalues.addedsamples.begin(), eigenvalues.addedsamples.end());
74 Eigenvalues::samples_t::iterator it =
75 std::set_difference(samples.begin(), samples.end(),
76 eigenvalues.subtractedsamples.begin(), eigenvalues.subtractedsamples.end(),
77 samples.begin());
78 samples.resize(it-samples.begin());
79
80 for (Eigenvalues::samples_t::const_iterator iter = samples.begin();
81 iter != samples.end(); ++iter)
82 ost << "(" << *iter << ",1.) ";
83 }
84// {
85// Eigenvalues::samples_t samples(eigenvalues.subtractedsamples.begin(), eigenvalues.subtractedsamples.end());
86// Eigenvalues::samples_t::iterator it =
87// std::set_difference(samples.begin(), samples.end(),
88// eigenvalues.addedsamples.begin(), eigenvalues.addedsamples.end(),
89// samples.begin());
90// samples.resize(it-samples.begin());
91//
92// for (Eigenvalues::samples_t::const_iterator iter = samples.begin();
93// iter != samples.end(); ++iter)
94// ost << "(" << *iter << ",1.5) ";
95// }
96 return ost;
97}
98
99template<> Eigenvalues ZeroInstance<Eigenvalues>()
100{
101 Eigenvalues returnvalue;
102 return returnvalue;
103}
Note: See TracBrowser for help on using the repository browser.