Merge pull request #502 from JulienDoerner/issue_493

Memory management in Variants

Author: JulienDoerner

include/crpropa/Module.h

@@ -59,7 +59,24 @@ class AbstractCondition: public Module {
 	void setMakeAcceptedInactive(bool makeInactive);
 	void setRejectFlag(std::string key, std::string value);
 	void setAcceptFlag(std::string key, std::string value);
+
+	// return the reject flag (key & value), delimiter is the "&".
+	std::string getRejectFlag();
+
+	// return the accept flag (key & value), delimiter is the "&"
+	std::string getAcceptFlag();
 };
+
+/**
+ @class Deactivation
+ @brief Direct deactivation of the candidate. Can be used for debuging.
+*/
+class Deactivation: public AbstractCondition {
+	public: 
+		void process(Candidate *cand) const { reject(cand); }
+};
+
+
 } // namespace crpropa
 
 #endif /* CRPROPA_MODULE_H */

include/crpropa/module/Observer.h

@@ -268,6 +268,7 @@ class ObserverTimeEvolution: public ObserverFeature {
 	DetectionState checkDetection(Candidate *candidate) const;
 	std::string getDescription() const;
 };
+
 /** @} */
 
 }

src/Module.cpp

@@ -19,8 +19,7 @@ void Module::setDescription(const std::string &d) {
 
 AbstractCondition::AbstractCondition() :
 		makeRejectedInactive(true), makeAcceptedInactive(false), rejectFlagKey(
-				"Rejected") {
-
+				"Rejected"), rejectFlagValue( typeid(*this).name() ) {
 }
 
 void AbstractCondition::reject(Candidate *candidate) const {
@@ -77,4 +76,15 @@ void AbstractCondition::setAcceptFlag(std::string key, std::string value) {
 	acceptFlagValue = value;
 }
 
+std::string AbstractCondition::getRejectFlag() {
+	std::string out = rejectFlagKey + "&" + rejectFlagValue; 
+	return out;
+}
+
+std::string AbstractCondition::getAcceptFlag() {
+	std::string out = acceptFlagKey + "&" + acceptFlagValue;
+	return out;
+}
+
+
 } // namespace crpropa

src/Variant.cpp

@@ -27,7 +27,8 @@ Variant::Variant(const char* s) {
 }
 
 Variant::~Variant() {
-	clear();
+	clear(type);
+	delete data._t_string;
 }
 
 const char* Variant::getTypeName() const {
@@ -676,7 +677,7 @@ Variant Variant::fromString(const std::string& s, Type t) {
 }
 
 void Variant::clear(Type t) {
-	if (t == TYPE_STRING)
+	if (t == TYPE_STRING) 
 		safeDelete(data._t_string);
 	else if (t == TYPE_VECTOR3F)
 		safeDelete(data._t_vector3f);

src/module/Observer.cpp

@@ -348,4 +348,5 @@ std::string ObserverSurface::getDescription() const {
 	return ss.str();
 }
 
+
 } // namespace crpropa