modifié : src/ModelCheckerTh.cpp

	modifié :         src/main.cpp

src/ModelCheckerTh.cpp

@@ -152,10 +152,6 @@ void ModelCheckerTh::buildSucc(LDDState *agregate)
         pthread_spin_lock(&m_spin_stack[m_min_charge]);
         m_st[m_min_charge].push(agregate);
         pthread_spin_unlock(&m_spin_stack[m_min_charge]);
-        if(!isNotTerminated())
-        {
-             ComputeTh_Succ();
-        }
 
     }
 }

src/main.cpp

@@ -229,11 +229,8 @@ int main(int argc, char** argv)
 
 
         auto k =
-<<<<<<< HEAD
             std::make_shared<SogKripkeTh>(d,mcl,R.getListTransitionAP(),R.getListPlaceAP());                                             ;
-=======
-            std::make_shared<SogKripkeTh>(d,mcl,R.getListTransitionAP(),R.getListPlaceAP());
->>>>>>> 8a83ddf40bff014aa15b8f24670733207dbbd072
+
         // Performing on the fly Modelchecking
         cout<<"Want to save the graph in a dot file ?";
                 cin>>c;