Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abc
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
abc
Commits
719396a2
Commit
719396a2
authored
Jul 11, 2012
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silencing warnings.
parent
da02d5aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
src/sat/bsat/satClause.h
+5
-4
src/sat/bsat/satSolver2.c
+1
-3
No files found.
src/sat/bsat/satClause.h
View file @
719396a2
...
@@ -113,10 +113,11 @@ static inline double Sat_MemMemoryAll( Sat_Mem_t * p ) { return 1.
...
@@ -113,10 +113,11 @@ static inline double Sat_MemMemoryAll( Sat_Mem_t * p ) { return 1.
// k is page offset
// k is page offset
// this macro has to be fixed (Sat_MemClauseSize does not work for problem clauses in proof mode)
// this macro has to be fixed (Sat_MemClauseSize does not work for problem clauses in proof mode)
//#define Sat_MemForEachClause( p, c, i, k ) \
/*
// for ( i = 0; i <= p->iPage[0]; i += 2 ) \
#define Sat_MemForEachClause( p, c, i, k ) \
// for ( k = 2; k < Sat_MemLimit(p->pPages[i]) && ((c) = Sat_MemClause( p, i, k )); k += Sat_MemClauseSize(c) )
for ( i = 0; i <= p->iPage[0]; i += 2 ) \
for ( k = 2; k < Sat_MemLimit(p->pPages[i]) && ((c) = Sat_MemClause( p, i, k )); k += Sat_MemClauseSize(c) )
*/
#define Sat_MemForEachLearned( p, c, i, k ) \
#define Sat_MemForEachLearned( p, c, i, k ) \
for ( i = 1; i <= p->iPage[1]; i += 2 ) \
for ( i = 1; i <= p->iPage[1]; i += 2 ) \
for ( k = 2; k < Sat_MemLimit(p->pPages[i]) && ((c) = Sat_MemClause( p, i, k )); k += Sat_MemClauseSize(c) )
for ( k = 2; k < Sat_MemLimit(p->pPages[i]) && ((c) = Sat_MemClause( p, i, k )); k += Sat_MemClauseSize(c) )
...
...
src/sat/bsat/satSolver2.c
View file @
719396a2
...
@@ -30,8 +30,6 @@ ABC_NAMESPACE_IMPL_START
...
@@ -30,8 +30,6 @@ ABC_NAMESPACE_IMPL_START
#define SAT_USE_PROOF_LOGGING
#define SAT_USE_PROOF_LOGGING
static
int
Time
=
0
;
//=================================================================================================
//=================================================================================================
// Debug:
// Debug:
...
@@ -1359,7 +1357,7 @@ void sat_solver2_reducedb(sat_solver2* s)
...
@@ -1359,7 +1357,7 @@ void sat_solver2_reducedb(sat_solver2* s)
int
nLearnedOld
=
veci_size
(
&
s
->
act_clas
);
int
nLearnedOld
=
veci_size
(
&
s
->
act_clas
);
int
*
act_clas
=
veci_begin
(
&
s
->
act_clas
);
int
*
act_clas
=
veci_begin
(
&
s
->
act_clas
);
int
*
pPerm
,
*
pSortValues
,
nCutoffValue
,
*
pClaProofs
;
int
*
pPerm
,
*
pSortValues
,
nCutoffValue
,
*
pClaProofs
;
int
i
,
j
,
k
,
Id
,
nSelected
,
LastSize
=
0
;
int
i
,
j
,
k
,
Id
,
nSelected
;
//
, LastSize = 0;
int
Counter
,
CounterStart
;
int
Counter
,
CounterStart
;
clock_t
clk
=
clock
();
clock_t
clk
=
clock
();
static
int
Count
=
0
;
static
int
Count
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment