Merge lp:~tapaal-dist-ctl/verifypn/ParserRefactoring_The_Correct_One into lp:~verifypn-maintainers/verifypn/trunk

[Søren Moss Nielsen]

Refactored parser for CTL queries.

The fixed requested have been implemented

[Jiri Srba (srba)]

review: Approve

=== modified file 'CTL/CertainZeroFPA.cpp'
--- CTL/CertainZeroFPA.cpp	2016-04-12 08:29:03 +0000
+++ CTL/CertainZeroFPA.cpp	2016-05-20 07:41:18 +0000
@@ -2,34 +2,12 @@
 
 namespace ctl{
 
-bool preprocessQuery(CTLTree *f) {
-    
-    bool isTemporal = f->quantifier == A || f->quantifier == E;
-    if (f->quantifier == AND ||
-            f->quantifier == OR ||
-            (f->quantifier == A && f->path == U) ||
-            (f->quantifier == E && f->path == U)) {
-        //operand order guarantees subquery will be preprocessed
-        isTemporal = preprocessQuery(f->second) || isTemporal;
-        isTemporal = preprocessQuery(f->first) || isTemporal;
-    }
-    if (f->quantifier == NEG ||
-            (f->path == G && (f->quantifier == A || f->quantifier == E)) ||
-            (f->path == X && (f->quantifier == A || f->quantifier == E)) ||
-            (f->path == F && (f->quantifier == A || f->quantifier == E))) {
-        isTemporal = preprocessQuery(f->first) || isTemporal;
-    }
-    f->isTemporal = isTemporal;
-    return isTemporal;
-}
-
 bool CertainZeroFPA::search(DependencyGraph &t_graph, AbstractSearchStrategy &W)
 {
     PriorityQueue N;
 
     Configuration &v = t_graph.initialConfiguration();
     v.assignment = ZERO;
-    preprocessQuery(v.query);
 
     for(Edge *e : t_graph.successors(v)){
         W.push(e);
@@ -48,6 +26,8 @@
             N.pop();
         }
 
+//        e->edgePrinter();
+
         /*****************************************************************/
         /*Data handling*/
         int targetONEassignments = 0;
@@ -156,7 +136,7 @@
         e->processed = true;
     }
 
-    //std::cout << "Final Assignment: " << v.assignment << " " << ((v.assignment == ONE) ? true : false) << std::endl;
+//    std::cout << "Final Assignment: " << v.assignment << " " << ((v.assignment == ONE) ? true : false) << std::endl;
     return (v.assignment == ONE) ? true : false;
 }
 

=== modified file 'CTL/CertainZeroFPA.h'
--- CTL/CertainZeroFPA.h	2016-02-08 18:27:31 +0000
+++ CTL/CertainZeroFPA.h	2016-05-20 07:41:18 +0000
@@ -19,7 +19,7 @@
 private:
     struct edge_prioritizer{
         bool operator()(const Edge *lhs, const Edge *rhs) const {
-            return (lhs->source->query->max_depth > rhs->source->query->max_depth);
+            return (lhs->source->query->Depth > rhs->source->query->Depth); //Changed to depth - was max depth
         }
     };
     typedef std::priority_queue<Edge*, std::vector<Edge*>, ctl::CertainZeroFPA::edge_prioritizer> PriorityQueue;

=== modified file 'CTL/DependencyGraph.cpp'
--- CTL/DependencyGraph.cpp	2016-03-31 11:56:31 +0000
+++ CTL/DependencyGraph.cpp	2016-05-20 07:41:18 +0000
@@ -10,7 +10,7 @@
     _nplaces(t_net->numberOfPlaces()),
     _ntransitions(t_net->numberOfTransitions()){}
 
-void DependencyGraph::initialize(CTLTree &t_query){
+void DependencyGraph::initialize(CTLQuery &t_query){
     if(_query != NULL)
         clear(false);
     _query = &t_query;

=== modified file 'CTL/DependencyGraph.h'
--- CTL/DependencyGraph.h	2016-04-13 14:36:41 +0000
+++ CTL/DependencyGraph.h	2016-05-20 07:41:18 +0000
@@ -4,6 +4,7 @@
 #include "../PetriEngine/PetriNet.h"
 #include "../PetriParse/PNMLParser.h"
 #include "../CTLParser/CTLParser.h"
+#include "../CTLParser/CTLQuery.h"
 #include <list>
 #include <iostream>
 
@@ -28,10 +29,10 @@
     virtual int configuration_count() =0;
     virtual int marking_count() =0;
 
-    void initialize(CTLTree &t_query);
+    void initialize(CTLQuery &t_query);
 
 protected:
-    CTLTree *_query = nullptr;
+    CTLQuery *_query = nullptr;
     PetriEngine::PetriNet *_petriNet;
     PetriEngine::MarkVal *_initialMarking;
     PNMLParser::InhibitorArcList _inhibitorArcs;

=== modified file 'CTL/LocalFPA.h'
--- CTL/LocalFPA.h	2016-02-08 18:27:31 +0000
+++ CTL/LocalFPA.h	2016-05-20 07:41:18 +0000
@@ -19,7 +19,7 @@
 private:
     struct edge_prioritizer{
         bool operator()(const Edge *lhs, const Edge *rhs) const {
-            return (lhs->source->query->max_depth > rhs->source->query->max_depth);
+            return (lhs->source->query->Depth > rhs->source->query->Depth); //Changed to depth - was max depth
         }
     };
     typedef std::priority_queue<Edge*, std::vector<Edge*>, ctl::LocalFPA::edge_prioritizer> PriorityQueue;

=== modified file 'CTL/OnTheFlyDG.cpp'
--- CTL/OnTheFlyDG.cpp	2016-04-14 12:15:28 +0000
+++ CTL/OnTheFlyDG.cpp	2016-05-20 07:41:18 +0000
@@ -1,6 +1,7 @@
 #include "OnTheFlyDG.h"
 
 #include <string.h>
+#include <algorithm>
 
 namespace ctl{
 
@@ -12,336 +13,322 @@
 }
 
 
-bool OnTheFlyDG::fastEval(CTLTree &query, Marking &marking) {
-    assert(!query.isTemporal);
-    if (query.quantifier == AND){
-        return fastEval(*query.first, marking) && fastEval(*query.second, marking);        
-    } else if (query.quantifier == OR){
-        return fastEval(*query.first, marking) || fastEval(*query.second, marking);
-    } else if (query.quantifier == NEG){
-        return !fastEval(*query.first, marking);
-    } else {        
-        return evaluateQuery(query, marking);
+bool OnTheFlyDG::fastEval(CTLQuery &query, Marking &marking) {
+    assert(!query.IsTemporal);
+    if (query.GetQuantifier() == AND){
+        return fastEval(*query.GetFirstChild(), marking) && fastEval(*query.GetSecondChild(), marking);        
+    } else if (query.GetQuantifier() == OR){
+        return fastEval(*query.GetFirstChild(), marking) || fastEval(*query.GetSecondChild(), marking);
+    } else if (query.GetQuantifier() == NEG){
+        bool result = fastEval(*query.GetFirstChild(), marking);
+        return !result;
+    } else {   
+        bool res = evaluateQuery(query, marking);
+        return res;
     }
 }
 
 std::list<Edge *> OnTheFlyDG::successors(Configuration &v)
 {
     std::list<Edge*> succ;
-    //All
-    if(v.query->quantifier == A){
-        //All Until
-        if(v.query->path == U){
-            //first deal with the right side
-            Edge *right = NULL;
-            if (!v.query->second->isTemporal) {
-                //right side is not temporal, eval it right now!
-                bool valid = fastEval(*(v.query->second), *(v.marking));
-                if (valid) {    //satisfied, no need to go through successors
-                    succ.push_back(new Edge(&v));
-                    v.Successors = succ;
-                    return succ;
-                } //else: It's not valid, no need to add any edge, just add successors
-            } else {
-                //right side is temporal, we need to evaluate it as normal
-                Configuration* c = createConfiguration(*(v.marking), *(v.query->second));
-                right = new Edge(&v);
-                right->targets.push_back(c);
-            }
-            
-            //if we got here, either right side is temporal or it is not satisfied   
-            bool valid = false;
-            Configuration *left = NULL;
-            if (!v.query->first->isTemporal) {
-                //left side is not temporal, eval it right now!
-                valid = fastEval(*(v.query->first), *(v.marking));
-            } else {
-                //left side is temporal, include it in the edge
-                left = createConfiguration(*(v.marking), *(v.query->first));
-            }         
-
-            if (valid || left != NULL) {    //if left side is guaranteed to be not satisfied, skip successor generation
-                auto targets = nextState (*(v.marking));
-
-                if(!targets.empty()){   
-                    Edge* leftEdge = new Edge(&v);
-
-                    for(auto m : targets){
-                        Configuration* c = createConfiguration(*m, *(v.query));
-                        leftEdge->targets.push_back(c);                     
-                    }
-                    if (left != NULL) {
-                        leftEdge->targets.push_back(left);
-                    }                    
-                    succ.push_back(leftEdge);
-                }
-            } //else: Left side is not temporal and it's false, no way to succeed there...            
-
-            if (right != NULL) {
-                succ.push_back(right);
-            }
-
-
-        } //All Until end
-
-        //All Next begin
-        else if(v.query->path == X){
-            auto targets = nextState(*v.marking);
-            if (v.query->first->isTemporal) {   //regular check
-                Edge* e = new Edge(&v);
-                for (auto m : targets){
-                    Configuration* c = createConfiguration(*m, *(v.query->first));
-                    e->targets.push_back(c);
-                }
-                succ.push_back(e);
-            } else {
-                bool allValid = true;
-                for (auto m : targets) {
-                    bool valid = fastEval(*(v.query->first), *m);
-                    if (!valid) {
-                        allValid = false;
-                        break;
-                    }
-                }
-                if (allValid) {
-                    succ.push_back(new Edge(&v));
-                    v.Successors = succ;
-                    return succ;
-                }
-            }             
-        } //All Next End
-
-        //All Finally start
-        else if(v.query->path == F){
-            Edge *subquery = NULL;
-            if (!v.query->first->isTemporal) {
-                bool valid = fastEval(*(v.query->first), *(v.marking));
-                if (valid) {
-                    succ.push_back(new Edge(&v));
-                    v.Successors = succ;
-                    return succ;
-                }
-            } else {
-                subquery = new Edge(&v);
-                Configuration* c = createConfiguration(*(v.marking), *(v.query->first));
-                subquery->targets.push_back(c);
-            }
-            
-            auto targets = nextState(*(v.marking));
-
-            if(!targets.empty()){
-                Edge* e1 = new Edge(&v);
-
-                for(auto m : targets){
-                    Configuration* c = createConfiguration(*m, *(v.query));
-                    e1->targets.push_back(c);
-                }
-                succ.push_back(e1);
-            }
-
-            if (subquery != NULL) {
-                succ.push_back(subquery);
-            }            
-
-        }//All Finally end
-    } //All end
-
-    //Exists start
-    else if (v.query->quantifier == E){
-
-        //Exists Untill start
-        if(v.query->path == U){
-            Edge *right = NULL;
-            if (v.query->second->isTemporal) {
-                Configuration* c = createConfiguration(*(v.marking), *(v.query->second));
-                right = new Edge(&v);
-                right->targets.push_back(c);
-            } else {
-                bool valid = fastEval(*(v.query->second), *(v.marking));
-                if (valid) {
-                    succ.push_back(new Edge(&v));
-                    v.Successors = succ;
-                    return succ;
-                }   // else: right condition is not satisfied, no need to add an edge
-            }            
-
-            auto targets = nextState(*(v.marking));
-
-            if(!targets.empty()){
+    CTLType query_type = v.query->GetQueryType();
+    if(query_type == EVAL){
+        //assert(false && "Someone told me, this was a bad place to be.");
+        if (evaluateQuery(*v.query, *v.marking)){
+            succ.push_back(new Edge(&v));
+        }
+    }
+    else if (query_type == LOPERATOR){
+        if(v.query->GetQuantifier() == NEG){
+            Configuration* c = createConfiguration(*(v.marking), *(v.query->GetFirstChild()));
+            Edge* e = new Edge(&v);
+            e->targets.push_back(c);
+            succ.push_back(e);
+        }
+        else if(v.query->GetQuantifier() == AND){
+            //Check if left is false
+            if(!v.query->GetFirstChild()->IsTemporal){
+                if(!fastEval(*(v.query->GetFirstChild()), *v.marking))
+                    //query cannot be satisfied, return empty succ set
+                    return succ;
+            }
+
+            //check if right is false
+            if(!v.query->GetSecondChild()->IsTemporal){
+                if(!fastEval(*(v.query->GetSecondChild()), *v.marking))
+                    return succ;
+            }
+
+            Edge *e = new Edge(&v);
+
+            //If we get here, then either both propositions are true(should not be possible)
+            //Or a temporal operator and a true proposition
+            //Or both are temporal
+            if(v.query->GetFirstChild()->IsTemporal){
+                e->targets.push_back(createConfiguration(*v.marking, *(v.query->GetFirstChild())));
+            }
+            if(v.query->GetSecondChild()->IsTemporal){
+                e->targets.push_back(createConfiguration(*v.marking, *(v.query->GetSecondChild())));
+            }
+            succ.push_back(e);
+        }
+        else if(v.query->GetQuantifier() == OR){
+            //Check if left is true
+            if(!v.query->GetFirstChild()->IsTemporal){
+                if(fastEval(*(v.query->GetFirstChild()), *v.marking)){
+                    //query is satisfied, return
+                    succ.push_back(new Edge(&v));
+                    v.Successors = succ;
+                    return succ;
+                }
+            }
+
+            if(!v.query->GetSecondChild()->IsTemporal){
+                if(fastEval(*(v.query->GetSecondChild()), *v.marking)){
+                    succ.push_back(new Edge(&v));
+                    v.Successors = succ;
+                    return succ;
+                }
+            }
+
+            //If we get here, either both propositions are false
+            //Or one is false and one is temporal
+            //Or both temporal
+            if(v.query->GetFirstChild()->IsTemporal){
+                Edge *e = new Edge(&v);
+                e->targets.push_back(createConfiguration(*v.marking, *(v.query->GetFirstChild())));
+                succ.push_back(e);
+            }
+            if(v.query->GetSecondChild()->IsTemporal){
+                Edge *e = new Edge(&v);
+                e->targets.push_back(createConfiguration(*v.marking, *(v.query->GetSecondChild())));
+                succ.push_back(e);
+            }
+        }
+        else{
+            assert(false && "An unknown error occoured in the loperator-part of the successor generator");
+        }
+    }
+    else if (query_type == PATHQEURY){
+        if(v.query->GetQuantifier() == A){
+            if (v.query->GetPath() == U){
+                Edge *right = NULL;
+                if (!v.query->GetSecondChild()->IsTemporal){
+                    //right side is not temporal, eval it right now!
+                    bool valid = fastEval(*(v.query->GetSecondChild()), *(v.marking));
+                    if (valid) {    //satisfied, no need to go through successors
+                        succ.push_back(new Edge(&v));
+                        v.Successors = succ;
+                        return succ;
+                    }//else: It's not valid, no need to add any edge, just add successors
+                }
+                else {
+                    //right side is temporal, we need to evaluate it as normal
+                    Configuration* c = createConfiguration(*(v.marking), *(v.query->GetSecondChild()));
+                    right = new Edge(&v);
+                    right->targets.push_back(c);
+                }
+                bool valid = false;
                 Configuration *left = NULL;
-                bool valid = false;
-                if (v.query->first->isTemporal) {
-                    left = createConfiguration(*(v.marking), *(v.query->first));
+                if (!v.query->GetFirstChild()->IsTemporal) {
+                    //left side is not temporal, eval it right now!
+                    valid = fastEval(*(v.query->GetFirstChild()), *(v.marking));
                 } else {
-                    valid = fastEval(*(v.query->first), *(v.marking));
-                }
-                if (left != NULL || valid) {
-                    for(auto m : targets) {
-                        Edge* e = new Edge(&v);
-                        Configuration* c1 = createConfiguration(*m, *(v.query));
-                        e->targets.push_back(c1);
+                    //left side is temporal, include it in the edge
+                    left = createConfiguration(*(v.marking), *(v.query->GetFirstChild()));
+                } 
+                if (valid || left != NULL) {    //if left side is guaranteed to be not satisfied, skip successor generation
+                    auto targets = nextState (*(v.marking));
+
+                    if(!targets.empty()){   
+                        Edge* leftEdge = new Edge(&v);
+
+                        for(auto m : targets){
+                            Configuration* c = createConfiguration(*m, *(v.query));
+                            leftEdge->targets.push_back(c);                     
+                        }
                         if (left != NULL) {
-                            e->targets.push_back(left);
-                        }                        
-                        succ.push_back(e);
+                            leftEdge->targets.push_back(left);
+                        }                    
+                        succ.push_back(leftEdge);
                     }
+                } //else: Left side is not temporal and it's false, no way to succeed there...            
+
+                if (right != NULL) {
+                    succ.push_back(right);
                 }
             }
-            
-            if (right != NULL) {
-                succ.push_back(right);
-            }
-            
-        } //Exists Until end
-
-        //Exists Next start
-        else if(v.query->path == X){
-            auto targets = nextState(*(v.marking));
-            CTLTree* query = v.query->first;
-
-            if(!targets.empty())
-            {
-                if (query->isTemporal) {    //have to check, no way to skip that
-                    for(auto m : targets){                    
-                        Edge* e = new Edge(&v);
-                        Configuration* c = createConfiguration(*m, *query);
-                        e->targets.push_back(c);
-                        succ.push_back(e);
-                    } 
+            else if(v.query->GetPath() == F){
+                Edge *subquery = NULL;
+                if (!v.query->GetFirstChild()->IsTemporal) {
+                    bool valid = fastEval(*(v.query->GetFirstChild()), *(v.marking));
+                    if (valid) {
+                        succ.push_back(new Edge(&v));
+                        v.Successors = succ;
+                        return succ;
+                    }
                 } else {
-                    for(auto m : targets) {
-                        bool valid = fastEval(*query, *m);
-                        if (valid) {
-                            succ.push_back(new Edge(&v));
-                            v.Successors = succ;
-                            return succ;
-                        }   //else: It can't hold there, no need to create an edge
+                    subquery = new Edge(&v);
+                    Configuration* c = createConfiguration(*(v.marking), *(v.query->GetFirstChild()));
+                    subquery->targets.push_back(c);
+                }
+
+                auto targets = nextState(*(v.marking));
+
+                if(!targets.empty()){
+                    Edge* e1 = new Edge(&v);
+
+                    for(auto m : targets){
+                        Configuration* c = createConfiguration(*m, *(v.query));
+                        e1->targets.push_back(c);
                     }
-                }
-            }
-        }//Exists Next end
-
-        //Exists Finally start
-        else if(v.query->path == F){            
-            Edge *subquery = NULL;
-            if (!v.query->first->isTemporal) {
-                bool valid = fastEval(*(v.query->first), *(v.marking));                
-                if (valid) {
-                    succ.push_back(new Edge(&v));
-                    v.Successors = succ;
-                    return succ;
-                }
-            } else {
-                Configuration* c = createConfiguration(*(v.marking), *(v.query->first));
-                subquery = new Edge(&v);
-                subquery->targets.push_back(c);                
-            }
-        
-            auto targets = nextState(*(v.marking));
-
-            if(!targets.empty()){
-                for(auto m : targets){
+                    succ.push_back(e1);
+                }
+
+                if (subquery != NULL) {
+                    succ.push_back(subquery);
+                } 
+            }
+            else if(v.query->GetPath() == X){
+                auto targets = nextState(*v.marking);
+                if (v.query->GetFirstChild()->IsTemporal) {   //regular check
                     Edge* e = new Edge(&v);
-                    Configuration* c = createConfiguration(*m, *(v.query));
-                    e->targets.push_back(c);
+                    for (auto m : targets){
+                        Configuration* c = createConfiguration(*m, *(v.query->GetFirstChild()));
+                        e->targets.push_back(c);
+                    }
                     succ.push_back(e);
-                }
-            }
-
-            if (subquery != NULL) {
-                succ.push_back(subquery);
-            }            
-        }//Exists Finally end
-    } //Exists end
-
-    //And start
-    else if (v.query->quantifier == AND){
-
-        //Check if left is false
-        if(!v.query->first->isTemporal){
-            if(!fastEval(*(v.query->first), *v.marking))
-                //query cannot be satisfied, return empty succ set
-                return succ;
-        }
-
-        //check if right is false
-        if(!v.query->second->isTemporal){
-            if(!fastEval(*(v.query->second), *v.marking))
-                return succ;
-        }
-
-        Edge *e = new Edge(&v);
-
-        //If we get here, then either both propositions are true(should not be possible)
-        //Or a temporal operator and a true proposition
-        //Or both are temporal
-        if(v.query->first->isTemporal){
-            e->targets.push_back(createConfiguration(*v.marking, *(v.query->first)));
-        }
-        if(v.query->second->isTemporal){
-            e->targets.push_back(createConfiguration(*v.marking, *(v.query->second)));
-        }
-        succ.push_back(e);
-    } //And end
-
-    //Or start
-    else if (v.query->quantifier == OR){
-
-        //Check if left is true
-        if(!v.query->first->isTemporal){
-            if(fastEval(*(v.query->first), *v.marking)){
-                //query is satisfied, return
-                succ.push_back(new Edge(&v));
-                v.Successors = succ;
-                return succ;
-            }
-        }
-
-        if(!v.query->second->isTemporal){
-            if(fastEval(*(v.query->second), *v.marking)){
-                succ.push_back(new Edge(&v));
-                v.Successors = succ;
-                return succ;
-            }
-        }
-
-        //If we get here, either both propositions are false
-        //Or one is false and one is temporal
-        //Or both temporal
-        if(v.query->first->isTemporal){
-            Edge *e = new Edge(&v);
-            e->targets.push_back(createConfiguration(*v.marking, *(v.query->first)));
-            succ.push_back(e);
-        }
-        if(v.query->second->isTemporal){
-            Edge *e = new Edge(&v);
-            e->targets.push_back(createConfiguration(*v.marking, *(v.query->second)));
-            succ.push_back(e);
-        }
-    } //Or end
-
-    //Negate start
-    else if (v.query->quantifier == NEG){
-            Configuration* c = createConfiguration(*(v.marking), *(v.query->first));
-            Edge* e = new Edge(&v);
-            e->targets.push_back(c);
-            succ.push_back(e);
-    } //Negate end
-
-    //Evaluate Query Begin
-    else {
-        //We should never get here anymore.
-        //v.configPrinter();
-        //assert(false);
-        if (evaluateQuery(*v.query, *v.marking)){
-            succ.push_back(new Edge(&v));
-        }
+                } else {
+                    bool allValid = true;
+                    for (auto m : targets) {
+                        bool valid = fastEval(*(v.query->GetFirstChild()), *m);
+                        if (!valid) {
+                            allValid = false;
+                            break;
+                        }
+                    }
+                    if (allValid) {
+                        succ.push_back(new Edge(&v));
+                        v.Successors = succ;
+                        return succ;
+                    }
+                }
+            }
+            else if(v.query->GetPath() == G ){
+                assert(false && "Path operator G had not been translated - Parse error detected in succ()");
+            }
+            else
+                assert(false && "An unknown error occoured in the successor generator");
+        }
+        else if(v.query->GetQuantifier() == E){
+            if (v.query->GetPath() == U){
+                Edge *right = NULL;
+                if (v.query->GetSecondChild()->IsTemporal) {
+                    Configuration* c = createConfiguration(*(v.marking), *(v.query->GetSecondChild()));
+                    right = new Edge(&v);
+                    right->targets.push_back(c);
+                } else {
+                    bool valid = fastEval(*(v.query->GetSecondChild()), *(v.marking));
+                    if (valid) {
+                        succ.push_back(new Edge(&v));
+                        v.Successors = succ;
+                        return succ;
+                    }   // else: right condition is not satisfied, no need to add an edge
+                }            
+
+                auto targets = nextState(*(v.marking));
+
+                if(!targets.empty()){
+                    Configuration *left = NULL;
+                    bool valid = false;
+                    if (v.query->GetFirstChild()->IsTemporal) {
+                        left = createConfiguration(*(v.marking), *(v.query->GetFirstChild()));
+                    } else {
+                        valid = fastEval(*(v.query->GetFirstChild()), *(v.marking));
+                    }
+                    if (left != NULL || valid) {
+                        for(auto m : targets) {
+                            Edge* e = new Edge(&v);
+                            Configuration* c1 = createConfiguration(*m, *(v.query));
+                            e->targets.push_back(c1);
+                            if (left != NULL) {
+                                e->targets.push_back(left);
+                            }                        
+                            succ.push_back(e);
+                        }
+                    }
+                }
+
+                if (right != NULL) {
+                    succ.push_back(right);
+                }
+            }
+            else if(v.query->GetPath() == F){
+                Edge *subquery = NULL;
+                if (!v.query->GetFirstChild()->IsTemporal) {
+                    bool valid = fastEval(*(v.query->GetFirstChild()), *(v.marking));                
+                    if (valid) {
+                        succ.push_back(new Edge(&v));
+                        v.Successors = succ;
+                        return succ;
+                    }
+                } else {
+                    Configuration* c = createConfiguration(*(v.marking), *(v.query->GetFirstChild()));
+                    subquery = new Edge(&v);
+                    subquery->targets.push_back(c);                
+                }
+
+                auto targets = nextState(*(v.marking));
+
+                if(!targets.empty()){
+                    for(auto m : targets){
+                        Edge* e = new Edge(&v);
+                        Configuration* c = createConfiguration(*m, *(v.query));
+                        e->targets.push_back(c);
+                        succ.push_back(e);
+                    }
+                }
+
+                if (subquery != NULL) {
+                    succ.push_back(subquery);
+                }
+            }
+            else if(v.query->GetPath() == X){
+                auto targets = nextState(*(v.marking));
+                CTLQuery* query = v.query->GetFirstChild();
+
+                if(!targets.empty())
+                {
+                    if (query->IsTemporal) {    //have to check, no way to skip that
+                        for(auto m : targets){                    
+                            Edge* e = new Edge(&v);
+                            Configuration* c = createConfiguration(*m, *query);
+                            e->targets.push_back(c);
+                            succ.push_back(e);
+                        } 
+                    } else {
+                        for(auto m : targets) {
+                            bool valid = fastEval(*query, *m);
+                            if (valid) {
+                                succ.push_back(new Edge(&v));
+                                v.Successors = succ;
+                                return succ;
+                            }   //else: It can't hold there, no need to create an edge
+                        }
+                    }
+                }
+            }
+            else if(v.query->GetPath() == G ){
+                assert(false && "Path operator G had not been translated - Parse error detected in succ()");
+            }
+            else
+                assert(false && "An unknown error occoured in the successor generator");
+        }
+        
     }
-
+    
     v.Successors = succ;
     return succ;
-    //computedSucc += succ.size();
-    //std::cout << "-----------EDGES NOW : " << computedSucc << "\n" << std::flush;
 }
 
 Configuration &OnTheFlyDG::initialConfiguration()
@@ -351,69 +338,61 @@
     return *initial;
 }
 
-bool OnTheFlyDG::evaluateQuery(CTLTree &query, Marking &marking){
-
-    bool result = false;
-
-    if (query.a.isFireable) {
+bool OnTheFlyDG::evaluateQuery(CTLQuery &query, Marking &marking){
+    assert(query.GetQueryType() == EVAL);
+    EvaluateableProposition *proposition = query.GetProposition();
+
+    if (proposition->GetPropositionType() == FIREABILITY) {
         std::list<int> transistions = calculateFireableTransistions(marking);
-
-        for (auto t : transistions) {
-            int fs_transition = 0;
-            for(fs_transition = 0; fs_transition < query.a.firesize; fs_transition++){
-                int dpc_place = 0;
-                int truedependencyplaces = 0;
-                for (dpc_place = 0; dpc_place < query.a.fireset[fs_transition].sizeofdenpencyplaces; dpc_place++){
-
-                    if((query.a.fireset[fs_transition].denpencyplaces[dpc_place].intSmaller - 1) < marking[query.a.fireset[fs_transition].denpencyplaces[dpc_place].placeLarger]){
-                        //std::cout<<_net->placeNames()[query->a.fireset[fs_transition].denpencyplaces[dpc_place].placeLarger]<<" is true"<<std::endl;
-                        truedependencyplaces++;
-                    }
-                }
-                if (truedependencyplaces == query.a.fireset[fs_transition].sizeofdenpencyplaces){
-                    result = true;
-                }
+        std::list<int>::iterator it;
+        transistions.sort();
+
+        for(const auto f : proposition->GetFireset()){
+            it = std::find(transistions.begin(), transistions.end(), f);
+            if(it != transistions.end()){
+                return true;
             }
         }
-        return result;
-    }
-
-    ///std::cout<<"Evaluating cardinality... "<<std::endl;
- //   t_config.configPrinter();
- //   std::cout<<"Less: ";
-    int less = query.a.cardinality.intSmaller;
-    int greater= query.a.cardinality.intLarger;
-    if( less == -1 ){
-        int i = 0;
-        less = 0;
-        for (i = 0; i < query.a.cardinality.placeSmaller.sizeoftokencount; i++){
-            int index = query.a.cardinality.placeSmaller.cardinality[i];
-            less += marking[index];
- //           std::cout<<t_config.marking->Value()[index]<<" + ";
-        }
-    }
-//    std::cout<<" = "<<less<<std::endl;
-//    std::cout<<"Greater: ";
-    if (greater == -1){
-        int i = 0;
-        greater = 0;
-       // std::cout<<"::: Number of places: "<<query->a.cardinality.placeLarger.sizeoftokencount<<std::endl;
-        for (i = 0; i < query.a.cardinality.placeLarger.sizeoftokencount; i++){
-            //std::cout<<"::::: i: "<<i<<std::endl;
-            int index = query.a.cardinality.placeLarger.cardinality[i];
-            //std::cout<<"::::: Index: "<<index<<" - Value: "<<t_config.marking->Value()[index]<<std::endl;
-            greater += marking[index];
-  //          std::cout<<t_config.marking->Value()[index]<<" + ";
-       //     std::cout<<"::::: greater: "<<greater<<std::endl;
-        }
-
-    }
-  //  std::cout<<" = "<<greater<<std::endl;
-
-    result = less <= greater;
-   // std::cout<<"... evaluation Done"<<std::endl;
-    return result;
-}
+        return false;
+    }
+    else if (proposition->GetPropositionType() == CARDINALITY){
+        int first_param = GetParamValue(proposition->GetFirstParameter(), marking);
+        int second_param = GetParamValue(proposition->GetSecondParameter(), marking);
+        return EvalCardianlity(first_param, proposition->GetLoperator(), second_param);
+    }
+    else
+        assert(false && "Incorrect query proposition type was attempted evaluated");
+
+}
+
+int OnTheFlyDG::GetParamValue(CardinalityParameter *param, Marking& marking) {
+    if(param->isPlace){
+        int res = 0;
+        for(int place : param->places_i){
+            res = res + marking.Value()[place];
+        }
+        return res;
+    }
+    else{
+        return param->value;
+    }
+}
+
+bool OnTheFlyDG::EvalCardianlity(int a, LoperatorType lop, int b) {
+    if(lop == EQ)
+        return a == b;
+    else if (lop == LE)
+        return a < b;
+    else if (lop == LEQ)
+        return a <= b;
+    else if (lop == GR)
+        return a > b;
+    else if (lop == GRQ)
+        return a >= b;
+    assert(false && "Unsupported LOperator attemped evaluated");
+}
+
+
 
 int OnTheFlyDG::indexOfPlace(char *t_place){
     for (int i = 0; i < _nplaces; i++) {
@@ -522,7 +501,7 @@
     }
 }
 
-Configuration *OnTheFlyDG::createConfiguration(Marking &t_marking, CTLTree &t_query)
+Configuration *OnTheFlyDG::createConfiguration(Marking &t_marking, CTLQuery &t_query)
 {
     for(Configuration* c : t_marking.successors){
         if(c->query == &t_query)
@@ -534,7 +513,7 @@
     newConfig->query = &t_query;
 
     //Default value is false
-    if(t_query.quantifier == NEG){
+    if(t_query.GetQueryType() == LOPERATOR && t_query.GetQuantifier() == NEG){
         newConfig->IsNegated = true;
     }
 

=== modified file 'CTL/OnTheFlyDG.h'
--- CTL/OnTheFlyDG.h	2016-04-14 12:15:28 +0000
+++ CTL/OnTheFlyDG.h	2016-05-20 07:41:18 +0000
@@ -34,19 +34,22 @@
 //                        boost::hash<Configuration*>,
 //                        Configuration::Configuration_Equal_To> Configurations;
     bool isCompressing() {return _compressoption;}
+private:
+    int GetParamValue(CardinalityParameter *param, Marking &marking);
+    bool EvalCardianlity(int a, LoperatorType lop, int b);
                         
 protected:
     Marking *cached_marking = nullptr;
     std::vector<Marking*> cached_successors;
 
-    bool evaluateQuery(CTLTree &query, Marking &marking);
+    bool evaluateQuery(CTLQuery &query, Marking &marking);
     bool _compressoption;
     int indexOfPlace(char *t_place);
     std::vector<Marking *> nextState(Marking &t_marking);
     std::list<int> calculateFireableTransistions(Marking &t_marking);
-    Configuration *createConfiguration(Marking &t_marking, CTLTree &t_query);
+    Configuration *createConfiguration(Marking &t_marking, CTLQuery &t_query);
     Marking *createMarking(const Marking &t_marking, int t_transition);
-    bool fastEval(CTLTree &query, Marking &marking);
+    bool fastEval(CTLQuery &query, Marking &marking);
 
     void initCompressOption();
 

=== modified file 'CTL/configuration.cpp'
--- CTL/configuration.cpp	2015-12-08 07:25:27 +0000
+++ CTL/configuration.cpp	2016-05-20 07:41:18 +0000
@@ -1,8 +1,9 @@
 #include "configuration.h"
+#include "../CTLParser/CTLParser_v2.h"
 
 namespace ctl{
 
-Configuration::Configuration(Marking * t_marking, CTLTree * t_query){
+Configuration::Configuration(Marking * t_marking, CTLQuery * t_query){
     marking = t_marking;
     query = t_query;
 }
@@ -36,13 +37,13 @@
 
 
 void Configuration::configPrinter(){
-    CTLParser ctlParser = CTLParser();
+    CTLParser_v2 ctlParser = CTLParser_v2();
     int i = 0;
     std::cout << "Marking: ";
     marking->print();
     std::cout << " Q: " << std::flush;
-    ctlParser.printQuery(query);
-    std::cout << " D: "<<query->depth  << std::flush;
+    std::cout << ctlParser.QueryToString(query)<<std::flush;
+    std::cout << " D: "<<query->Depth  << std::flush;
     std::cout << " Assign: " << assignment << std::flush;
 
     std::cout << " NEG: " << IsNegated << "\n" << std::flush;

=== modified file 'CTL/configuration.h'
--- CTL/configuration.h	2016-04-12 10:22:19 +0000
+++ CTL/configuration.h	2016-05-20 07:41:18 +0000
@@ -2,6 +2,7 @@
 #define CONFIGURATION_H
 
 #include "../CTLParser/CTLParser.h"
+#include "../CTLParser/CTLQuery.h"
 #include "marking.h"
 #include "edge.h"
 #include <list>
@@ -26,7 +27,7 @@
     };
 
     Configuration(){}
-    Configuration(Marking* t_marking, CTLTree* t_query);
+    Configuration(Marking* t_marking, CTLQuery* t_query);
     virtual ~Configuration();
 
     void removeSuccessor(Edge *t_successor);
@@ -36,7 +37,7 @@
     bool operator!=(const Configuration &rhs) const {return !(*this == rhs);}
 
     Marking* marking;
-    CTLTree* query;
+    CTLQuery* query;
     std::list<Edge*> Successors;
     std::list<Edge*> DependencySet;
     bool IsNegated = false;
@@ -60,7 +61,8 @@
 
             return result;*/
             long xorHash = ((long) t_config.query) ^ ((long) t_config.marking);
-            return (size_t) (xorHash ^ (xorHash >> 32));
+            //return (size_t) (xorHash ^ (xorHash >> 32)); <-- Only works for 64bit
+            return (size_t) (xorHash ^ (xorHash >> ((sizeof(size_t)*8)/2)));
         }
     };
     template<>

=== modified file 'CTL/edge.cpp'
--- CTL/edge.cpp	2016-01-21 11:38:51 +0000
+++ CTL/edge.cpp	2016-05-20 07:41:18 +0000
@@ -34,7 +34,7 @@
     int beta = 1;
     int gamma = 1;
 
-    int dist = source->query->depth;
+    int dist = source->query->Depth;
     int breath = 0;
     int succ = source->Successors.size();
 

=== added file 'CTLParser/CTLOptimizer.cpp'
--- CTLParser/CTLOptimizer.cpp	1970-01-01 00:00:00 +0000
+++ CTLParser/CTLOptimizer.cpp	2016-05-20 07:41:18 +0000
@@ -0,0 +1,77 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   CTLOptimizer.cpp
+ * Author: mossns
+ * 
+ * Created on April 28, 2016, 1:54 PM
+ */
+
+#include "CTLOptimizer.h"
+
+CTLOptimizer::CTLOptimizer() {
+}
+
+CTLOptimizer::CTLOptimizer(const CTLOptimizer& orig) {
+}
+
+CTLOptimizer::~CTLOptimizer() {
+}
+
+CTLQuery* CTLOptimizer::Optimize(CTLQuery *query) {
+    query = OptimizeNegation(query);
+    return query;
+}
+
+CTLQuery* CTLOptimizer::OptimizeNegation(CTLQuery *query) {
+    CTLType query_type = query->GetQueryType();
+    if(query_type == EVAL){
+        return query;
+    }
+    else if (query_type == LOPERATOR){
+        if(query->GetQuantifier() != NEG){
+            query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+            query->SetSecondChild(OptimizeNegation(query->GetSecondChild()));
+        }
+        else {//Negation
+            if(query->GetFirstChild()->GetQueryType() == LOPERATOR && query->GetFirstChild()->GetQuantifier() == NEG){
+                query = query->GetFirstChild()->GetFirstChild();
+                if(query->GetQueryType() == EVAL){
+                    return query;
+                }
+                else if(query->GetQueryType() == LOPERATOR){
+                    if(query->GetQuantifier() != NEG){
+                        query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+                        query->SetSecondChild(OptimizeNegation(query->GetSecondChild()));
+                    }
+                    else{
+                        query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+                    }
+                }
+                else if (query->GetQueryType() == PATHQEURY){
+                    if (query->GetPath() == U){
+                        query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+                        query->SetSecondChild(OptimizeNegation(query->GetSecondChild()));
+                    }
+                    else{
+                        query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+                    }
+                }
+            }
+        }
+    }
+    else if (query_type == PATHQEURY){
+        if (query->GetPath() == U){
+            query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+            query->SetSecondChild(OptimizeNegation(query->GetSecondChild()));
+        }
+        else{
+            query->SetFirstChild(OptimizeNegation(query->GetFirstChild()));
+        }
+    }
+    return query;
+}

=== added file 'CTLParser/CTLOptimizer.h'
--- CTLParser/CTLOptimizer.h	1970-01-01 00:00:00 +0000
+++ CTLParser/CTLOptimizer.h	2016-05-20 07:41:18 +0000
@@ -0,0 +1,31 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   CTLOptimizer.h
+ * Author: mossns
+ *
+ * Created on April 28, 2016, 1:54 PM
+ */
+
+#ifndef CTLOPTIMIZER_H
+#define CTLOPTIMIZER_H
+
+#include "CTLQuery.h"
+
+class CTLOptimizer {
+public:
+    CTLOptimizer();
+    CTLOptimizer(const CTLOptimizer& orig);
+    virtual ~CTLOptimizer();
+    
+    CTLQuery * Optimize(CTLQuery *query);
+private:
+    CTLQuery * OptimizeNegation(CTLQuery *query);
+};
+
+#endif /* CTLOPTIMIZER_H */
+

=== modified file 'CTLParser/CTLParser.cpp'
--- CTLParser/CTLParser.cpp	2016-02-11 13:26:44 +0000
+++ CTLParser/CTLParser.cpp	2016-05-20 07:41:18 +0000
@@ -35,7 +35,6 @@
     #ifdef DEBUG
     std::cout << "Creating doc\n" << std::flush;
     #endif
-//    CTLquery ctlquery;
     xml_document<> doc;
     xml_node<> * root_node;
     

=== added file 'CTLParser/CTLParser_v2.cpp'
--- CTLParser/CTLParser_v2.cpp	1970-01-01 00:00:00 +0000
+++ CTLParser/CTLParser_v2.cpp	2016-05-20 07:41:18 +0000
@@ -0,0 +1,508 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   CTLParser_v2.cpp
+ * Author: mossns
+ * 
+ * Created on April 22, 2016, 10:15 AM
+ */
+
+#include "rapidxml-1.13/rapidxml.hpp"
+#include "CTLParser_v2.h"
+#include "CTLQuery.h"
+#include "EvaluateableProposition.h"
+#include <algorithm>
+
+
+using namespace rapidxml;
+
+CTLParser_v2::CTLParser_v2() {
+}
+
+CTLParser_v2::CTLParser_v2(const CTLParser_v2& orig) {
+}
+
+CTLParser_v2::~CTLParser_v2() {
+}
+
+std::string CTLParser_v2::QueryToString(CTLQuery* query){
+    if(query->GetQuantifier() == EMPTY && query->GetPath() == pError){
+        return query->GetAtom();
+    }
+    else if (query->GetPath() == pError){
+        Quantifier q = query->GetQuantifier();
+        if (q == NEG){
+            return query->ToString() + "(" + QueryToString(query->GetFirstChild()) + ")";
+        }
+        else if (q == AND || q == OR){
+            return "(" + QueryToString(query->GetFirstChild()) + query->ToString() + QueryToString(query->GetSecondChild()) + ")";
+        }
+        else assert(false && "Could not print unknown logical query operator");
+    }
+    else if(query->GetQuantifier() == A || query->GetQuantifier() == E){
+        if(query->GetPath() == U){
+            return query->ToString() + "(" + QueryToString(query->GetFirstChild()) + ")Reach(" + QueryToString(query->GetSecondChild()) + ")";
+        }
+        else{
+            return query->ToString() + "(" + QueryToString(query->GetFirstChild()) + ")";
+        }
+    }
+    else assert(false && "Could not print unknown query type");
+}
+
+CTLQuery* CTLParser_v2::FormatQuery(CTLQuery* query, PetriEngine::PetriNet *net){
+    query = FillAtom(query,net);
+    query = ConvertAG(query);
+    query = ConvertEG(query);
+    IdSetting(query, 0);
+    query = TemporalSetting(query);
+    //assert(false);
+    return query;
+}
+
+CTLQuery* CTLParser_v2::TemporalSetting(CTLQuery* query) {
+    CTLType query_type = query->GetQueryType();
+    if(query_type == EVAL){
+        assert(!query->IsTemporal);
+        return query;
+    }
+    else if (query_type == LOPERATOR){
+        Quantifier quan = query->GetQuantifier();
+        if(quan != NEG){
+            query->SetFirstChild(TemporalSetting(query->GetFirstChild()));
+            query->SetSecondChild(TemporalSetting(query->GetSecondChild()));
+            query->IsTemporal = (query->GetFirstChild()->IsTemporal || query->GetSecondChild()->IsTemporal);
+        }
+        else{
+            query->SetFirstChild(TemporalSetting(query->GetFirstChild()));
+            query->IsTemporal = (query->GetFirstChild()->IsTemporal);
+        }
+        return query;
+    }
+    else if (query_type == PATHQEURY){
+        assert(query->IsTemporal);
+        if (query->GetPath() == U){
+            query->SetFirstChild(TemporalSetting(query->GetFirstChild()));
+            query->SetSecondChild(TemporalSetting(query->GetSecondChild()));
+        }
+        else{
+            query->SetFirstChild(TemporalSetting(query->GetFirstChild()));
+        }
+        return query;
+    } else {
+        //this should not happen
+        assert(false);
+    }
+}
+
+//returns next available id
+int CTLParser_v2::IdSetting(CTLQuery *query, int id)
+{
+    query->Id = id;
+    CTLType query_type = query->GetQueryType();
+    if(query_type == EVAL){
+        assert(!query->IsTemporal);
+        query->Depth = 0;
+        return id + 1;
+    }
+    else if (query_type == LOPERATOR){
+        Quantifier quan = query->GetQuantifier();
+        if(quan != NEG){
+            int afterFirst = IdSetting(query->GetFirstChild(), id + 1);
+            int afterSecond = IdSetting(query->GetSecondChild(), afterFirst);
+            query->Depth = std::max(query->GetFirstChild()->Depth, query->GetSecondChild()->Depth) + 1;
+            return afterSecond;
+        }
+        else{
+            int afterFirst = IdSetting(query->GetFirstChild(), id + 1);
+            query->Depth = query->GetFirstChild()->Depth + 1;
+            return afterFirst;
+        }
+    }
+    else if (query_type == PATHQEURY){
+        assert(query->IsTemporal);
+        if (query->GetPath() == U){
+            int afterFirst = IdSetting(query->GetFirstChild(), id + 1);
+            int afterSecond = IdSetting(query->GetSecondChild(), afterFirst);
+            query->Depth = std::max(query->GetFirstChild()->Depth, query->GetSecondChild()->Depth) + 1; 
+            return afterSecond;
+        }
+        else{
+            int afterFirst = IdSetting(query->GetFirstChild(), id + 1);
+            query->Depth = query->GetFirstChild()->Depth + 1;
+            return afterFirst;
+        }
+    } else {
+        //this should not happen
+        assert(false);
+    }
+}
+
+
+CTLQuery* CTLParser_v2::FillAtom(CTLQuery* query, PetriEngine::PetriNet *net) {
+    CTLType query_type = query->GetQueryType();
+    if(query_type == EVAL){
+        EvaluateableProposition *proposition = new EvaluateableProposition(query->GetAtom(), net);
+        query->SetProposition(proposition);
+        return query;
+    }
+    else if (query_type == LOPERATOR){
+        Quantifier quan = query->GetQuantifier();
+        if(quan != NEG){
+            FillAtom(query->GetFirstChild(),net);
+            FillAtom(query->GetSecondChild(),net);
+        }
+        else{
+            FillAtom(query->GetFirstChild(),net);
+        }
+        return query;
+    }
+    else if (query_type == PATHQEURY){
+        if (query->GetPath() == U){
+            FillAtom(query->GetFirstChild(),net);
+            FillAtom(query->GetSecondChild(),net);
+        }
+        else{
+            FillAtom(query->GetFirstChild(),net);
+        }
+        return query;
+    }
+    else assert(false && "Could not traverse unknown query type");
+}
+
+CTLQuery* CTLParser_v2::ConvertAG(CTLQuery* query) {
+    CTLType query_type = query->GetQueryType();
+    if(query_type == EVAL){
+        return query;
+    }
+    else if (query_type == LOPERATOR){
+        Quantifier quan = query->GetQuantifier();
+        if(quan != NEG){
+            query->SetFirstChild(ConvertAG(query->GetFirstChild()));
+            query->SetSecondChild(ConvertAG(query->GetSecondChild()));
+        }
+        else{
+            query->SetFirstChild(ConvertAG(query->GetFirstChild()));
+        }
+        return query;
+    }
+    else if (query_type == PATHQEURY){
+        if (query->GetPath() == U){
+            query->SetFirstChild(ConvertAG(query->GetFirstChild()));
+            query->SetSecondChild(ConvertAG(query->GetSecondChild()));
+        }
+        else if (query->GetQuantifier() == A && query->GetPath() == G){
+            
+            CTLQuery *neg_two = new CTLQuery(NEG, pError, false, "");
+            neg_two->SetFirstChild(query->GetFirstChild());
+            CTLQuery *ef_q = new CTLQuery(E, F, false, "");
+            ef_q->SetFirstChild(neg_two);
+            CTLQuery *neg_one = new CTLQuery(NEG, pError, false, "");
+            neg_one->SetFirstChild(ef_q);
+            query = neg_one;
+            
+            query->SetFirstChild(ConvertAG(query->GetFirstChild()));
+        }
+        else{
+            query->SetFirstChild(ConvertAG(query->GetFirstChild()));
+        }
+        return query;
+    }
+    else assert(false && "Could not traverse unknown query type");
+}
+
+CTLQuery* CTLParser_v2::ConvertEG(CTLQuery* query) {
+    CTLType query_type = query->GetQueryType();
+    if(query_type == EVAL){
+        return query;
+    }
+    else if (query_type == LOPERATOR){
+        Quantifier quan = query->GetQuantifier();
+        if(quan != NEG){
+            query->SetFirstChild(ConvertEG(query->GetFirstChild()));
+            query->SetSecondChild(ConvertEG(query->GetSecondChild()));
+        }
+        else{
+            query->SetFirstChild(ConvertEG(query->GetFirstChild()));
+        }
+        return query;
+    }
+    else if (query_type == PATHQEURY){
+        if (query->GetPath() == U){
+            query->SetFirstChild(ConvertEG(query->GetFirstChild()));
+            query->SetSecondChild(ConvertEG(query->GetSecondChild()));
+        }
+        else if (query->GetQuantifier() == E && query->GetPath() == G){
+            
+            CTLQuery *neg_two = new CTLQuery(NEG, pError, false, "");
+            neg_two->SetFirstChild(query->GetFirstChild());
+            CTLQuery *ef_q = new CTLQuery(A, F, false, "");
+            ef_q->SetFirstChild(neg_two);
+            CTLQuery *neg_one = new CTLQuery(NEG, pError, false, "");
+            neg_one->SetFirstChild(ef_q);
+            query = neg_one;
+            
+            query->SetFirstChild(ConvertEG(query->GetFirstChild()));
+        }
+        else{
+            query->SetFirstChild(ConvertEG(query->GetFirstChild()));
+        }
+        return query;
+    }
+    else assert(false && "Could not traverse unknown query type");
+}
+
+
+CTLQuery * CTLParser_v2::ParseXMLQuery(std::vector<char> buffer, int query_number) {
+    #ifdef DEBUG
+    std::cout << "Creating doc\n" << std::flush;
+    #endif
+    xml_document<> doc;
+    xml_node<> * root_node;
+    
+    #ifdef DEBUG
+    std::cout << "Size of Path enum: " << sizeof(Path)*8 <<"\n";
+    #endif
+    doc.parse<0>(&buffer[0]);
+    
+
+#ifdef DEBUG
+    std::cout << "First node id: " << doc.first_node()->name() << std::endl;
+#endif
+
+    root_node = doc.first_node();
+
+#ifdef Analysis
+    std::cout << "\nAnalysis:: Queries:" << std::endl;
+#endif
+    int i = 1;
+    for (xml_node<> * property_node = root_node->first_node("property"); property_node; property_node = property_node->next_sibling()) {
+        if(i == query_number){
+            xml_node<> * id_node = property_node->first_node("id");
+            xml_node<> * formula_node = id_node->next_sibling("description")->next_sibling("formula");
+            CTLQuery * query = xmlToCTLquery(formula_node->first_node());
+            return query;
+        }
+        i++;
+    }
+    assert(false && "Query number did not match a property in the provided .xml file.");
+}
+
+QueryMeta* CTLParser_v2::GetQueryMetaData(std::vector<char> buffer) {
+    xml_document<> doc;
+    xml_node<> * root_node;
+    doc.parse<0>(&buffer[0]);
+    root_node = doc.first_node();
+    QueryMeta *meta_d = new QueryMeta();
+    xml_node<> * first_property_node = root_node->first_node("property");
+    xml_node<> * id_node = first_property_node->first_node("id");
+    std::string model_name(id_node->value());
+    int i = 0;
+    for (xml_node<> * property_node = root_node->first_node("property"); property_node; property_node = property_node->next_sibling()) {    
+        i++;
+    }
+    meta_d->numberof_queries = i;
+    std::size_t pos = model_name.find_last_of("-0") - 1;
+    meta_d->model_name = model_name.substr(0, pos);
+    return meta_d;
+}
+
+
+CTLQuery* CTLParser_v2::xmlToCTLquery(xml_node<> * root) {
+    char *root_name = root->name();
+    char firstLetter = root_name[0];
+    CTLQuery *query;
+    if (firstLetter == 'a') {
+        //Construct all-paths
+        query = new CTLQuery(A, getPathOperator(root), false, "");
+        assert(query->GetQuantifier() == A && "Failed setting quantifier");
+    }
+    else if (firstLetter == 'e' ) {
+        //Construct exists-path
+        query = new CTLQuery(E, getPathOperator(root), false, "");
+        assert(query->GetQuantifier() == E && "Failed setting path operator");
+    }
+    else if (firstLetter == 'n' ) {
+        //Construct negation
+        query = new CTLQuery(NEG, pError, false, "");
+        assert(query->GetQuantifier() == NEG && "Failed setting negation operator");
+    }
+    else if (firstLetter == 'c' ) {
+        //Construct conjunction
+        query = new CTLQuery(AND, pError, false, "");
+        assert(query->GetQuantifier() == AND && "Failed setting and operator");
+    }
+    else if (firstLetter == 'd' ) {
+        //Construct disjunction
+        query = new CTLQuery(OR, pError, false, "");
+        assert(query->GetQuantifier() == OR && "Failed setting or operator");
+    }
+    else if (firstLetter == 'i' ) {
+        //Construct Atom
+        std::string atom_str = "";
+        if (root_name[1] == 's' ){
+            //Fireability Query File
+            atom_str = root->name();
+            atom_str = atom_str + "(";
+            root = root->first_node();
+            atom_str = atom_str + root->value();
+            for (xml_node<> * transition_node = root->next_sibling(); transition_node; transition_node = transition_node->next_sibling()) {
+                atom_str = atom_str + ", " + transition_node->value();
+            }
+            atom_str = atom_str + ")";
+        }
+        else if (root_name[1] == 'n') {
+            //Cardinality Query File
+            std::string loperator = root->name();
+            xml_node<> * par_node = root->first_node();
+            std::string first = parsePar(par_node);
+            par_node = par_node->next_sibling();
+            std::string second = parsePar(par_node);
+            
+            loperator = loperator_sym(loperator);
+            
+            atom_str = first + loperator + second;
+            
+        }
+        else assert(false && "Incorrectly format of .xml file provided");
+        query = new CTLQuery(EMPTY, pError, true, atom_str);
+        query->Depth = 0;
+        return query;
+    }
+    else if (firstLetter == 't' ){
+        std::string atom_str = "integer-constant(0) le integer-constant(0)";
+        query = new CTLQuery(EMPTY, pError, true, atom_str);
+        query->Depth = 0;
+        return query;
+    }
+    else if (firstLetter == 'f' ){
+        std::string atom_str = "integer-constant(2) le integer-constant(0)";
+        query = new CTLQuery(EMPTY, pError, true, atom_str);
+        query->Depth = 0;
+        return query;
+    }
+    else assert(false && "Failed parsing .xml file provided. Incorrect format.");
+    
+    if (query->GetPath() == U) {
+        xml_node<> * child_node = root->first_node()->first_node();
+        query->SetFirstChild(xmlToCTLquery(child_node->first_node()));
+        child_node = child_node->next_sibling();
+        query->SetSecondChild(xmlToCTLquery(child_node->first_node()));
+        
+        query->Depth = (max_depth(query->GetFirstChild()->Depth, query->GetSecondChild()->Depth)) + 1;
+    }
+    else if (query->GetQuantifier() == AND || query->GetQuantifier() == OR) {
+        xml_node<> * child_node = root->first_node();
+        query->SetFirstChild(xmlToCTLquery(child_node));
+        child_node = child_node->next_sibling();
+        query->SetSecondChild(xmlToCTLquery(child_node));
+        
+        query->Depth = (max_depth(query->GetFirstChild()->Depth, query->GetSecondChild()->Depth)) + 1;
+    }
+    else if (query->GetQuantifier() == NEG) {
+        query->SetFirstChild(xmlToCTLquery(root->first_node()));
+        query->Depth = query->GetFirstChild()->Depth + 1;
+    }
+    else if (query->GetPath() == pError){
+        assert(false && "Failed setting Path operator");
+    }
+    else if (query->GetQueryType() == PATHQEURY) {
+        query->SetFirstChild(xmlToCTLquery(root->first_node()->first_node()));
+        query->Depth = query->GetFirstChild()->Depth + 1;
+    }
+    else{
+        assert(false && "Attemting to give atom children - ERROR");
+    }
+    
+    return query;
+}
+
+Path CTLParser_v2::getPathOperator(xml_node<> * quantifyer_node){
+    char path_firstLetter = quantifyer_node->first_node()->name()[0];
+    if(path_firstLetter == 'f')
+        return F;
+    else if (path_firstLetter == 'g')
+        return G;
+    else if (path_firstLetter == 'n')
+        return X;
+    else if (path_firstLetter == 'u')
+        return U;
+    else assert(false && "Failed parsing path operator. Incorrect format.");
+}
+
+std::string CTLParser_v2::parsePar(xml_node<> * parameter){
+    std::string parameter_str = parameter->name();
+    parameter_str = parameter_str + "(";
+    
+    if (parameter->name()[0] == 't'){
+        xml_node<> * place_node = parameter->first_node();
+        parameter_str = parameter_str + place_node->value();
+        for(place_node = place_node->next_sibling(); place_node; place_node = place_node->next_sibling()){
+            parameter_str = parameter_str + ", " + place_node->value();
+        }
+        parameter_str = parameter_str + ")";
+    }
+    
+    else if(parameter->name()[0] == 'i'){
+        parameter_str = parameter_str + parameter->value() + ")";
+    }
+    else assert(false && "Failed parsing cardinality parameter. Incorrect format.");
+    return parameter_str;
+}
+
+/*
+ for (xml_node<> * transition_node = root->next_sibling(); transition_node; transition_node = transition_node->next_sibling()) {
+                atom_str = atom_str + ", " + transition_node->value();
+            }
+            atom_str = atom_str + ")";
+ */
+
+int CTLParser_v2::max_depth(int a, int b){
+    if(a < b) return b; return a;
+}
+
+std::string CTLParser_v2::loperator_sym(std::string loperator){
+    if(loperator.compare("integer-le") == 0){
+        return " le ";
+    }
+    else if(loperator.compare("integer-ge")){
+        return " ge ";
+    }
+    else if(loperator.compare("integer-eq")){
+        return " eq ";
+    }
+    else return " " + loperator + " ";
+}
+
+CTLQuery * CTLParser_v2::CopyQuery(CTLQuery *source){
+    if(source->GetQueryType() == EVAL){
+        return new CTLQuery(EMPTY, pError, true, source->GetAtom());
+    }
+    else if(source->GetQueryType() == LOPERATOR){
+        CTLQuery *dest = new CTLQuery(source->GetQuantifier(), pError, false, "");
+        if(source->GetQuantifier() != NEG){
+            dest->SetFirstChild(CopyQuery(source->GetFirstChild()));
+            dest->SetSecondChild(CopyQuery(source->GetSecondChild()));
+        }
+        else {
+            dest->SetFirstChild(CopyQuery(source->GetFirstChild()));
+        }
+        return dest;
+    }
+    else if(source->GetQueryType() == PATHQEURY){
+        CTLQuery *dest = new CTLQuery(source->GetQuantifier(), source->GetPath(), false, "");
+        if(source->GetPath() == U){
+            dest->SetFirstChild(CopyQuery(source->GetFirstChild()));
+            dest->SetSecondChild(CopyQuery(source->GetSecondChild()));
+        }
+        else{
+            dest->SetFirstChild(CopyQuery(source->GetFirstChild()));
+        }
+        return dest;
+    }
+    else assert(false && "ERROR::: Copying query failed");
+}

=== added file 'CTLParser/CTLParser_v2.h'
--- CTLParser/CTLParser_v2.h	1970-01-01 00:00:00 +0000
+++ CTLParser/CTLParser_v2.h	2016-05-20 07:41:18 +0000
@@ -0,0 +1,56 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   CTLParser_v2.h
+ * Author: mossns
+ *
+ * Created on April 22, 2016, 10:15 AM
+ */
+
+#ifndef CTLPARSER_V2_H
+#define CTLPARSER_V2_H
+
+#include "rapidxml-1.13/rapidxml.hpp"
+#include <vector>
+#include <string>
+#include <stdio.h>
+#include "CTLQuery.h"
+
+struct QueryMeta{
+    int numberof_queries = 0;
+    std::string model_name;
+    
+};
+
+class CTLParser_v2 {
+public:
+    CTLParser_v2();
+    CTLParser_v2(const CTLParser_v2& orig);
+    virtual ~CTLParser_v2();
+    CTLQuery * ParseXMLQuery(std::vector<char> buffer, int query_number);
+    CTLQuery* FormatQuery(CTLQuery* query, PetriEngine::PetriNet *net);
+    std::string QueryToString(CTLQuery* query);
+    QueryMeta * GetQueryMetaData(std::vector<char> buffer);
+private:
+    CTLQuery* xmlToCTLquery(rapidxml::xml_node<> * root);
+    std::string parsePar(rapidxml::xml_node<> * parameter);
+    Path getPathOperator(rapidxml::xml_node<> * quantifyer_node);
+    int max_depth(int a, int b);
+    std::string loperator_sym(std::string loperator);
+    CTLQuery * CopyQuery(CTLQuery *source);
+    
+    CTLQuery* FillAtom(CTLQuery* query, PetriEngine::PetriNet *net);
+    CTLQuery* ConvertAG(CTLQuery* query);
+    CTLQuery* ConvertEG(CTLQuery* query);
+    CTLQuery* TemporalSetting(CTLQuery* query);
+    int IdSetting(CTLQuery* query, int id);
+    QueryMeta *_meta;
+
+};
+
+#endif /* CTLPARSER_V2_H */
+

=== added file 'CTLParser/CTLQuery.cpp'
--- CTLParser/CTLQuery.cpp	1970-01-01 00:00:00 +0000
+++ CTLParser/CTLQuery.cpp	2016-05-20 07:41:18 +0000
@@ -0,0 +1,159 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   CTLQuery.cpp
+ * Author: mossns
+ * 
+ * Created on April 22, 2016, 7:57 AM
+ */
+
+#include <string.h>
+
+#include "CTLQuery.h"
+#include "CTLParser.h"
+
+CTLQuery::CTLQuery(Quantifier q, Path p, bool isAtom, std::string atom_str) {
+    if(isAtom){
+        assert(q == EMPTY);
+        assert(p == pError);
+        assert(atom_str.compare("") != 0);
+        
+        _hasAtom = true;
+        _hasQuantifier = false;
+        _hasPath = false;
+        _q = q;
+        _path = p;
+        _a = atom_str;
+        IsTemporal = false;
+    }
+    else if(q == AND || q == OR || q == NEG){
+        assert(p == pError);
+        _hasAtom = false;
+        _hasQuantifier = true;
+        _hasPath = false;
+        _q = q;
+        _path = p;
+        _a = "";
+        IsTemporal = false;
+    }
+    else{
+        assert(q != EMPTY);
+        assert(p != pError);
+        _hasAtom = false;
+        _hasQuantifier = true;
+        _hasPath = true;
+        _q = q;
+        _path = p;
+        _a = "";
+        IsTemporal = true;
+    }
+    
+}
+
+CTLQuery::~CTLQuery() {
+}
+
+CTLType CTLQuery::GetQueryType(){
+    if(_hasAtom)
+        return EVAL;
+    else if(_path != pError)
+        return PATHQEURY;
+    else if(_q == AND || _q == OR || _q == NEG)
+        return LOPERATOR;
+    return TYPE_ERROR;
+}
+
+CTLQuery* CTLQuery::GetFirstChild(){
+    if(_hasAtom){
+        std::cout<<"Query " << ToString() << " does not have child"<<std::endl;
+        throw 20;
+    }
+    return _firstchild;
+}
+
+CTLQuery* CTLQuery::GetSecondChild(){
+    assert(!_hasAtom && "Query does not have children");
+    assert(!(_path == F || _path == G || _path == X) && "Query does not have second child");
+    assert(!(_q == NEG) && "Query does not have second child");
+    return _secondchild;
+}
+
+void CTLQuery::SetFirstChild(CTLQuery *q){
+    _firstchild = q;
+}
+
+void CTLQuery::SetSecondChild(CTLQuery *q){
+    _secondchild = q;
+}
+
+Quantifier CTLQuery::GetQuantifier(){
+    return _q;
+}
+
+Path CTLQuery::GetPath(){
+    return _path;
+}
+
+std::string CTLQuery::GetAtom(){
+    return _a;
+}
+
+EvaluateableProposition* CTLQuery::GetProposition(){
+    assert(_hasAtom && "Query does not have proposition");
+    return _proposition;
+}
+
+void CTLQuery::SetProposition(EvaluateableProposition *p){
+    assert(_hasAtom && "Query does not have proposition");
+    _proposition = p;
+}
+
+std::string CTLQuery::ToString(){
+    if(_hasAtom){
+        return _a;
+    }
+    else if(_q == AND){
+        return " & ";
+    }
+    else if(_q == OR){
+        return " | ";
+    }
+    else if(_q == NEG){
+        return "!";
+    }
+    else if(_q == A || _q == E){
+        std::string quanti = "";
+        if (_q == A){
+            quanti = "A";
+        }
+        else quanti = "E";
+        if(_path == F){
+            return quanti + "F";
+        }
+        else if(_path == G){
+            return quanti + "G";
+        }
+        else if(_path == X){
+            return quanti + "X";
+        }
+        else if(_path == U){
+            
+            return quanti.append("U");
+        }
+        else{
+            std::cout<<"::::::Error Printing: Path was empty::::"<<std::endl;
+            assert(false);
+        }
+    }
+    else{
+        std::cout<<"::::::Error Printing: Q was empty::::"<<std::endl;
+        assert(false);
+    }
+}
+
+
+

=== added file 'CTLParser/CTLQuery.h'
--- CTLParser/CTLQuery.h	1970-01-01 00:00:00 +0000
+++ CTLParser/CTLQuery.h	2016-05-20 07:41:18 +0000
@@ -0,0 +1,66 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   CTLQuery.h
+ * Author: Søren Moss Nielsen
+ *
+ * Created on April 22, 2016, 7:57 AM
+ */
+
+#ifndef CTLQUERY_H
+#define CTLQUERY_H
+#include "CTLParser.h"
+#include "EvaluateableProposition.h"
+
+enum CTLType {PATHQEURY = 1, LOPERATOR = 2, EVAL = 3, TYPE_ERROR = -1};
+
+class CTLQuery {
+    
+public:
+    CTLQuery(Quantifier q, Path p, bool isAtom, std::string atom_str);
+    virtual ~CTLQuery();
+    
+    int Id;
+    int Depth;
+    
+    CTLType GetQueryType();
+    CTLQuery* GetFirstChild();
+    CTLQuery* GetSecondChild();
+    void SetFirstChild(CTLQuery *q);
+    void SetSecondChild(CTLQuery *q);
+    std::string ToString();
+    
+    Quantifier GetQuantifier();
+    Path GetPath();
+    std::string GetAtom();
+    
+    EvaluateableProposition* GetProposition();
+    void SetProposition(EvaluateableProposition *p);
+    
+    bool IsTemporal;
+    
+    
+private:
+    std::string CreateEvaluateableProposition(std::string a);
+    
+    bool _hasQuantifier;
+    bool _hasPath;
+    bool _hasAtom;
+    Quantifier _q;
+    Path _path;
+    std::string _a;
+    
+    CTLQuery* _firstchild;
+    CTLQuery* _secondchild;
+    
+    EvaluateableProposition* _proposition;
+    
+
+};
+
+#endif /* CTLQUERY_H */
+

=== added file 'CTLParser/EvaluateableProposition.cpp'
--- CTLParser/EvaluateableProposition.cpp	1970-01-01 00:00:00 +0000
+++ CTLParser/EvaluateableProposition.cpp	2016-05-20 07:41:18 +0000
@@ -0,0 +1,189 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   EvaluateableProposition.cpp
+ * Author: mossns
+ * 
+ * Created on April 27, 2016, 2:36 PM
+ */
+
+#include <string>
+#include <stdexcept> 
+#include <sstream>
+
+#include "EvaluateableProposition.h"
+#include "CTLParser.h"
+
+namespace patch
+{
+    //A replacement for the standard to string function, which we cannot use because old OS X does not have c++11
+    template < typename T > std::string to_string( const T& n )
+    {
+        std::ostringstream stm ;
+        stm << n ;
+        return stm.str() ;
+    }
+}
+
+EvaluateableProposition::EvaluateableProposition(std::string a, PetriEngine::PetriNet *net) {
+    if(a.substr(0,2).compare("in") == 0 || a.substr(0,2).compare("to") == 0){
+        _type = CARDINALITY;
+        _loperator = SetLoperator(a);
+        assert(_loperator != NOT_CARDINALITY);
+
+        size_t begin = a.find('(') + 1;
+        size_t end = a.find(')') - begin;
+        std::string first_parameter_str = a.substr(begin, end);
+        a = a.substr(a.find(')') + 1);
+
+        begin = a.find('(') + 1;
+        end = a.find(')') - begin;
+        std::string second_parameter_str = a.substr(begin, end);
+        _firstParameter = CreateParameter(first_parameter_str, net->placeNames(), net->numberOfPlaces());
+        _secondParameter = CreateParameter(second_parameter_str, net->placeNames(), net->numberOfPlaces());
+    }
+    else if(a.substr(0,2).compare("is") == 0){
+        _type = FIREABILITY;
+        _loperator = NOT_CARDINALITY;
+        size_t s_pos = a.find('(') + 1;
+        size_t e_pos = a.find(')') - 1;
+        assert(s_pos < e_pos);
+        int fire_str_length = e_pos - s_pos + 1;
+        std::string fireset_str = a.substr(s_pos, fire_str_length);
+        SetFireset(fireset_str, net->transitionNames(), net->numberOfTransitions());
+    }
+    else if(a.substr(0,2).compare("tr") == 0){
+        
+    }
+    else if(a.substr(0,2).compare("fa") == 0){
+        
+    }
+    else{
+        assert(false && "Atomic string proposed for proposition could not be parsed");
+    }
+}
+
+EvaluateableProposition::~EvaluateableProposition() {
+}
+
+PropositionType EvaluateableProposition::GetPropositionType(){
+    return _type;
+}
+
+LoperatorType EvaluateableProposition::GetLoperator(){
+    assert(_type == CARDINALITY && "Proposition is not a cardinality proposition");
+    return _loperator;
+}
+
+std::vector<int> EvaluateableProposition::GetFireset() {
+    assert(_type == FIREABILITY && "Proposition is not a fireability proposition");
+    return _fireset;
+}
+
+void EvaluateableProposition::SetFireset(std::string fireset_str, std::vector<std::string> t_names, unsigned int numberof_t){
+    std::string restof_firestring = fireset_str;
+    while(restof_firestring.length() > 0){
+        size_t position = restof_firestring.find(',');
+        std::string current_t = restof_firestring.substr(0, position);
+        for(int i = 0; i < numberof_t; i++){
+            if (current_t.compare(t_names[i]) == 0){
+                _fireset.push_back(i);
+            }
+        }
+        if (position != -1)
+            restof_firestring = restof_firestring.substr(position);
+        else
+            restof_firestring = "";
+    }
+    for ( auto f : _fireset){
+        std::cout<<f<<" is id of "<< t_names[f]<<std::endl;
+    }
+}
+
+CardinalityParameter* EvaluateableProposition::CreateParameter(std::string parameter_str, std::vector<std::string> p_names, unsigned int numberof_p){
+    CardinalityParameter *param = new CardinalityParameter();
+    std::string::size_type sz;    
+    char c;
+    if(sscanf(parameter_str.c_str(), "%d%c", &param->value, &c) == 1) {
+        //If string is identifier starting with a number, you will read two items.
+        //If it's an identifier starting with a character, you will read zero items.
+        //The only time when you read just one item if the whole string is just numbers.
+        param->isPlace = false;
+    } else {    //error
+        
+        param->isPlace = true;
+        std::vector<std::string> places_str;
+        std::size_t found = parameter_str.find(",");
+        
+        while(found != parameter_str.npos){
+            std::string temp = parameter_str.substr(0, found);
+            places_str.push_back(temp);
+            parameter_str = parameter_str.substr(found + 2);
+            found = parameter_str.find(",");
+        }
+        
+        places_str.push_back(parameter_str);
+        
+        for(int i = 0; i < numberof_p; i++){
+            for(std::string place : places_str){
+                if(p_names[i].compare(place) == 0){
+                    param->places_i.push_back(i);
+                }
+            }
+        }
+    }
+    return param;
+}
+
+LoperatorType EvaluateableProposition::SetLoperator(std::string atom_str){
+    std::string loperator_str = atom_str.substr(atom_str.find(')'));
+    loperator_str = loperator_str.substr(0, loperator_str.find('('));
+    if(loperator_str.compare(" le "))
+            return LEQ;
+    else if (loperator_str.compare(" ge "))
+        return GRQ;
+    else if (loperator_str.compare(" eq "))
+        return EQ;
+    else assert(false && "Could not parse the given logical operator");
+}
+
+std::string EvaluateableProposition::ToString() {
+    if (_type == FIREABILITY) {
+        std::string fire_str = "Fireset(";
+        for(auto f : _fireset){
+            fire_str = fire_str + " " + patch::to_string(f);
+        }
+        return fire_str + ")";
+    }
+    else if (_type == CARDINALITY){
+        std::string cardi_str = "(";
+        if(_firstParameter->isPlace)
+            cardi_str = cardi_str + "place(" + patch::to_string(_firstParameter->value) + ")";
+        else
+            cardi_str = cardi_str = patch::to_string(_firstParameter->value);
+        
+        cardi_str = cardi_str + " le ";
+        
+        if(_secondParameter->isPlace)
+            cardi_str = cardi_str + "place(" + patch::to_string(_secondParameter->value) + ")";
+        else
+            cardi_str = cardi_str = patch::to_string(_secondParameter->value);
+        return cardi_str + ")";
+    }
+    else
+        assert(false && "Proposition had no type");
+}
+
+CardinalityParameter* EvaluateableProposition::GetFirstParameter() {
+    assert(_type == CARDINALITY);
+    return _firstParameter;
+}
+
+CardinalityParameter* EvaluateableProposition::GetSecondParameter() {
+    assert(_type == CARDINALITY);
+    return _secondParameter;
+}

=== added file 'CTLParser/EvaluateableProposition.h'
--- CTLParser/EvaluateableProposition.h	1970-01-01 00:00:00 +0000
+++ CTLParser/EvaluateableProposition.h	2016-05-20 07:41:18 +0000
@@ -0,0 +1,53 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   EvaluateableProposition.h
+ * Author: mossns
+ *
+ * Created on April 27, 2016, 2:36 PM
+ */
+
+#ifndef EVALUATEABLEPROPOSITION_H
+#define EVALUATEABLEPROPOSITION_H
+#include <vector>
+#include "PetriEngine/PetriNet.h"
+
+
+enum PropositionType {CARDINALITY = 0, FIREABILITY = 1};
+enum LoperatorType {NOT_CARDINALITY = -1, EQ = 0, LE = 1, LEQ = 2, GR = 3, GRQ = 4};
+
+struct CardinalityParameter{
+    bool isPlace;
+    int value;
+    std::vector<int> places_i;
+};
+
+class EvaluateableProposition {
+public:
+    EvaluateableProposition(std::string a, PetriEngine::PetriNet *net);
+    virtual ~EvaluateableProposition();
+    PropositionType GetPropositionType();
+    LoperatorType GetLoperator();
+    std::vector<int> GetFireset();
+    std::string ToString();
+    CardinalityParameter* GetFirstParameter();
+    CardinalityParameter* GetSecondParameter();
+private:
+    void SetFireset(std::string fireset_str, std::vector<std::string> t_names, unsigned int numberof_t);
+    CardinalityParameter* CreateParameter(std::string parameter_str, std::vector<std::string> p_names, unsigned int numberof_p);
+    LoperatorType SetLoperator(std::string atom_str);
+    
+    PropositionType _type;
+    LoperatorType _loperator;
+    std::vector<int> _fireset;
+    CardinalityParameter* _firstParameter;
+    CardinalityParameter* _secondParameter;
+    
+};
+
+#endif /* EVALUATEABLEPROPOSITION_H */
+

=== added directory 'Tests/unitTesting'
=== added file 'Tests/unitTesting/catch.hpp'
--- Tests/unitTesting/catch.hpp	1970-01-01 00:00:00 +0000
+++ Tests/unitTesting/catch.hpp	2016-05-20 07:41:18 +0000
@@ -0,0 +1,10483 @@
+/*
+ *  Catch v1.5.1
+ *  Generated: 2016-04-28 08:12:37.387488
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
+#define TWOBLUECUBES_CATCH_HPP_INCLUDED
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// #included from: internal/catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic ignored "-Wglobal-constructors"
+#       pragma clang diagnostic ignored "-Wvariadic-macros"
+#       pragma clang diagnostic ignored "-Wc99-extensions"
+#       pragma clang diagnostic ignored "-Wunused-variable"
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wc++98-compat"
+#       pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic ignored "-Wvariadic-macros"
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#endif
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// #included from: internal/catch_notimplemented_exception.h
+#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
+
+// #included from: catch_common.h
+#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
+
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr
+#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr )
+
+#include <sstream>
+#include <stdexcept>
+#include <algorithm>
+
+// #included from: catch_compiler_capabilities.h
+#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+
+// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_CPP11_NULLPTR : is nullptr supported?
+// CATCH_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
+// CATCH_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
+// CATCH_CONFIG_CPP11_IS_ENUM : std::is_enum is supported?
+// CATCH_CONFIG_CPP11_TUPLE : std::tuple is supported
+// CATCH_CONFIG_CPP11_LONG_LONG : is long long supported?
+// CATCH_CONFIG_CPP11_OVERRIDE : is override supported?
+// CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
+
+// CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
+
+// CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported?
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_CPP11_NO_NULLPTR) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+// All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11
+
+#if defined(__cplusplus) && __cplusplus >= 201103L
+#  define CATCH_CPP11_OR_GREATER
+#endif
+
+#ifdef __clang__
+
+#  if __has_feature(cxx_nullptr)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#  endif
+
+#  if __has_feature(cxx_noexcept)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#  endif
+
+#   if defined(CATCH_CPP11_OR_GREATER)
+#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+#   endif
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Borland
+#ifdef __BORLANDC__
+
+#endif // __BORLANDC__
+
+////////////////////////////////////////////////////////////////////////////////
+// EDG
+#ifdef __EDG_VERSION__
+
+#endif // __EDG_VERSION__
+
+////////////////////////////////////////////////////////////////////////////////
+// Digital Mars
+#ifdef __DMC__
+
+#endif // __DMC__
+
+////////////////////////////////////////////////////////////////////////////////
+// GCC
+#ifdef __GNUC__
+
+#   if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#       define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#   endif
+
+#   if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) && defined(CATCH_CPP11_OR_GREATER)
+#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
+#   endif
+
+// - otherwise more recent versions define __cplusplus >= 201103L
+// and will get picked up below
+
+#endif // __GNUC__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+
+#if (_MSC_VER >= 1600)
+#   define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#   define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
+#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#endif
+
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use variadic macros if the compiler supports them
+#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \
+    ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \
+    ( defined __GNUC__ && __GNUC__ >= 3 ) || \
+    ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L )
+
+#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+
+#endif
+
+// Use __COUNTER__ if the compiler supports it
+#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \
+    ( defined __GNUC__  && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 ) || \
+    ( defined __clang__ && __clang_major__ >= 3 )
+
+#define CATCH_INTERNAL_CONFIG_COUNTER
+
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// C++ language feature support
+
+// catch all support for C++11
+#if defined(CATCH_CPP11_OR_GREATER)
+
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#    define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
+#    define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE
+#    define CATCH_INTERNAL_CONFIG_CPP11_TUPLE
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#    define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#  endif
+
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG)
+#    define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG
+#  endif
+
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE)
+#    define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE
+#  endif
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
+#    define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#  endif
+
+#endif // __cplusplus >= 201103L
+
+// Now set the actual defines based on the above + anything the user has configured
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_NULLPTR
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_NOEXCEPT
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_GENERATED_METHODS
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_IS_ENUM
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_TUPLE
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS)
+#   define CATCH_CONFIG_VARIADIC_MACROS
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_LONG_LONG
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_OVERRIDE
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_UNIQUE_PTR
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+
+// noexcept support:
+#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT)
+#  define CATCH_NOEXCEPT noexcept
+#  define CATCH_NOEXCEPT_IS(x) noexcept(x)
+#else
+#  define CATCH_NOEXCEPT throw()
+#  define CATCH_NOEXCEPT_IS(x)
+#endif
+
+// nullptr support
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+#   define CATCH_NULL nullptr
+#else
+#   define CATCH_NULL NULL
+#endif
+
+// override support
+#ifdef CATCH_CONFIG_CPP11_OVERRIDE
+#   define CATCH_OVERRIDE override
+#else
+#   define CATCH_OVERRIDE
+#endif
+
+// unique_ptr support
+#ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR
+#   define CATCH_AUTO_PTR( T ) std::unique_ptr<T>
+#else
+#   define CATCH_AUTO_PTR( T ) std::auto_ptr<T>
+#endif
+
+namespace Catch {
+
+    struct IConfig;
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+#else
+        NonCopyable( NonCopyable const& info );
+        NonCopyable& operator = ( NonCopyable const& );
+#endif
+
+    protected:
+        NonCopyable() {}
+        virtual ~NonCopyable();
+    };
+
+    class SafeBool {
+    public:
+        typedef void (SafeBool::*type)() const;
+
+        static type makeSafe( bool value ) {
+            return value ? &SafeBool::trueValue : 0;
+        }
+    private:
+        void trueValue() const {}
+    };
+
+    template<typename ContainerT>
+    inline void deleteAll( ContainerT& container ) {
+        typename ContainerT::const_iterator it = container.begin();
+        typename ContainerT::const_iterator itEnd = container.end();
+        for(; it != itEnd; ++it )
+            delete *it;
+    }
+    template<typename AssociativeContainerT>
+    inline void deleteAllValues( AssociativeContainerT& container ) {
+        typename AssociativeContainerT::const_iterator it = container.begin();
+        typename AssociativeContainerT::const_iterator itEnd = container.end();
+        for(; it != itEnd; ++it )
+            delete it->second;
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    std::string trim( std::string const& str );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo();
+        SourceLineInfo( char const* _file, std::size_t _line );
+        SourceLineInfo( SourceLineInfo const& other );
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        SourceLineInfo( SourceLineInfo && )                  = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
+        SourceLineInfo& operator = ( SourceLineInfo && )     = default;
+#  endif
+        bool empty() const;
+        bool operator == ( SourceLineInfo const& other ) const;
+        bool operator < ( SourceLineInfo const& other ) const;
+
+        std::string file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // This is just here to avoid compiler warnings with macro constants and boolean literals
+    inline bool isTrue( bool value ){ return value; }
+    inline bool alwaysTrue() { return true; }
+    inline bool alwaysFalse() { return false; }
+
+    void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo );
+
+    void seedRng( IConfig const& config );
+    unsigned int rngSeed();
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() {
+            return std::string();
+        }
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO );
+
+#include <ostream>
+
+namespace Catch {
+
+    class NotImplementedException : public std::exception
+    {
+    public:
+        NotImplementedException( SourceLineInfo const& lineInfo );
+        NotImplementedException( NotImplementedException const& ) {}
+
+        virtual ~NotImplementedException() CATCH_NOEXCEPT {}
+
+        virtual const char* what() const CATCH_NOEXCEPT;
+
+    private:
+        std::string m_what;
+        SourceLineInfo m_lineInfo;
+    };
+
+} // end namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO )
+
+// #included from: internal/catch_context.h
+#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
+
+// #included from: catch_interfaces_generators.h
+#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORS_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct IGeneratorInfo {
+        virtual ~IGeneratorInfo();
+        virtual bool moveNext() = 0;
+        virtual std::size_t getCurrentIndex() const = 0;
+    };
+
+    struct IGeneratorsForTest {
+        virtual ~IGeneratorsForTest();
+
+        virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0;
+        virtual bool moveNext() = 0;
+    };
+
+    IGeneratorsForTest* createGeneratorsForTest();
+
+} // end namespace Catch
+
+// #included from: catch_ptr.hpp
+#define TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    // An intrusive reference counting smart pointer.
+    // T must implement addRef() and release() methods
+    // typically implementing the IShared interface
+    template<typename T>
+    class Ptr {
+    public:
+        Ptr() : m_p( CATCH_NULL ){}
+        Ptr( T* p ) : m_p( p ){
+            if( m_p )
+                m_p->addRef();
+        }
+        Ptr( Ptr const& other ) : m_p( other.m_p ){
+            if( m_p )
+                m_p->addRef();
+        }
+        ~Ptr(){
+            if( m_p )
+                m_p->release();
+        }
+        void reset() {
+            if( m_p )
+                m_p->release();
+            m_p = CATCH_NULL;
+        }
+        Ptr& operator = ( T* p ){
+            Ptr temp( p );
+            swap( temp );
+            return *this;
+        }
+        Ptr& operator = ( Ptr const& other ){
+            Ptr temp( other );
+            swap( temp );
+            return *this;
+        }
+        void swap( Ptr& other ) { std::swap( m_p, other.m_p ); }
+        T* get() const{ return m_p; }
+        T& operator*() const { return *m_p; }
+        T* operator->() const { return m_p; }
+        bool operator !() const { return m_p == CATCH_NULL; }
+        operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); }
+
+    private:
+        T* m_p;
+    };
+
+    struct IShared : NonCopyable {
+        virtual ~IShared();
+        virtual void addRef() const = 0;
+        virtual void release() const = 0;
+    };
+
+    template<typename T = IShared>
+    struct SharedImpl : T {
+
+        SharedImpl() : m_rc( 0 ){}
+
+        virtual void addRef() const {
+            ++m_rc;
+        }
+        virtual void release() const {
+            if( --m_rc == 0 )
+                delete this;
+        }
+
+        mutable unsigned int m_rc;
+    };
+
+} // end namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#include <memory>
+#include <vector>
+#include <stdlib.h>
+
+namespace Catch {
+
+    class TestCase;
+    class Stream;
+    struct IResultCapture;
+    struct IRunner;
+    struct IGeneratorsForTest;
+    struct IConfig;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0;
+        virtual bool advanceGeneratorsForCurrentTest() = 0;
+        virtual Ptr<IConfig const> getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( Ptr<IConfig const> const& config ) = 0;
+    };
+
+    IContext& getCurrentContext();
+    IMutableContext& getCurrentMutableContext();
+    void cleanUpContext();
+    Stream createStream( std::string const& streamName );
+
+}
+
+// #included from: internal/catch_test_registry.hpp
+#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
+
+// #included from: catch_interfaces_testcase.h
+#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestCase : IShared {
+        virtual void invoke () const = 0;
+    protected:
+        virtual ~ITestCase();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+namespace Catch {
+
+template<typename C>
+class MethodTestCase : public SharedImpl<ITestCase> {
+
+public:
+    MethodTestCase( void (C::*method)() ) : m_method( method ) {}
+
+    virtual void invoke() const {
+        C obj;
+        (obj.*m_method)();
+    }
+
+private:
+    virtual ~MethodTestCase() {}
+
+    void (C::*m_method)();
+};
+
+typedef void(*TestFunction)();
+
+struct NameAndDesc {
+    NameAndDesc( const char* _name = "", const char* _description= "" )
+    : name( _name ), description( _description )
+    {}
+
+    const char* name;
+    const char* description;
+};
+
+void registerTestCase
+    (   ITestCase* testCase,
+        char const* className,
+        NameAndDesc const& nameAndDesc,
+        SourceLineInfo const& lineInfo );
+
+struct AutoReg {
+
+    AutoReg
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc );
+
+    template<typename C>
+    AutoReg
+        (   void (C::*method)(),
+            char const* className,
+            NameAndDesc const& nameAndDesc,
+            SourceLineInfo const& lineInfo ) {
+
+        registerTestCase
+            (   new MethodTestCase<C>( method ),
+                className,
+                nameAndDesc,
+                lineInfo );
+    }
+
+    ~AutoReg();
+
+private:
+    AutoReg( AutoReg const& );
+    void operator= ( AutoReg const& );
+};
+
+void registerTestCaseFunction
+    (   TestFunction function,
+        SourceLineInfo const& lineInfo,
+        NameAndDesc const& nameAndDesc );
+
+} // end namespace Catch
+
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); }\
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        namespace{ \
+            struct TestName : ClassName{ \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \
+        } \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) );
+
+#else
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \
+        static void TestName(); \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\
+        namespace{ \
+            struct TestCaseName : ClassName{ \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \
+        } \
+        void TestCaseName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \
+        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) );
+#endif
+
+// #included from: internal/catch_capture.hpp
+#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
+
+// #included from: catch_result_builder.h
+#define TWOBLUECUBES_CATCH_RESULT_BUILDER_H_INCLUDED
+
+// #included from: catch_result_type.h
+#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    inline bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    inline bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    inline bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    inline bool isFalseTest( int flags )                { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    inline bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+
+// #included from: catch_assertionresult.h
+#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        AssertionInfo() {}
+        AssertionInfo(  std::string const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        std::string const& _capturedExpression,
+                        ResultDisposition::Flags _resultDisposition );
+
+        std::string macroName;
+        SourceLineInfo lineInfo;
+        std::string capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+    };
+
+    struct AssertionResultData
+    {
+        AssertionResultData() : resultType( ResultWas::Unknown ) {}
+
+        std::string reconstructedExpression;
+        std::string message;
+        ResultWas::OfType resultType;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult();
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+        ~AssertionResult();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+         AssertionResult( AssertionResult const& )              = default;
+         AssertionResult( AssertionResult && )                  = default;
+         AssertionResult& operator = ( AssertionResult const& ) = default;
+         AssertionResult& operator = ( AssertionResult && )     = default;
+#  endif
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        std::string getTestMacroName() const;
+
+    protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_matchers.hpp
+#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+    namespace Generic {
+        template<typename ExpressionT> class AllOf;
+        template<typename ExpressionT> class AnyOf;
+        template<typename ExpressionT> class Not;
+    }
+
+    template<typename ExpressionT>
+    struct Matcher : SharedImpl<IShared>
+    {
+        typedef ExpressionT ExpressionType;
+
+        virtual ~Matcher() {}
+        virtual Ptr<Matcher> clone() const = 0;
+        virtual bool match( ExpressionT const& expr ) const = 0;
+        virtual std::string toString() const = 0;
+
+        Generic::AllOf<ExpressionT> operator && ( Matcher<ExpressionT> const& other ) const;
+        Generic::AnyOf<ExpressionT> operator || ( Matcher<ExpressionT> const& other ) const;
+        Generic::Not<ExpressionT> operator ! () const;
+    };
+
+    template<typename DerivedT, typename ExpressionT>
+    struct MatcherImpl : Matcher<ExpressionT> {
+
+        virtual Ptr<Matcher<ExpressionT> > clone() const {
+            return Ptr<Matcher<ExpressionT> >( new DerivedT( static_cast<DerivedT const&>( *this ) ) );
+        }
+    };
+
+    namespace Generic {
+        template<typename ExpressionT>
+        class Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> {
+        public:
+            explicit Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
+            Not( Not const& other ) : m_matcher( other.m_matcher ) {}
+
+            virtual bool match( ExpressionT const& expr ) const CATCH_OVERRIDE {
+                return !m_matcher->match( expr );
+            }
+
+            virtual std::string toString() const CATCH_OVERRIDE {
+                return "not " + m_matcher->toString();
+            }
+        private:
+            Ptr< Matcher<ExpressionT> > m_matcher;
+        };
+
+        template<typename ExpressionT>
+        class AllOf : public MatcherImpl<AllOf<ExpressionT>, ExpressionT> {
+        public:
+
+            AllOf() {}
+            AllOf( AllOf const& other ) : m_matchers( other.m_matchers ) {}
+
+            AllOf& add( Matcher<ExpressionT> const& matcher ) {
+                m_matchers.push_back( matcher.clone() );
+                return *this;
+            }
+            virtual bool match( ExpressionT const& expr ) const
+            {
+                for( std::size_t i = 0; i < m_matchers.size(); ++i )
+                    if( !m_matchers[i]->match( expr ) )
+                        return false;
+                return true;
+            }
+            virtual std::string toString() const {
+                std::ostringstream oss;
+                oss << "( ";
+                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+                    if( i != 0 )
+                        oss << " and ";
+                    oss << m_matchers[i]->toString();
+                }
+                oss << " )";
+                return oss.str();
+            }
+
+            AllOf operator && ( Matcher<ExpressionT> const& other ) const {
+                AllOf allOfExpr( *this );
+                allOfExpr.add( other );
+                return allOfExpr;
+            }
+
+        private:
+            std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
+        };
+
+        template<typename ExpressionT>
+        class AnyOf : public MatcherImpl<AnyOf<ExpressionT>, ExpressionT> {
+        public:
+
+            AnyOf() {}
+            AnyOf( AnyOf const& other ) : m_matchers( other.m_matchers ) {}
+
+            AnyOf& add( Matcher<ExpressionT> const& matcher ) {
+                m_matchers.push_back( matcher.clone() );
+                return *this;
+            }
+            virtual bool match( ExpressionT const& expr ) const
+            {
+                for( std::size_t i = 0; i < m_matchers.size(); ++i )
+                    if( m_matchers[i]->match( expr ) )
+                        return true;
+                return false;
+            }
+            virtual std::string toString() const {
+                std::ostringstream oss;
+                oss << "( ";
+                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+                    if( i != 0 )
+                        oss << " or ";
+                    oss << m_matchers[i]->toString();
+                }
+                oss << " )";
+                return oss.str();
+            }
+
+            AnyOf operator || ( Matcher<ExpressionT> const& other ) const {
+                AnyOf anyOfExpr( *this );
+                anyOfExpr.add( other );
+                return anyOfExpr;
+            }
+
+        private:
+            std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
+        };
+
+    } // namespace Generic
+
+    template<typename ExpressionT>
+    Generic::AllOf<ExpressionT> Matcher<ExpressionT>::operator && ( Matcher<ExpressionT> const& other ) const {
+        Generic::AllOf<ExpressionT> allOfExpr;
+        allOfExpr.add( *this );
+        allOfExpr.add( other );
+        return allOfExpr;
+    }
+
+    template<typename ExpressionT>
+    Generic::AnyOf<ExpressionT> Matcher<ExpressionT>::operator || ( Matcher<ExpressionT> const& other ) const {
+        Generic::AnyOf<ExpressionT> anyOfExpr;
+        anyOfExpr.add( *this );
+        anyOfExpr.add( other );
+        return anyOfExpr;
+    }
+
+    template<typename ExpressionT>
+    Generic::Not<ExpressionT> Matcher<ExpressionT>::operator ! () const {
+        return Generic::Not<ExpressionT>( *this );
+    }
+
+    namespace StdString {
+
+        inline std::string makeString( std::string const& str ) { return str; }
+        inline std::string makeString( const char* str ) { return str ? std::string( str ) : std::string(); }
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+            :   m_caseSensitivity( caseSensitivity ),
+                m_str( adjustString( str ) )
+            {}
+            std::string adjustString( std::string const& str ) const {
+                return m_caseSensitivity == CaseSensitive::No
+                    ? toLower( str )
+                    : str;
+
+            }
+            std::string toStringSuffix() const
+            {
+                return m_caseSensitivity == CaseSensitive::No
+                    ? " (case insensitive)"
+                    : "";
+            }
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct Equals : MatcherImpl<Equals, std::string> {
+            Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
+            :   m_data( str, caseSensitivity )
+            {}
+            Equals( Equals const& other ) : m_data( other.m_data ){}
+
+            virtual ~Equals();
+
+            virtual bool match( std::string const& expr ) const {
+                return m_data.m_str == m_data.adjustString( expr );;
+            }
+            virtual std::string toString() const {
+                return "equals: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
+            }
+
+            CasedString m_data;
+        };
+
+        struct Contains : MatcherImpl<Contains, std::string> {
+            Contains( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
+            : m_data( substr, caseSensitivity ){}
+            Contains( Contains const& other ) : m_data( other.m_data ){}
+
+            virtual ~Contains();
+
+            virtual bool match( std::string const& expr ) const {
+                return m_data.adjustString( expr ).find( m_data.m_str ) != std::string::npos;
+            }
+            virtual std::string toString() const {
+                return "contains: \"" + m_data.m_str  + "\"" + m_data.toStringSuffix();
+            }
+
+            CasedString m_data;
+        };
+
+        struct StartsWith : MatcherImpl<StartsWith, std::string> {
+            StartsWith( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
+            : m_data( substr, caseSensitivity ){}
+
+            StartsWith( StartsWith const& other ) : m_data( other.m_data ){}
+
+            virtual ~StartsWith();
+
+            virtual bool match( std::string const& expr ) const {
+                return startsWith( m_data.adjustString( expr ), m_data.m_str );
+            }
+            virtual std::string toString() const {
+                return "starts with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
+            }
+
+            CasedString m_data;
+        };
+
+        struct EndsWith : MatcherImpl<EndsWith, std::string> {
+            EndsWith( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
+            : m_data( substr, caseSensitivity ){}
+            EndsWith( EndsWith const& other ) : m_data( other.m_data ){}
+
+            virtual ~EndsWith();
+
+            virtual bool match( std::string const& expr ) const {
+                return endsWith( m_data.adjustString( expr ), m_data.m_str );
+            }
+            virtual std::string toString() const {
+                return "ends with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
+            }
+
+            CasedString m_data;
+        };
+    } // namespace StdString
+    } // namespace Impl
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    template<typename ExpressionT>
+    inline Impl::Generic::Not<ExpressionT> Not( Impl::Matcher<ExpressionT> const& m ) {
+        return Impl::Generic::Not<ExpressionT>( m );
+    }
+
+    template<typename ExpressionT>
+    inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
+                                                    Impl::Matcher<ExpressionT> const& m2 ) {
+        return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 );
+    }
+    template<typename ExpressionT>
+    inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
+                                                    Impl::Matcher<ExpressionT> const& m2,
+                                                    Impl::Matcher<ExpressionT> const& m3 ) {
+        return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
+    }
+    template<typename ExpressionT>
+    inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
+                                                    Impl::Matcher<ExpressionT> const& m2 ) {
+        return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 );
+    }
+    template<typename ExpressionT>
+    inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
+                                                    Impl::Matcher<ExpressionT> const& m2,
+                                                    Impl::Matcher<ExpressionT> const& m3 ) {
+        return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
+    }
+
+    inline Impl::StdString::Equals      Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+        return Impl::StdString::Equals( str, caseSensitivity );
+    }
+    inline Impl::StdString::Equals      Equals( const char* str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+        return Impl::StdString::Equals( Impl::StdString::makeString( str ), caseSensitivity );
+    }
+    inline Impl::StdString::Contains    Contains( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+        return Impl::StdString::Contains( substr, caseSensitivity );
+    }
+    inline Impl::StdString::Contains    Contains( const char* substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+        return Impl::StdString::Contains( Impl::StdString::makeString( substr ), caseSensitivity );
+    }
+    inline Impl::StdString::StartsWith  StartsWith( std::string const& substr ) {
+        return Impl::StdString::StartsWith( substr );
+    }
+    inline Impl::StdString::StartsWith  StartsWith( const char* substr ) {
+        return Impl::StdString::StartsWith( Impl::StdString::makeString( substr ) );
+    }
+    inline Impl::StdString::EndsWith    EndsWith( std::string const& substr ) {
+        return Impl::StdString::EndsWith( substr );
+    }
+    inline Impl::StdString::EndsWith    EndsWith( const char* substr ) {
+        return Impl::StdString::EndsWith( Impl::StdString::makeString( substr ) );
+    }
+
+} // namespace Matchers
+
+using namespace Matchers;
+
+} // namespace Catch
+
+namespace Catch {
+
+    struct TestFailureException{};
+
+    template<typename T> class ExpressionLhs;
+
+    struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
+
+    struct CopyableStream {
+        CopyableStream() {}
+        CopyableStream( CopyableStream const& other ) {
+            oss << other.oss.str();
+        }
+        CopyableStream& operator=( CopyableStream const& other ) {
+            oss.str("");
+            oss << other.oss.str();
+            return *this;
+        }
+        std::ostringstream oss;
+    };
+
+    class ResultBuilder {
+    public:
+        ResultBuilder(  char const* macroName,
+                        SourceLineInfo const& lineInfo,
+                        char const* capturedExpression,
+                        ResultDisposition::Flags resultDisposition,
+                        char const* secondArg = "" );
+
+        template<typename T>
+        ExpressionLhs<T const&> operator <= ( T const& operand );
+        ExpressionLhs<bool> operator <= ( bool value );
+
+        template<typename T>
+        ResultBuilder& operator << ( T const& value ) {
+            m_stream.oss << value;
+            return *this;
+        }
+
+        template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& );
+        template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& );
+
+        ResultBuilder& setResultType( ResultWas::OfType result );
+        ResultBuilder& setResultType( bool result );
+        ResultBuilder& setLhs( std::string const& lhs );
+        ResultBuilder& setRhs( std::string const& rhs );
+        ResultBuilder& setOp( std::string const& op );
+
+        void endExpression();
+
+        std::string reconstructExpression() const;
+        AssertionResult build() const;
+
+        void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal );
+        void captureResult( ResultWas::OfType resultType );
+        void captureExpression();
+        void captureExpectedException( std::string const& expectedMessage );
+        void captureExpectedException( Matchers::Impl::Matcher<std::string> const& matcher );
+        void handleResult( AssertionResult const& result );
+        void react();
+        bool shouldDebugBreak() const;
+        bool allowThrows() const;
+
+    private:
+        AssertionInfo m_assertionInfo;
+        AssertionResultData m_data;
+        struct ExprComponents {
+            ExprComponents() : testFalse( false ) {}
+            bool testFalse;
+            std::string lhs, rhs, op;
+        } m_exprComponents;
+        CopyableStream m_stream;
+
+        bool m_shouldDebugBreak;
+        bool m_shouldThrow;
+    };
+
+} // namespace Catch
+
+// Include after due to circular dependency:
+// #included from: catch_expression_lhs.hpp
+#define TWOBLUECUBES_CATCH_EXPRESSION_LHS_HPP_INCLUDED
+
+// #included from: catch_evaluate.hpp
+#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#endif
+
+#include <cstddef>
+
+namespace Catch {
+namespace Internal {
+
+    enum Operator {
+        IsEqualTo,
+        IsNotEqualTo,
+        IsLessThan,
+        IsGreaterThan,
+        IsLessThanOrEqualTo,
+        IsGreaterThanOrEqualTo
+    };
+
+    template<Operator Op> struct OperatorTraits             { static const char* getName(){ return "*error*"; } };
+    template<> struct OperatorTraits<IsEqualTo>             { static const char* getName(){ return "=="; } };
+    template<> struct OperatorTraits<IsNotEqualTo>          { static const char* getName(){ return "!="; } };
+    template<> struct OperatorTraits<IsLessThan>            { static const char* getName(){ return "<"; } };
+    template<> struct OperatorTraits<IsGreaterThan>         { static const char* getName(){ return ">"; } };
+    template<> struct OperatorTraits<IsLessThanOrEqualTo>   { static const char* getName(){ return "<="; } };
+    template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
+
+    template<typename T>
+    inline T& opCast(T const& t) { return const_cast<T&>(t); }
+
+// nullptr_t support based on pull request #154 from Konstantin Baumann
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+    inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; }
+#endif // CATCH_CONFIG_CPP11_NULLPTR
+
+    // So the compare overloads can be operator agnostic we convey the operator as a template
+    // enum, which is used to specialise an Evaluator for doing the comparison.
+    template<typename T1, typename T2, Operator Op>
+    class Evaluator{};
+
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs) {
+            return bool( opCast( lhs ) ==  opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsNotEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) != opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsLessThan> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) < opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsGreaterThan> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) > opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) >= opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) <= opCast( rhs ) );
+        }
+    };
+
+    template<Operator Op, typename T1, typename T2>
+    bool applyEvaluator( T1 const& lhs, T2 const& rhs ) {
+        return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+    }
+
+    // This level of indirection allows us to specialise for integer types
+    // to avoid signed/ unsigned warnings
+
+    // "base" overload
+    template<Operator Op, typename T1, typename T2>
+    bool compare( T1 const& lhs, T2 const& rhs ) {
+        return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+    }
+
+    // unsigned X to int
+    template<Operator Op> bool compare( unsigned int lhs, int rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned long lhs, int rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned char lhs, int rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+    }
+
+    // unsigned X to long
+    template<Operator Op> bool compare( unsigned int lhs, long rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned long lhs, long rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned char lhs, long rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+    }
+
+    // int to unsigned X
+    template<Operator Op> bool compare( int lhs, unsigned int rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( int lhs, unsigned long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( int lhs, unsigned char rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+    }
+
+    // long to unsigned X
+    template<Operator Op> bool compare( long lhs, unsigned int rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long lhs, unsigned long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long lhs, unsigned char rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+
+    // pointer to long (when comparing against NULL)
+    template<Operator Op, typename T> bool compare( long lhs, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, long rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+    }
+
+    // pointer to int (when comparing against NULL)
+    template<Operator Op, typename T> bool compare( int lhs, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, int rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+    }
+
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+    // long long to unsigned X
+    template<Operator Op> bool compare( long long lhs, unsigned int rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long long lhs, unsigned long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long long lhs, unsigned long long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long long lhs, unsigned char rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+
+    // unsigned long long to X
+    template<Operator Op> bool compare( unsigned long long lhs, int rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( unsigned long long lhs, long rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( unsigned long long lhs, long long rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( unsigned long long lhs, char rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+
+    // pointer to long long (when comparing against NULL)
+    template<Operator Op, typename T> bool compare( long long lhs, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, long long rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+    }
+#endif // CATCH_CONFIG_CPP11_LONG_LONG
+
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+    // pointer to nullptr_t (when comparing against nullptr)
+    template<Operator Op, typename T> bool compare( std::nullptr_t, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( nullptr, rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, std::nullptr_t ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, nullptr );
+    }
+#endif // CATCH_CONFIG_CPP11_NULLPTR
+
+} // end of namespace Internal
+} // end of namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// #included from: catch_tostring.h
+#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
+
+#include <sstream>
+#include <iomanip>
+#include <limits>
+#include <vector>
+#include <cstddef>
+
+#ifdef __OBJC__
+// #included from: catch_objc_arc.hpp
+#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_TUPLE
+#include <tuple>
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_IS_ENUM
+#include <type_traits>
+#endif
+
+namespace Catch {
+
+// Why we're here.
+template<typename T>
+std::string toString( T const& value );
+
+// Built in overloads
+
+std::string toString( std::string const& value );
+std::string toString( std::wstring const& value );
+std::string toString( const char* const value );
+std::string toString( char* const value );
+std::string toString( const wchar_t* const value );
+std::string toString( wchar_t* const value );
+std::string toString( int value );
+std::string toString( unsigned long value );
+std::string toString( unsigned int value );
+std::string toString( const double value );
+std::string toString( const float value );
+std::string toString( bool value );
+std::string toString( char value );
+std::string toString( signed char value );
+std::string toString( unsigned char value );
+
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+std::string toString( long long value );
+std::string toString( unsigned long long value );
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+std::string toString( std::nullptr_t );
+#endif
+
+#ifdef __OBJC__
+    std::string toString( NSString const * const& nsstring );
+    std::string toString( NSString * CATCH_ARC_STRONG const& nsstring );
+    std::string toString( NSObject* const& nsObject );
+#endif
+
+namespace Detail {
+
+    extern const std::string unprintableString;
+
+    struct BorgType {
+        template<typename T> BorgType( T const& );
+    };
+
+    struct TrueType { char sizer[1]; };
+    struct FalseType { char sizer[2]; };
+
+    TrueType& testStreamable( std::ostream& );
+    FalseType testStreamable( FalseType );
+
+    FalseType operator<<( std::ostream const&, BorgType const& );
+
+    template<typename T>
+    struct IsStreamInsertable {
+        static std::ostream &s;
+        static T  const&t;
+        enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) };
+    };
+
+#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
+    template<typename T,
+             bool IsEnum = std::is_enum<T>::value
+             >
+    struct EnumStringMaker
+    {
+        static std::string convert( T const& ) { return unprintableString; }
+    };
+
+    template<typename T>
+    struct EnumStringMaker<T,true>
+    {
+        static std::string convert( T const& v )
+        {
+            return ::Catch::toString(
+                static_cast<typename std::underlying_type<T>::type>(v)
+                );
+        }
+    };
+#endif
+    template<bool C>
+    struct StringMakerBase {
+#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
+        template<typename T>
+        static std::string convert( T const& v )
+        {
+            return EnumStringMaker<T>::convert( v );
+        }
+#else
+        template<typename T>
+        static std::string convert( T const& ) { return unprintableString; }
+#endif
+    };
+
+    template<>
+    struct StringMakerBase<true> {
+        template<typename T>
+        static std::string convert( T const& _value ) {
+            std::ostringstream oss;
+            oss << _value;
+            return oss.str();
+        }
+    };
+
+    std::string rawMemoryToString( const void *object, std::size_t size );
+
+    template<typename T>
+    inline std::string rawMemoryToString( const T& object ) {
+      return rawMemoryToString( &object, sizeof(object) );
+    }
+
+} // end namespace Detail
+
+template<typename T>
+struct StringMaker :
+    Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
+
+template<typename T>
+struct StringMaker<T*> {
+    template<typename U>
+    static std::string convert( U* p ) {
+        if( !p )
+            return "NULL";
+        else
+            return Detail::rawMemoryToString( p );
+    }
+};
+
+template<typename R, typename C>
+struct StringMaker<R C::*> {
+    static std::string convert( R C::* p ) {
+        if( !p )
+            return "NULL";
+        else
+            return Detail::rawMemoryToString( p );
+    }
+};
+
+namespace Detail {
+    template<typename InputIterator>
+    std::string rangeToString( InputIterator first, InputIterator last );
+}
+
+//template<typename T, typename Allocator>
+//struct StringMaker<std::vector<T, Allocator> > {
+//    static std::string convert( std::vector<T,Allocator> const& v ) {
+//        return Detail::rangeToString( v.begin(), v.end() );
+//    }
+//};
+
+template<typename T, typename Allocator>
+std::string toString( std::vector<T,Allocator> const& v ) {
+    return Detail::rangeToString( v.begin(), v.end() );
+}
+
+#ifdef CATCH_CONFIG_CPP11_TUPLE
+
+// toString for tuples
+namespace TupleDetail {
+  template<
+      typename Tuple,
+      std::size_t N = 0,
+      bool = (N < std::tuple_size<Tuple>::value)
+      >
+  struct ElementPrinter {
+      static void print( const Tuple& tuple, std::ostream& os )
+      {
+          os << ( N ? ", " : " " )
+             << Catch::toString(std::get<N>(tuple));
+          ElementPrinter<Tuple,N+1>::print(tuple,os);
+      }
+  };
+
+  template<
+      typename Tuple,
+      std::size_t N
+      >
+  struct ElementPrinter<Tuple,N,false> {
+      static void print( const Tuple&, std::ostream& ) {}
+  };
+
+}
+
+template<typename ...Types>
+struct StringMaker<std::tuple<Types...>> {
+
+    static std::string convert( const std::tuple<Types...>& tuple )
+    {
+        std::ostringstream os;
+        os << '{';
+        TupleDetail::ElementPrinter<std::tuple<Types...>>::print( tuple, os );
+        os << " }";
+        return os.str();
+    }
+};
+#endif // CATCH_CONFIG_CPP11_TUPLE
+
+namespace Detail {
+    template<typename T>
+    std::string makeString( T const& value ) {
+        return StringMaker<T>::convert( value );
+    }
+} // end namespace Detail
+
+/// \brief converts any type to a string
+///
+/// The default template forwards on to ostringstream - except when an
+/// ostringstream overload does not exist - in which case it attempts to detect
+/// that and writes {?}.
+/// Overload (not specialise) this template for custom typs that you don't want
+/// to provide an ostream overload for.
+template<typename T>
+std::string toString( T const& value ) {
+    return StringMaker<T>::convert( value );
+}
+
+    namespace Detail {
+    template<typename InputIterator>
+    std::string rangeToString( InputIterator first, InputIterator last ) {
+        std::ostringstream oss;
+        oss << "{ ";
+        if( first != last ) {
+            oss << Catch::toString( *first );
+            for( ++first ; first != last ; ++first )
+                oss << ", " << Catch::toString( *first );
+        }
+        oss << " }";
+        return oss.str();
+    }
+}
+
+} // end namespace Catch
+
+namespace Catch {
+
+// Wraps the LHS of an expression and captures the operator and RHS (if any) -
+// wrapping them all in a ResultBuilder object
+template<typename T>
+class ExpressionLhs {
+    ExpressionLhs& operator = ( ExpressionLhs const& );
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+    ExpressionLhs& operator = ( ExpressionLhs && ) = delete;
+#  endif
+
+public:
+    ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ) {}
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+    ExpressionLhs( ExpressionLhs const& ) = default;
+    ExpressionLhs( ExpressionLhs && )     = default;
+#  endif
+
+    template<typename RhsT>
+    ResultBuilder& operator == ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsEqualTo>( rhs );
+    }
+
+    template<typename RhsT>
+    ResultBuilder& operator != ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsNotEqualTo>( rhs );
+    }
+
+    template<typename RhsT>
+    ResultBuilder& operator < ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsLessThan>( rhs );
+    }
+
+    template<typename RhsT>
+    ResultBuilder& operator > ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsGreaterThan>( rhs );
+    }
+
+    template<typename RhsT>
+    ResultBuilder& operator <= ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsLessThanOrEqualTo>( rhs );
+    }
+
+    template<typename RhsT>
+    ResultBuilder& operator >= ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsGreaterThanOrEqualTo>( rhs );
+    }
+
+    ResultBuilder& operator == ( bool rhs ) {
+        return captureExpression<Internal::IsEqualTo>( rhs );
+    }
+
+    ResultBuilder& operator != ( bool rhs ) {
+        return captureExpression<Internal::IsNotEqualTo>( rhs );
+    }
+
+    void endExpression() {
+        bool value = m_lhs ? true : false;
+        m_rb
+            .setLhs( Catch::toString( value ) )
+            .setResultType( value )
+            .endExpression();
+    }
+
+    // Only simple binary expressions are allowed on the LHS.
+    // If more complex compositions are required then place the sub expression in parentheses
+    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( RhsT const& );
+    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( RhsT const& );
+    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( RhsT const& );
+    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( RhsT const& );
+    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& );
+    template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& );
+
+private:
+    template<Internal::Operator Op, typename RhsT>
+    ResultBuilder& captureExpression( RhsT const& rhs ) {
+        return m_rb
+            .setResultType( Internal::compare<Op>( m_lhs, rhs ) )
+            .setLhs( Catch::toString( m_lhs ) )
+            .setRhs( Catch::toString( rhs ) )
+            .setOp( Internal::OperatorTraits<Op>::getName() );
+    }
+
+private:
+    ResultBuilder& m_rb;
+    T m_lhs;
+};
+
+} // end namespace Catch
+
+
+namespace Catch {
+
+    template<typename T>
+    inline ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) {
+        return ExpressionLhs<T const&>( *this, operand );
+    }
+
+    inline ExpressionLhs<bool> ResultBuilder::operator <= ( bool value ) {
+        return ExpressionLhs<bool>( *this, value );
+    }
+
+} // namespace Catch
+
+// #included from: catch_message.h
+#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    std::string const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        std::string macroName;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        std::string message;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const {
+            return sequence == other.sequence;
+        }
+        bool operator < ( MessageInfo const& other ) const {
+            return sequence < other.sequence;
+        }
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageBuilder {
+        MessageBuilder( std::string const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type )
+        : m_info( macroName, lineInfo, type )
+        {}
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+        std::ostringstream m_stream;
+    };
+
+    class ScopedMessage {
+    public:
+        ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage const& other );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_interfaces_capture.h
+#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    class TestCase;
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    class ScopedMessageBuilder;
+    struct Counts;
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual void assertionEnded( AssertionResult const& result ) = 0;
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+
+        virtual void handleFatalErrorCondition( std::string const& message ) = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// #included from: catch_debugger.h
+#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
+
+// #included from: catch_platform.h
+#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
+
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#define CATCH_PLATFORM_MAC
+#elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#define CATCH_PLATFORM_IPHONE
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+#include <string>
+
+namespace Catch{
+
+    bool isDebuggerActive();
+    void writeToDebugConsole( std::string const& text );
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    // The following code snippet based on:
+    // http://cocoawithlove.com/2008/03/break-into-debugger.html
+    #ifdef DEBUG
+        #if defined(__ppc64__) || defined(__ppc__)
+            #define CATCH_BREAK_INTO_DEBUGGER() \
+                if( Catch::isDebuggerActive() ) { \
+                    __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
+                    : : : "memory","r0","r3","r4" ); \
+                }
+        #else
+            #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) {__asm__("int $3\n" : : );}
+        #endif
+    #endif
+
+#elif defined(_MSC_VER)
+    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { __debugbreak(); }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { DebugBreak(); }
+#endif
+
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+#define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue();
+#endif
+
+// #included from: catch_interfaces_runner.h
+#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
+
+namespace Catch {
+    class TestCase;
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// In the event of a failure works out if the debugger needs to be invoked
+// and/or an exception thrown and takes appropriate action.
+// This needs to be done as a macro so the debugger will stop in the user
+// source code rather than in Catch library code
+#define INTERNAL_CATCH_REACT( resultBuilder ) \
+    if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \
+    resultBuilder.react();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
+        try { \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            ( __catchResult <= expr ).endExpression(); \
+        } \
+        catch( ... ) { \
+            __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \
+        } \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::isTrue( false && static_cast<bool>(expr) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( expr, resultDisposition, macroName ) \
+    INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ); \
+    if( Catch::getResultCapture().getLastResult()->succeeded() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( expr, resultDisposition, macroName ) \
+    INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ); \
+    if( !Catch::getResultCapture().getLastResult()->succeeded() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( expr, resultDisposition, macroName ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
+        try { \
+            expr; \
+            __catchResult.captureResult( Catch::ResultWas::Ok ); \
+        } \
+        catch( ... ) { \
+            __catchResult.useActiveException( resultDisposition ); \
+        } \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( expr, resultDisposition, matcher, macroName ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition, #matcher ); \
+        if( __catchResult.allowThrows() ) \
+            try { \
+                expr; \
+                __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
+            } \
+            catch( ... ) { \
+                __catchResult.captureExpectedException( matcher ); \
+            } \
+        else \
+            __catchResult.captureResult( Catch::ResultWas::Ok ); \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( expr, exceptionType, resultDisposition, macroName ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
+        if( __catchResult.allowThrows() ) \
+            try { \
+                expr; \
+                __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
+            } \
+            catch( exceptionType ) { \
+                __catchResult.captureResult( Catch::ResultWas::Ok ); \
+            } \
+            catch( ... ) { \
+                __catchResult.useActiveException( resultDisposition ); \
+            } \
+        else \
+            __catchResult.captureResult( Catch::ResultWas::Ok ); \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+///////////////////////////////////////////////////////////////////////////////
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, ... ) \
+        do { \
+            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
+            __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \
+            __catchResult.captureResult( messageType ); \
+            INTERNAL_CATCH_REACT( __catchResult ) \
+        } while( Catch::alwaysFalse() )
+#else
+    #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \
+        do { \
+            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
+            __catchResult << log + ::Catch::StreamEndStop(); \
+            __catchResult.captureResult( messageType ); \
+            INTERNAL_CATCH_REACT( __catchResult ) \
+        } while( Catch::alwaysFalse() )
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( log, macroName ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log;
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( arg, matcher, resultDisposition, macroName ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \
+        try { \
+            std::string matcherAsString = (matcher).toString(); \
+            __catchResult \
+                .setLhs( Catch::toString( arg ) ) \
+                .setRhs( matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString ) \
+                .setOp( "matches" ) \
+                .setResultType( (matcher).match( arg ) ); \
+            __catchResult.captureExpression(); \
+        } catch( ... ) { \
+            __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \
+        } \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+// #included from: internal/catch_section.h
+#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
+
+// #included from: catch_section_info.h
+#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
+
+// #included from: catch_totals.hpp
+#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {}
+
+        Counts operator - ( Counts const& other ) const {
+            Counts diff;
+            diff.passed = passed - other.passed;
+            diff.failed = failed - other.failed;
+            diff.failedButOk = failedButOk - other.failedButOk;
+            return diff;
+        }
+        Counts& operator += ( Counts const& other ) {
+            passed += other.passed;
+            failed += other.failed;
+            failedButOk += other.failedButOk;
+            return *this;
+        }
+
+        std::size_t total() const {
+            return passed + failed + failedButOk;
+        }
+        bool allPassed() const {
+            return failed == 0 && failedButOk == 0;
+        }
+        bool allOk() const {
+            return failed == 0;
+        }
+
+        std::size_t passed;
+        std::size_t failed;
+        std::size_t failedButOk;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const {
+            Totals diff;
+            diff.assertions = assertions - other.assertions;
+            diff.testCases = testCases - other.testCases;
+            return diff;
+        }
+
+        Totals delta( Totals const& prevTotals ) const {
+            Totals diff = *this - prevTotals;
+            if( diff.assertions.failed > 0 )
+                ++diff.testCases.failed;
+            else if( diff.assertions.failedButOk > 0 )
+                ++diff.testCases.failedButOk;
+            else
+                ++diff.testCases.passed;
+            return diff;
+        }
+
+        Totals& operator += ( Totals const& other ) {
+            assertions += other.assertions;
+            testCases += other.testCases;
+            return *this;
+        }
+
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& _description = std::string() );
+
+        std::string name;
+        std::string description;
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds )
+        : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds )
+        {}
+
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_timer.h
+#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
+
+#ifdef CATCH_PLATFORM_WINDOWS
+typedef unsigned long long uint64_t;
+#else
+#include <stdint.h>
+#endif
+
+namespace Catch {
+
+    class Timer {
+    public:
+        Timer() : m_ticks( 0 ) {}
+        void start();
+        unsigned int getElapsedMicroseconds() const;
+        unsigned int getElapsedMilliseconds() const;
+        double getElapsedSeconds() const;
+
+    private:
+        uint64_t m_ticks;
+    };
+
+} // namespace Catch
+
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    #define INTERNAL_CATCH_SECTION( ... ) \
+        if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) )
+#else
+    #define INTERNAL_CATCH_SECTION( name, desc ) \
+        if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) )
+#endif
+
+// #included from: internal/catch_generators.hpp
+#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
+
+#include <iterator>
+#include <vector>
+#include <string>
+#include <stdlib.h>
+
+namespace Catch {
+
+template<typename T>
+struct IGenerator {
+    virtual ~IGenerator() {}
+    virtual T getValue( std::size_t index ) const = 0;
+    virtual std::size_t size () const = 0;
+};
+
+template<typename T>
+class BetweenGenerator : public IGenerator<T> {
+public:
+    BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){}
+
+    virtual T getValue( std::size_t index ) const {
+        return m_from+static_cast<int>( index );
+    }
+
+    virtual std::size_t size() const {
+        return static_cast<std::size_t>( 1+m_to-m_from );
+    }
+
+private:
+
+    T m_from;
+    T m_to;
+};
+
+template<typename T>
+class ValuesGenerator : public IGenerator<T> {
+public:
+    ValuesGenerator(){}
+
+    void add( T value ) {
+        m_values.push_back( value );
+    }
+
+    virtual T getValue( std::size_t index ) const {
+        return m_values[index];
+    }
+
+    virtual std::size_t size() const {
+        return m_values.size();
+    }
+
+private:
+    std::vector<T> m_values;
+};
+
+template<typename T>
+class CompositeGenerator {
+public:
+    CompositeGenerator() : m_totalSize( 0 ) {}
+
+    // *** Move semantics, similar to auto_ptr ***
+    CompositeGenerator( CompositeGenerator& other )
+    :   m_fileInfo( other.m_fileInfo ),
+        m_totalSize( 0 )
+    {
+        move( other );
+    }
+
+    CompositeGenerator& setFileInfo( const char* fileInfo ) {
+        m_fileInfo = fileInfo;
+        return *this;
+    }
+
+    ~CompositeGenerator() {
+        deleteAll( m_composed );
+    }
+
+    operator T () const {
+        size_t overallIndex = getCurrentContext().getGeneratorIndex( m_fileInfo, m_totalSize );
+
+        typename std::vector<const IGenerator<T>*>::const_iterator it = m_composed.begin();
+        typename std::vector<const IGenerator<T>*>::const_iterator itEnd = m_composed.end();
+        for( size_t index = 0; it != itEnd; ++it )
+        {
+            const IGenerator<T>* generator = *it;
+            if( overallIndex >= index && overallIndex < index + generator->size() )
+            {
+                return generator->getValue( overallIndex-index );
+            }
+            index += generator->size();
+        }
+        CATCH_INTERNAL_ERROR( "Indexed past end of generated range" );
+        return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
+    }
+
+    void add( const IGenerator<T>* generator ) {
+        m_totalSize += generator->size();
+        m_composed.push_back( generator );
+    }
+
+    CompositeGenerator& then( CompositeGenerator& other ) {
+        move( other );
+        return *this;
+    }
+
+    CompositeGenerator& then( T value ) {
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( value );
+        add( valuesGen );
+        return *this;
+    }
+
+private:
+
+    void move( CompositeGenerator& other ) {
+        std::copy( other.m_composed.begin(), other.m_composed.end(), std::back_inserter( m_composed ) );
+        m_totalSize += other.m_totalSize;
+        other.m_composed.clear();
+    }
+
+    std::vector<const IGenerator<T>*> m_composed;
+    std::string m_fileInfo;
+    size_t m_totalSize;
+};
+
+namespace Generators
+{
+    template<typename T>
+    CompositeGenerator<T> between( T from, T to ) {
+        CompositeGenerator<T> generators;
+        generators.add( new BetweenGenerator<T>( from, to ) );
+        return generators;
+    }
+
+    template<typename T>
+    CompositeGenerator<T> values( T val1, T val2 ) {
+        CompositeGenerator<T> generators;
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( val1 );
+        valuesGen->add( val2 );
+        generators.add( valuesGen );
+        return generators;
+    }
+
+    template<typename T>
+    CompositeGenerator<T> values( T val1, T val2, T val3 ){
+        CompositeGenerator<T> generators;
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( val1 );
+        valuesGen->add( val2 );
+        valuesGen->add( val3 );
+        generators.add( valuesGen );
+        return generators;
+    }
+
+    template<typename T>
+    CompositeGenerator<T> values( T val1, T val2, T val3, T val4 ) {
+        CompositeGenerator<T> generators;
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( val1 );
+        valuesGen->add( val2 );
+        valuesGen->add( val3 );
+        valuesGen->add( val4 );
+        generators.add( valuesGen );
+        return generators;
+    }
+
+} // end namespace Generators
+
+using namespace Generators;
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_LINESTR2( line ) #line
+#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line )
+
+#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" )
+
+// #included from: internal/catch_interfaces_exception.h
+#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
+
+#include <string>
+#include <vector>
+
+// #included from: catch_interfaces_registry_hub.h
+#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) = 0;
+        virtual void registerListener( Ptr<IReporterFactory> const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+    };
+
+    IRegistryHub& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+namespace Catch {
+
+    typedef std::string(*exceptionTranslateFunction)();
+
+    struct IExceptionTranslator;
+    typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE {
+                try {
+                    if( it == itEnd )
+                        throw;
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// #included from: internal/catch_approx.hpp
+#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
+
+#include <cmath>
+#include <limits>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    public:
+        explicit Approx ( double value )
+        :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+            m_scale( 1.0 ),
+            m_value( value )
+        {}
+
+        Approx( Approx const& other )
+        :   m_epsilon( other.m_epsilon ),
+            m_scale( other.m_scale ),
+            m_value( other.m_value )
+        {}
+
+        static Approx custom() {
+            return Approx( 0 );
+        }
+
+        Approx operator()( double value ) {
+            Approx approx( value );
+            approx.epsilon( m_epsilon );
+            approx.scale( m_scale );
+            return approx;
+        }
+
+        friend bool operator == ( double lhs, Approx const& rhs ) {
+            // Thanks to Richard Harris for his help refining this formula
+            return fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_value) ) );
+        }
+
+        friend bool operator == ( Approx const& lhs, double rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        friend bool operator != ( double lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        friend bool operator != ( Approx const& lhs, double rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        Approx& epsilon( double newEpsilon ) {
+            m_epsilon = newEpsilon;
+            return *this;
+        }
+
+        Approx& scale( double newScale ) {
+            m_scale = newScale;
+            return *this;
+        }
+
+        std::string toString() const {
+            std::ostringstream oss;
+            oss << "Approx( " << Catch::toString( m_value ) << " )";
+            return oss.str();
+        }
+
+    private:
+        double m_epsilon;
+        double m_scale;
+        double m_value;
+    };
+}
+
+template<>
+inline std::string toString<Detail::Approx>( Detail::Approx const& value ) {
+    return value.toString();
+}
+
+} // end namespace Catch
+
+// #included from: internal/catch_interfaces_tag_alias_registry.h
+#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
+
+// #included from: catch_tag_alias.h
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias( std::string _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {}
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); }
+// #included from: catch_option.hpp
+#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( CATCH_NULL ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = CATCH_NULL;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != CATCH_NULL; }
+        bool none() const { return nullableValue == CATCH_NULL; }
+
+        bool operator !() const { return nullableValue == CATCH_NULL; }
+        operator SafeBool::type() const {
+            return SafeBool::makeSafe( some() );
+        }
+
+    private:
+        T* nullableValue;
+        char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+namespace Catch {