Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
symple
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Boards
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
David Speck
symple
Commits
48391018
Commit
48391018
authored
Jul 05, 2018
by
David Speck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improved version of restrict
parent
7a7c38a9
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2135 additions
and
2772 deletions
+2135
-2772
pddl+.cpp
src/VAL/src/pddl+.cpp
+2126
-2755
symSearch.cc
src/search/sym_evmdd/search_engine/symSearch.cc
+3
-0
Makefile
src/search/sym_evmdd/tests/Makefile
+0
-2
operatorTest.cc
src/search/sym_evmdd/tests/operatorTest.cc
+2
-2
restrict.cc
src/search/sym_evmdd/tests/restrict.cc
+4
-9
userDefiniedOperators.cc
src/search/sym_evmdd/tests/userDefiniedOperators.cc
+0
-2
userDefiniedOperators.h
src/search/sym_evmdd/tests/userDefiniedOperators.h
+0
-2
No files found.
src/VAL/src/pddl+.cpp
View file @
48391018
This diff is collapsed.
Click to expand it.
src/search/sym_evmdd/search_engine/symSearch.cc
View file @
48391018
...
...
@@ -44,6 +44,9 @@ bool SymSearch::reconstructSolution(MEDDLY::dd_edge &target,
std
::
sort
(
g_operators
.
begin
(),
g_operators
.
end
(),
std
::
bind
(
higherCost
,
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
));
}
else
{
//std::cout << "shuffle" << std::endl;
//std::reverse(g_operators.begin(), g_operators.end());
}
std
::
cout
<<
"Beginning plan reconstruction: "
<<
std
::
endl
;
...
...
src/search/sym_evmdd/tests/Makefile
View file @
48391018
...
...
@@ -10,8 +10,6 @@ FILES = ../meddly_extensions/genericBinaryOperator.h \
../meddly_extensions/userDefiniedOperators.h
\
../meddly_extensions/restrict.h
\
../meddly_extensions/swapVarPrimed.h
\
../meddly_extensions/lessThan.h
\
../meddly_extensions/lessThanApprox.h
\
../meddly_extensions/swapToPrimedVar.h
\
../meddly_extensions/partialComplement.h
\
../meddly_extensions/minVar.h
\
...
...
src/search/sym_evmdd/tests/operatorTest.cc
View file @
48391018
...
...
@@ -467,7 +467,7 @@ TEST(minStates, random) {
}
}
TEST
(
lessThan
,
examplePaper
)
{
/*
TEST(lessThan, examplePaper) {
int max = std::numeric_limits<int>::max();
int nVars = 3;
int limits[] = { 2, 2, 3 };
...
...
@@ -693,4 +693,4 @@ TEST(lessThanApprox, examplePaper2) {
}
delete assigns;
assigns = nullptr;
}
}
*/
src/search/sym_evmdd/tests/restrict.cc
View file @
48391018
...
...
@@ -124,7 +124,7 @@ class restrictOp: public MEDDLY::unary_operation {
rp
=
resF
->
linkNode
(
ap
);
rv
=
av
;
MEDDLY
::
unpacked_node
::
recycle
(
A
);
delete
Key
;
saveResult
(
Key
,
ap
,
rv
,
rp
)
;
return
;
}
// Is a node which we want to restrict to a value
...
...
@@ -133,17 +133,12 @@ class restrictOp: public MEDDLY::unary_operation {
// this link is important
if
(
A
->
d
(
val
)
==
-
1
)
rp
=
-
1
;
else
rp
=
resF
->
linkNode
(
A
->
d
(
val
));
MEDDLY
::
unpacked_node
::
recycle
(
A
);
saveResult
(
Key
,
ap
,
A
->
ei
(
val
),
rp
);
rv
=
av
+
A
->
ei
(
val
);
/*int tmp = av + A->ei(val);
if (av > 0 && A->ei(val) > 0 && tmp < 0) {
rv = std::numeric_limits<int>::max();
} else {
rv = tmp;
}*/
if
(
rv
<
0
)
rv
=
std
::
numeric_limits
<
int
>::
max
();
MEDDLY
::
unpacked_node
::
recycle
(
A
);
delete
Key
;
return
;
}
...
...
src/search/sym_evmdd/tests/userDefiniedOperators.cc
View file @
48391018
...
...
@@ -15,8 +15,6 @@ void initializeUserDefiniedOps() {
initializeSwapToPrimedVar
();
initializeUnionMin
();
initializeIntersectionMax
();
initializeLessThan
();
initializeLessThanApprox
();
initializePartialComplement
();
initializeMinStates
();
}
...
...
src/search/sym_evmdd/tests/userDefiniedOperators.h
View file @
48391018
...
...
@@ -13,8 +13,6 @@
#include "./minVar.h"
#include "./swapVarPrimed.h"
#include "./swapToPrimedVar.h"
#include "./lessThan.h"
#include "./lessThanApprox.h"
#include "./partialComplement.h"
#include "./minStates.h"
#include "../resourcesHandle.h"
...
...
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