Changeset 01d28a for molecuilder/src/Actions/Calculation_impl.hpp

Timestamp:

Feb 19, 2010, 2:31:56 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

7bfc19

Parents:

9ef76a

Message:

Added templates that allow arbitrary calculations on atoms to be mapped to sets of Atoms

File:

• molecuilder/src/Actions/Calculation_impl.hpp (modified) (5 diffs)

molecuilder/src/Actions/Calculation_impl.hpp

@@ -9 +9 @@
 #define CALCULATION_IMPL_HPP_
 
+#include "Actions/Calculation.hpp"
+
 #include <cassert>
 
 template<typename T>
-Calculation<T>::Calculation(int _maxSteps, std::string _name, bool _doRegister=true) :
+Calculation<T>::Calculation(int _maxSteps, std::string _name, bool _doRegister) :
   Process(_maxSteps,_name,_doRegister),
   done(false),
@@ -20 +22 @@
 template<typename T>
 Calculation<T>::~Calculation()
-{}
+{
+  delete result;
+}
 
 // methods inherited from Action
@@ -26 +30 @@
 template<typename T>
 void Calculation<T>::call(){
-  calc();
+  reset();
+  (*this)();
 }
 
@@ -41 +46 @@
 
 template<typename T>
-void Calculation<T>::calc(){
+T Calculation<T>::operator()(){
   if(!done){
     result = doCalc();
     done = true;
   }
+  return *result;
 }
 
@@ -62 +68 @@
 void Calculation<T>::reset(){
   done = false;
+  delete result;
   result = 0;
 }