source: src/Actions/AnalysisAction/PointCorrelationAction.cpp@ eea0bb

Last change on this file since eea0bb was 7ee21d, checked in by Frederik Heber <heber@…>, 11 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.4 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 * PointCorrelationAction.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 "Element/element.hpp"
41#include "Element/periodentafel.hpp"
42#include "LinearAlgebra/Vector.hpp"
43#include "molecule.hpp"
44#include "World.hpp"
45
46#include <cmath>
47#include <iostream>
48#include <string>
49
50#include "Actions/AnalysisAction/PointCorrelationAction.hpp"
51
52using namespace MoleCuilder;
53
54// and construct the stuff
55#include "PointCorrelationAction.def"
56#include "Action_impl_pre.hpp"
57
58/** =========== define the function ====================== */
59ActionState::ptr AnalysisPointCorrelationAction::performCall() {
60 int ranges[3] = {1, 1, 1};
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 cout << "Point to correlate to is " << params.Point.get() << endl;
70 CorrelationToPointMap *correlationmap = NULL;
71 for(std::vector<const element *>::const_iterator iter = params.elements.get().begin(); iter != params.elements.get().end(); ++iter)
72 cout << "element is " << (*iter)->getSymbol() << endl;
73 std::vector<molecule*> molecules = World::getInstance().getSelectedMolecules();
74 if (params.periodic.get())
75 correlationmap = PeriodicCorrelationToPoint(molecules, params.elements.get(), &params.Point.get(), ranges);
76 else
77 correlationmap = CorrelationToPoint(molecules, params.elements.get(), &params.Point.get());
78 OutputCorrelationMap<CorrelationToPointMap>(&output, correlationmap, OutputCorrelationToPoint_Header, OutputCorrelationToPoint_Value);
79 binmap = BinData( correlationmap, params.BinWidth.get(), params.BinStart.get(), params.BinEnd.get() );
80 OutputCorrelationMap<BinPairMap> ( &binoutput, binmap, OutputCorrelation_Header, OutputCorrelation_Value );
81 delete binmap;
82 delete correlationmap;
83 output.close();
84 binoutput.close();
85 return Action::success;
86}
87
88ActionState::ptr AnalysisPointCorrelationAction::performUndo(ActionState::ptr _state) {
89 return Action::success;
90}
91
92ActionState::ptr AnalysisPointCorrelationAction::performRedo(ActionState::ptr _state){
93 return Action::success;
94}
95
96bool AnalysisPointCorrelationAction::canUndo() {
97 return true;
98}
99
100bool AnalysisPointCorrelationAction::shouldUndo() {
101 return true;
102}
103/** =========== end of function ====================== */
Note: See TracBrowser for help on using the repository browser.