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
50bed57c
Commit
50bed57c
authored
Sep 15, 2017
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes and fixed suggested by Clifford Wolf.
parent
4c0b78cf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
Makefile
+4
-0
src/sat/bsat2/SolverTypes.h
+2
-2
src/sat/glucose/SolverTypes.h
+2
-2
No files found.
Makefile
View file @
50bed57c
...
...
@@ -122,6 +122,10 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS
+=
-lrt
endif
ifdef
ABC_USE_LIBSTDCXX
LIBS
+=
-lstdc
++
$(info
$(MSG_PREFIX)Using
explicit
-lstdc++)
endif
$(info
$(MSG_PREFIX)Using
CFLAGS
=
$(CFLAGS)
)
CXXFLAGS
+=
$(CFLAGS)
...
...
src/sat/bsat2/SolverTypes.h
View file @
50bed57c
...
...
@@ -47,7 +47,7 @@ struct Lit {
int
x
;
// Use this as a constructor:
friend
Lit
mkLit
(
Var
var
,
bool
sign
=
false
);
friend
Lit
mkLit
(
Var
var
,
bool
sign
);
bool
operator
==
(
Lit
p
)
const
{
return
x
==
p
.
x
;
}
bool
operator
!=
(
Lit
p
)
const
{
return
x
!=
p
.
x
;
}
...
...
@@ -55,7 +55,7 @@ struct Lit {
};
inline
Lit
mkLit
(
Var
var
,
bool
sign
)
{
Lit
p
;
p
.
x
=
var
+
var
+
(
int
)
sign
;
return
p
;
}
inline
Lit
mkLit
(
Var
var
,
bool
sign
=
false
)
{
Lit
p
;
p
.
x
=
var
+
var
+
(
int
)
sign
;
return
p
;
}
inline
Lit
operator
~
(
Lit
p
)
{
Lit
q
;
q
.
x
=
p
.
x
^
1
;
return
q
;
}
inline
Lit
operator
^
(
Lit
p
,
bool
b
)
{
Lit
q
;
q
.
x
=
p
.
x
^
(
unsigned
int
)
b
;
return
q
;
}
inline
bool
sign
(
Lit
p
)
{
return
p
.
x
&
1
;
}
...
...
src/sat/glucose/SolverTypes.h
View file @
50bed57c
...
...
@@ -55,14 +55,14 @@ struct Lit {
int
x
;
// Use this as a constructor:
friend
Lit
mkLit
(
Var
var
,
bool
sign
=
false
);
friend
Lit
mkLit
(
Var
var
,
bool
sign
);
bool
operator
==
(
Lit
p
)
const
{
return
x
==
p
.
x
;
}
bool
operator
!=
(
Lit
p
)
const
{
return
x
!=
p
.
x
;
}
bool
operator
<
(
Lit
p
)
const
{
return
x
<
p
.
x
;
}
// '<' makes p, ~p adjacent in the ordering.
};
inline
Lit
mkLit
(
Var
var
,
bool
sign
)
{
Lit
p
;
p
.
x
=
var
+
var
+
(
int
)
sign
;
return
p
;
}
inline
Lit
mkLit
(
Var
var
,
bool
sign
=
false
)
{
Lit
p
;
p
.
x
=
var
+
var
+
(
int
)
sign
;
return
p
;
}
inline
Lit
operator
~
(
Lit
p
)
{
Lit
q
;
q
.
x
=
p
.
x
^
1
;
return
q
;
}
inline
Lit
operator
^
(
Lit
p
,
bool
b
)
{
Lit
q
;
q
.
x
=
p
.
x
^
(
unsigned
int
)
b
;
return
q
;
}
inline
bool
sign
(
Lit
p
)
{
return
p
.
x
&
1
;
}
...
...
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