Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mc-sog
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PMC-SOG
mc-sog
Commits
a2330244
Commit
a2330244
authored
2 years ago
by
Ghofrane Amaimi
Browse files
Options
Downloads
Patches
Plain Diff
add structures of a new node and edge of the product
parent
e4210388
No related branches found
Branches containing commit
No related tags found
1 merge request
!6
Feature/ufscc emptiness check
Pipeline
#4956
failed
2 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/algorithm/CNDFS.cpp
+10
-6
10 additions, 6 deletions
src/algorithm/CNDFS.cpp
src/algorithm/CNDFS.h
+2
-2
2 additions, 2 deletions
src/algorithm/CNDFS.h
src/main.cpp
+1
-0
1 addition, 0 deletions
src/main.cpp
with
13 additions
and
8 deletions
src/algorithm/CNDFS.cpp
+
10
−
6
View file @
a2330244
...
...
@@ -16,19 +16,24 @@ using namespace std;
bool
red
=
false
;
bool
blue
=
false
;
thread_local
bool
cyan
=
false
;
struct
product_node
{
struct
new_state
{
ModelCheckBaseMT
&
left
;
shared_ptr
<
spot
::
twa_graph
>
right
;
};
struct
product_nod
e_succ
{
vector
<
pair
<
LDDState
*
,
int
>
>
succ_left
;
spot
::
twa_succ_iterator
&
sadd
structures
of
a
new
node
and
edge
of
the
product
ucc_right
;
struct
new_stat
e_succ
{
LDDState
*
succ_left
;
spot
::
twa_succ_iterator
*
s
ucc_right
;
};
vector
<
new_state_succ
>
successors_new_node
;
std
::
mutex
mtx
;
//CNDFS::CNDFS(auto mK, const shared_ptr<spot::twa_graph> &mAa) : mK(mK), mAa(mAa) {}
//j'ai un problème de passage des paramétres dans le constructeur(pointeur vs adresse)
//CNDFS::CNDFS(ModelCheckBaseMT *mMcl, const shared_ptr<spot::twa_graph> &mAa) : mMcl(mMcl), mAa(mAa) {}
CNDFS
::~
CNDFS
()
=
default
;
//structure qui represente le produit de 2 états
...
...
@@ -63,7 +68,6 @@ CNDFS::~CNDFS()=default;
}
//void CNDFS::spawnThreads(int n, ModelCheckBaseMT &mcl, shared_ptr<spot::twa_graph> af )
//{
// std::vector<thread> threads(n);
...
...
This diff is collapsed.
Click to expand it.
src/algorithm/CNDFS.h
+
2
−
2
View file @
a2330244
...
...
@@ -11,9 +11,9 @@ class CNDFS {
private:
static
ModelCheckBaseMT
*
mMcl
;
//
shared_ptr<spot::twa_graph> mAa;
shared_ptr
<
spot
::
twa_graph
>
mAa
;
public:
//CNDFS(
auto mK
, const shared_ptr<spot::twa_graph> &mAa);
//CNDFS(
ModelCheckBaseMT *mMcl
, const shared_ptr<spot::twa_graph> &mAa);
virtual
~
CNDFS
();
//static void DfsBlue();
...
...
This diff is collapsed.
Click to expand it.
src/main.cpp
+
1
−
0
View file @
a2330244
...
...
@@ -528,6 +528,7 @@ int main(int argc, char **argv)
// cout <<"pointeur sur BA "<< typeid(aa).name() <<endl;
CNDFS
cndfs
;
//CNDFS cndfs(*mcl, aa);
//cndfs.DfsBlue(*mcl, aa);
thread
thread_1
(
cndfs
.
DfsBlue
,
ref
(
*
mcl
),
ref
(
aa
));
thread
thread_2
(
cndfs
.
DfsBlue
,
ref
(
*
mcl
),
ref
(
aa
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment