Merge lp:~verifydtapn-contributers/verifydtapn/Cleanup into lp:verifydtapn

[Peter Gjøl Jensen]

https://bugs.launchpad.net/verifydtapn/+bug/1166168

[Jakob Taankvist (jakob-taankvist)]

review: Approve

[Jiri Srba (srba)]

review: Approve

[Mathias Grund Sørensen (mathias.grund)]

review: Approve

[lp:~verifydtapn-contributers/verifydtapn/Cleanup]

277. By Jiri Srba on 2013-04-10

merged in the cleanup branch

[Peter Gjøl Jensen (peter-gjoel)]

review: Approve

=== removed file 'src/DiscreteVerification/DataStructures/EncodingStructure.cpp'
--- src/DiscreteVerification/DataStructures/EncodingStructure.cpp	2012-12-07 09:12:40 +0000
+++ src/DiscreteVerification/DataStructures/EncodingStructure.cpp	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-/* 
- * File:   Encoding.cpp
- * Author: floop
- * 
- * Created on 27. oktober 2012, 12:36
- */
-
-#include "EncodingStructure.h"
-namespace VerifyTAPN {
-    namespace DiscreteVerification {
-
-
-    }
-}
\ No newline at end of file

=== removed file 'src/DiscreteVerification/DataStructures/NonStrictMarking.cpp'
--- src/DiscreteVerification/DataStructures/NonStrictMarking.cpp	2012-12-05 09:06:30 +0000
+++ src/DiscreteVerification/DataStructures/NonStrictMarking.cpp	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-/*
- * NonStrictMarking.cpp
- *
- *  Created on: 29/02/2012
- *      Author: MathiasGS
- */
-
-#include "NonStrictMarking.hpp"
-
-using namespace std;
-
-namespace VerifyTAPN {
-namespace DiscreteVerification {
-} /* namespace DiscreteVerification */
-} /* namespace VerifyTAPN */

=== removed file 'src/DiscreteVerification/DataStructures/PData.cpp'
--- src/DiscreteVerification/DataStructures/PData.cpp	2012-12-07 09:12:40 +0000
+++ src/DiscreteVerification/DataStructures/PData.cpp	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-/* 
- * File:   PData.cpp
- * Author: floop
- * 
- * Created on 5. november 2012, 10:22
- */
-
-#include <set>
-
-#include "PData.h"
-namespace VerifyTAPN {
-    namespace DiscreteVerification {
-
- 
-    }
-}
\ No newline at end of file

=== modified file 'src/DiscreteVerification/DataStructures/PData.h'
--- src/DiscreteVerification/DataStructures/PData.h	2013-02-15 17:12:45 +0000
+++ src/DiscreteVerification/DataStructures/PData.h	2013-04-09 12:47:27 +0000
@@ -18,14 +18,17 @@
         // pointer containing enough data to reconstruct the stored data at any time!
         template<typename T>
         struct EncodingPointer {
+            // The part of the encoding not being represented by the path in the PTrie
             EncodingStructure<T*> encoding;
+            // The coresponding node in the PTrie
             unsigned int node;
 
+            // empty constructor
             EncodingPointer() {
             };
-
-            EncodingPointer(EncodingPointer<T> &en) : encoding(en.encoding.Clone()), node(en.node) {};  // possible mem-leak?
             
+            // Construct a pointer with enough (persistent) data to recreate the marking. 
+            // The encoding is cloned as it is not persistant in the PTrie
             EncodingPointer(EncodingStructure<T*> &en, unsigned int n) : encoding(en.Clone()), node(n) {
             }
         };