Skip to content

Avoid use recursion #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yzyray wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid use recursion #900

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7f030b
Avoid use recursion
yzyray Sep 13, 2021
2bb8f9e
Fix missing '(' and ')'
yzyray Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions src/main/java/featurecat/lizzie/rules/SGFParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -652,8 +653,30 @@ private static void saveToStream(Board board, Writer writer) throws IOException
// * with 'xy' = coordinates ; or 'tt' for pass.

// Write variation tree
builder.append(generateNode(board, history.getCurrentHistoryNode()));

BoardHistoryNode markerBeg = new BoardHistoryNode(null);
BoardHistoryNode markerEnd = new BoardHistoryNode(null);
Stack<BoardHistoryNode> stack = new Stack<>();
stack.push(history.getCurrentHistoryNode());
while (!stack.isEmpty()) {
BoardHistoryNode cur = stack.pop();
if (cur == markerBeg) {
builder.append('(');
continue;
}
if (cur == markerEnd) {
builder.append(')');
continue;
}
builder.append(generateNode(board, cur));
boolean hasBrothers = (cur.numberOfChildren() > 1);
if (cur.numberOfChildren() >= 1) {
for (int i = cur.numberOfChildren() - 1; i >= 0; i--) {
if (hasBrothers) stack.push(markerEnd);
stack.push(cur.getVariations().get(i));
if (hasBrothers) stack.push(markerBeg);
}
}
}
// close file
builder.append(')');
writer.append(builder.toString());
Expand Down Expand Up @@ -698,19 +721,6 @@ private static String generateNode(Board board, BoardHistoryNode node) throws IO
builder.append(String.format("LZ[%s]", formatNodeData(node)));
}
}

if (node.numberOfChildren() > 1) {
// Variation
for (BoardHistoryNode sub : node.getVariations()) {
builder.append("(");
builder.append(generateNode(board, sub));
builder.append(")");
}
} else if (node.numberOfChildren() == 1) {
builder.append(generateNode(board, node.next().orElse(null)));
} else {
return builder.toString();
}
}

return builder.toString();
Expand Down