From b1920a6393809bf539c6b053734040377a5b4552 Mon Sep 17 00:00:00 2001
From: Ghofrane Amaimi <ghofraneeamaimi@gmail.com>
Date: Wed, 4 May 2022 14:41:59 +0200
Subject: [PATCH] main and CNDFS CLASS connexion
---
src/CMakeLists.txt | 2 +-
src/algorithm/CNDFS.cpp | 12 ++++++++++++
src/algorithm/CNDFS.h | 16 ++++++++++++++++
src/algorithm/cndfs.cpp | 0
src/algorithm/cndfs.h | 0
src/main.cpp | 18 +++++++++---------
6 files changed, 38 insertions(+), 10 deletions(-)
create mode 100644 src/algorithm/CNDFS.cpp
create mode 100644 src/algorithm/CNDFS.h
delete mode 100644 src/algorithm/cndfs.cpp
delete mode 100644 src/algorithm/cndfs.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53746b4..ec66b0a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(${MPI_INCLUDE_PATH})
# include spot and bddx library
add_library(spot SHARED IMPORTED)
-add_library(bddx SHARED IMPORTED)
+add_library(bddx SHARED IMPORTED algorithm/CNDFS.cpp algorithm/CNDFS.h)
if(NOT SPOT_LIBRARY)
set_target_properties(spot PROPERTIES IMPORTED_LOCATION "${SPOT_DIR}/lib/libspot.so")
diff --git a/src/algorithm/CNDFS.cpp b/src/algorithm/CNDFS.cpp
new file mode 100644
index 0000000..7fbbe51
--- /dev/null
+++ b/src/algorithm/CNDFS.cpp
@@ -0,0 +1,12 @@
+//
+// Created by ghofrane on 5/4/22.
+//
+#include "CNDFS.h"
+#include <iostream>
+using namespace std;
+
+CNDFS::~CNDFS()=default;
+
+void CNDFS::DfsBlue() {
+ cout << "hello from cndfs class" << endl;
+}
\ No newline at end of file
diff --git a/src/algorithm/CNDFS.h b/src/algorithm/CNDFS.h
new file mode 100644
index 0000000..f7a0484
--- /dev/null
+++ b/src/algorithm/CNDFS.h
@@ -0,0 +1,16 @@
+//
+// Created by ghofrane on 5/4/22.
+//
+
+#ifndef PMC_SOG_CNDFS_H
+#define PMC_SOG_CNDFS_H
+
+class CNDFS {
+public:
+
+ virtual ~CNDFS();
+ void DfsBlue();
+};
+
+
+#endif //PMC_SOG_CNDFS_H
diff --git a/src/algorithm/cndfs.cpp b/src/algorithm/cndfs.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/algorithm/cndfs.h b/src/algorithm/cndfs.h
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main.cpp b/src/main.cpp
index ccb6414..b4b7947 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,6 +35,8 @@
#include "PMCSOGConfig.h"
#include "Hybrid/MCHybridReqPOR/MCHybridSOGReqPOR.h"
#include "Hybrid/MCHybridPOR/MCHybridSOGPOR.h"
+#include "algorithm/CNDFS.h"
+
using namespace std;
@@ -516,13 +518,12 @@ int main(int argc, char **argv)
if (algorithm == "UFSCC" || algorithm == "CNDFS")
{
- cout << "HELLO" << endl;
- exit(0);
- //runOnTheFlyParallelMC(algorithm);
-// auto k = std::make_shared<SogKripkeTh>(d, mcl, Rnewnet.getListTransitionAP(), Rnewnet.getListPlaceAP());
-// runOnTheFlyMC("Cou99", k, af);
-// cout << mcl->getGraph()->getInitialAggregate()->getSuccessors() <<endl;
-// cout << mcl->getGraph()->getInitialAggregate()->isVisited() <<endl;
+ cout << "HELLO" << endl;
+ CNDFS n;
+ n.DfsBlue();
+ return(0);
+ //exit(0);
+
}
else // run on the fly sequential model-checking
{
@@ -546,8 +547,7 @@ int main(int argc, char **argv)
// TODO: There is no way to run Model-checking when the SOG is built sequentially?
if (nb_th == 1)
{
- cout << "\n****************** Sequential version ******************* \n"
- << endl;
+ cout << "\n****************** Sequential version ******************* \n"<< endl;
// build sequential SOG
DR.computeSeqSOG(g);
--
GitLab