source: src/Actions/AnalysisAction/PairCorrelationAction.cpp@ b73545

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 b73545 was 7ee21d, checked in by Frederik Heber <heber@…>, 10 years ago

MEMFIX: Many analysis_correlation function allocated return map twice.

  • outmap was the culprit, probably when empty (but allocated) was returned when no atoms are allocated, two new's appeared.
  • Property mode set to 100644
File size: 3.8 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 * PairCorrelationAction.cpp
25 *
26 * Created on: May 9, 2010
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 "Analysis/analysis_correlation.hpp"
38#include "CodePatterns/Verbose.hpp"
39#include "CodePatterns/Log.hpp"
40#include "Descriptors/AtomTypeDescriptor.hpp"
41#include "Element/element.hpp"
42#include "molecule.hpp"
43#include "Element/periodentafel.hpp"
44#include "LinearAlgebra/RealSpaceMatrix.hpp"
45#include "LinearAlgebra/Vector.hpp"
46#include "World.hpp"
47
48#include <iostream>
49#include <string>
50
51#include "Actions/AnalysisAction/PairCorrelationAction.hpp"
52
53using namespace MoleCuilder;
54
55// and construct the stuff
56#include "PairCorrelationAction.def"
57#include "Action_impl_pre.hpp"
58
59/** =========== define the function ====================== */
60ActionState::ptr AnalysisPairCorrelationAction::performCall() {
61 ofstream output;
62 ofstream binoutput;
63 string type;
64 BinPairMap *binmap = NULL;
65
66 // execute action
67 output.open(params.outputname.get().string().c_str());
68 binoutput.open(params.binoutputname.get().string().c_str());
69 PairCorrelationMap *correlationmap = NULL;
70 ASSERT(params.elements.get().size() == 2,
71 "AnalysisPairCorrelationAction::performCall() - Exactly two elements are required for pair correlation.");
72 std::vector<const element *>::const_iterator elemiter = params.elements.get().begin();
73 const World::AtomComposite atoms_first = World::getInstance().getAllAtoms(AtomByType(*(elemiter++)));
74 const World::AtomComposite atoms_second = World::getInstance().getAllAtoms(AtomByType(*(elemiter++)));
75 ASSERT(elemiter == params.elements.get().end(),
76 "AnalysisPairCorrelationAction::performCall() - Exactly two elements are required for pair correlation.");
77 double max_distance = params.BinEnd.get();
78 if (params.BinEnd.get() <= 0.) {
79 // find max distance within box from diagonal
80 const RealSpaceMatrix &M = World::getInstance().getDomain().getM();
81 max_distance = (M * Vector(1.,1.,1.)).NormSquared();
82 }
83 correlationmap = PairCorrelation(atoms_first, atoms_second, max_distance);
84 OutputCorrelationMap<PairCorrelationMap>(&output, correlationmap, OutputPairCorrelation_Header, OutputPairCorrelation_Value);
85 binmap = BinData( correlationmap, params.BinWidth.get(), params.BinStart.get(), params.BinEnd.get() );
86 OutputCorrelationMap<BinPairMap> ( &binoutput, binmap, OutputCorrelation_Header, OutputCorrelation_Value );
87 delete binmap;
88 delete correlationmap;
89 output.close();
90 binoutput.close();
91 return Action::success;
92}
93
94ActionState::ptr AnalysisPairCorrelationAction::performUndo(ActionState::ptr _state) {
95 return Action::success;
96}
97
98ActionState::ptr AnalysisPairCorrelationAction::performRedo(ActionState::ptr _state){
99 return Action::success;
100}
101
102bool AnalysisPairCorrelationAction::canUndo() {
103 return true;
104}
105
106bool AnalysisPairCorrelationAction::shouldUndo() {
107 return true;
108}
109/** =========== end of function ====================== */
Note: See TracBrowser for help on using the repository browser.