Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
sarah.grebing
ProofScriptParser
Commits
291eec9d
Commit
291eec9d
authored
Jun 22, 2018
by
Sarah Grebing
Browse files
bugfix key proof tree
parent
3e566e4a
Pipeline
#22885
passed with stages
in 3 minutes and 8 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
View file @
291eec9d
...
...
@@ -337,9 +337,16 @@ public class ProofTree extends BorderPane {
public
TreeItem
<
TreeNode
>
create
(
Proof
proof
)
{
TreeItem
<
TreeNode
>
self1
=
new
TreeItem
<>(
new
TreeNode
(
"Proof"
,
null
));
self1
.
getChildren
().
add
(
populate
(
"
Proof
"
,
proof
.
root
()));
self1
.
getChildren
().
add
(
populate
(
""
,
proof
.
root
()));
return
self1
;
}
protected
TreeItem
<
TreeNode
>
itemFactory
(
Node
n
,
String
label
)
{
if
(
label
.
equals
(
""
)){
return
itemFactory
(
n
);
}
else
{
return
new
TreeItem
<>(
new
TreeNode
(
label
,
n
));
}
}
protected
TreeItem
<
TreeNode
>
itemFactory
(
Node
n
)
{
return
new
TreeItem
<>(
new
TreeNode
(
n
.
serialNr
()
+
": "
+
toString
(
n
),
n
));
...
...
@@ -361,14 +368,18 @@ public class ProofTree extends BorderPane {
* @return
*/
protected
TreeItem
<
TreeNode
>
populate
(
String
label
,
Node
n
)
{
val
treeNode
=
new
TreeNode
(
label
,
n
);
TreeItem
<
TreeNode
>
currentItem
=
itemFactory
(
n
);
new
TreeItem
<>(
treeNode
);
//
val treeNode = new TreeNode(label, n);
TreeItem
<
TreeNode
>
currentItem
=
itemFactory
(
n
,
label
);
//
new TreeItem<>(treeNode);
// abort the traversing iff we have reached a sentinel!
if
(
sentinels
.
contains
(
n
))
{
return
currentItem
;
}
/* if (label.equals("Proof")) { //we are at the root
TreeItem<TreeNode> self1 = new TreeItem<>(new TreeNode(n.serialNr() + ": " + toString(n), n));
currentItem.getChildren().add(self1);
}*/
//if we are at a leaf we need to check goal state
if
(
n
.
childrenCount
()
==
0
)
{
...
...
@@ -383,10 +394,15 @@ public class ProofTree extends BorderPane {
//consume child proof nodes until there are more than one child, then recursion!
Node
node
=
n
.
child
(
0
);
if
(
n
.
childrenCount
()
==
1
)
{
do
{
currentItem
.
getChildren
().
add
(
new
TreeItem
<>(
new
TreeNode
(
node
.
serialNr
()
+
": "
+
toString
(
node
),
node
)));
while
(
node
.
childrenCount
()
==
1
)
{
node
=
node
.
child
(
0
);
currentItem
.
getChildren
().
add
(
new
TreeItem
<>(
new
TreeNode
(
node
.
serialNr
()
+
": "
+
toString
(
node
),
node
)));
}
/*do {
currentItem.getChildren().add(itemFactory(node));
node = node.child(0);
}
while
(
node
.
childrenCount
()
==
1
);
} while (node.childrenCount() == 1);
*/
}
// if the current node has more zero children. abort.
...
...
@@ -396,6 +412,7 @@ public class ProofTree extends BorderPane {
Iterator
<
Node
>
nodeIterator
=
node
.
childrenIterator
();
int
branchCounter
=
1
;
while
(
nodeIterator
.
hasNext
())
{
Node
childNode
=
nodeIterator
.
next
();
if
(
childNode
.
getNodeInfo
().
getBranchLabel
()
!=
null
)
{
...
...
@@ -403,6 +420,7 @@ public class ProofTree extends BorderPane {
currentItem
.
getChildren
().
add
(
populate
);
}
else
{
TreeItem
<
TreeNode
>
populate
=
populate
(
"BRANCH "
+
branchCounter
,
childNode
);
//TreeItem<TreeNode> self = new TreeItem<>(new TreeNode(childNode.serialNr() + ": " + toString(childNode), childNode));
TreeItem
<
TreeNode
>
self
=
itemFactory
(
childNode
);
populate
.
getChildren
().
add
(
0
,
self
);
currentItem
.
getChildren
().
add
(
populate
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment