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
cb49c5d0
Commit
cb49c5d0
authored
Dec 13, 2016
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix in 'dsat <file.cnf>' when the number of classes in listed incorrectly.
parent
81af996f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/sat/xsat/xsatHeap.h
+2
-2
src/sat/xsat/xsatSolver.c
+1
-2
No files found.
src/sat/xsat/xsatHeap.h
View file @
cb49c5d0
...
...
@@ -48,7 +48,7 @@ struct xSAT_Heap_t_
SeeAlso []
***********************************************************************/
inline
int
xSAT_HeapSize
(
xSAT_Heap_t
*
h
)
static
inline
int
xSAT_HeapSize
(
xSAT_Heap_t
*
h
)
{
return
Vec_IntSize
(
h
->
vHeap
);
}
...
...
@@ -64,7 +64,7 @@ inline int xSAT_HeapSize( xSAT_Heap_t * h )
SeeAlso []
***********************************************************************/
inline
int
xSAT_HeapInHeap
(
xSAT_Heap_t
*
h
,
int
Var
)
static
inline
int
xSAT_HeapInHeap
(
xSAT_Heap_t
*
h
,
int
Var
)
{
return
(
Var
<
Vec_IntSize
(
h
->
vIndices
)
)
&&
(
Vec_IntEntry
(
h
->
vIndices
,
Var
)
>=
0
);
}
...
...
src/sat/xsat/xsatSolver.c
View file @
cb49c5d0
...
...
@@ -503,7 +503,6 @@ static void xSAT_SolverClaMinimisation( xSAT_Solver_t * s, Vec_Int_t * vLits )
ws
=
xSAT_VecWatchListEntry
(
s
->
vBinWatches
,
FlaseLit
);
begin
=
xSAT_WatchListArray
(
ws
);
end
=
begin
+
xSAT_WatchListSize
(
ws
);
pWatcher
;
nb
=
0
;
for
(
pWatcher
=
begin
;
pWatcher
<
end
;
pWatcher
++
)
...
...
@@ -999,7 +998,7 @@ void xSAT_SolverGarbageCollect( xSAT_Solver_t * s )
for
(
i
=
0
;
i
<
Vec_IntSize
(
s
->
vTrail
);
i
++
)
if
(
(
unsigned
)
Vec_IntEntry
(
s
->
vReasons
,
xSAT_Lit2Var
(
Vec_IntEntry
(
s
->
vTrail
,
i
)
)
)
!=
CRefUndef
)
xSAT_SolverClaRealloc
(
pNewMemMngr
,
s
->
pMemory
,
&
(
Vec_IntArray
(
s
->
vReasons
)[
xSAT_Lit2Var
(
Vec_IntEntry
(
s
->
vTrail
,
i
)
)]
)
);
xSAT_SolverClaRealloc
(
pNewMemMngr
,
s
->
pMemory
,
(
unsigned
*
)
&
(
Vec_IntArray
(
s
->
vReasons
)[
xSAT_Lit2Var
(
Vec_IntEntry
(
s
->
vTrail
,
i
)
)]
)
);
pArray
=
(
unsigned
*
)
Vec_IntArray
(
s
->
vLearnts
);
for
(
i
=
0
;
i
<
Vec_IntSize
(
s
->
vLearnts
);
i
++
)
...
...
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