Extra clean up

TAPAAL · Jan 21, 2025 · a72d3df · a72d3df
1 parent d4b508e
commit a72d3df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/include/PetriEngine/Reachability/ReachabilitySearch.h b/include/PetriEngine/Reachability/ReachabilitySearch.h
@@ -116,7 +116,6 @@ namespace PetriEngine {
             size_t _satisfyingMarking = 0;
             Structures::State _initial;
             AbstractHandler& _callback;
-            TokenEliminator* token_elim = nullptr; // FIXME: Leaked
             size_t _max_tokens = 0;
         };
 
@@ -184,12 +183,12 @@ namespace PetriEngine {
                     queue.push(r.second, &dc, queries[ss.heurquery].get());
                 }
 
-                token_elim = new TokenEliminator();
+                TokenEliminator token_elim;
                 if (usequeries && tokenElim != TokenEliminationMethod::Disabled) {
-                    token_elim->setDynamic(tokenElim == TokenEliminationMethod::Dynamic);
-                    token_elim->init(&_net);
+                    token_elim.setDynamic(tokenElim == TokenEliminationMethod::Dynamic);
+                    token_elim.init(&_net);
                 } else {
-                    token_elim->setEnabled(false);
+                    token_elim.setEnabled(false);
                 }
 
                 // Search!
@@ -199,7 +198,7 @@ namespace PetriEngine {
 
                     while(generator.next(working)){
                         ss.enabledTransitionsCount[generator.fired()]++;
-                        token_elim->eliminate(&working, queries[ss.heurquery].get());
+                        token_elim.eliminate(&working, queries[ss.heurquery].get());
                         auto res = states.add(working);
                         // If we have not seen this state before
                         if (res.first) {

diff --git a/src/PetriEngine/CMakeLists.txt b/src/PetriEngine/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(PetriEngine ${HEADER_FILES}
     STSolver.cpp
     SuccessorGenerator.cpp
     TraceReplay.cpp
-        TokenEliminator.cpp
+    TokenEliminator.cpp
     options.cpp)
 
 target_link_libraries(PetriEngine PRIVATE Colored ColoredReduction Structures Simplification Stubborn Reachability PQL TAR Synthesis)
diff --git a/src/main.cpp b/src/main.cpp
@@ -93,14 +93,6 @@ int main(int argc, const char** argv) {
             std::cout << "Finished parsing model" << std::endl;
         }
 
-        auto workStart = std::chrono::high_resolution_clock::now();
-        // When this ptr goes out of scope it will print the time spent
-        std::shared_ptr<void> defer (nullptr, [&workStart](...){
-            auto workEnd = std::chrono::high_resolution_clock::now();
-            auto diff = std::chrono::duration_cast<std::chrono::microseconds>(workEnd - workStart).count() / 1000000.0;
-            std::cout << std::setprecision(6) << "Spent " << diff << " in total" << std::endl;
-        });
-
         //----------------------- Parse Query -----------------------//
         std::vector<std::string> querynames;
         auto ctlStarQueries = readQueries(string_set, options, querynames);