// File IO Flags
boolean ReplaceUnderscores = false;
- boolean printRootInfo = false;
+ boolean printRootInfo = true;
private com.stevesoft.pat.Regex[] NodeSafeName = new com.stevesoft.pat.Regex[]
{
new com.stevesoft.pat.Regex().perlCode("m/[\\[,:'()]/"), // test for requiring quotes
String nodename = null;
float DefDistance = (float) 0.001; // @param Default distance for a node - very very small
- int DefBootstrap = 0; // @param Default bootstrap for a node
+ int DefBootstrap = -1; // @param Default bootstrap for a node
float distance = DefDistance;
int bootstrap = DefBootstrap;
{
if (nbootstrap.stringMatched(1).equals(uqnodename.stringMatched(1)))
{
- nodename=""; // no nodename here.
+ nodename=null; // no nodename here.
}
if (nodename==null || nodename.length()==0 || nbootstrap.matchedFrom(1) > (uqnodename.matchedFrom(1) +
uqnodename.stringMatched().length()))
}
}
}
- else
- {
- if (nf.charAt(fcp)=='[') {
-
- }
-
- // else : We do nothing if ';' is encountered.
- }
}
// Reset new node properties to obvious fakes
{
return ( (c.getName() == null) ? "" : nodeName(c.getName())) +
( (HasBootstrap)
- ? ( (c.getBootstrap() > -1) ? (" " + c.getBootstrap()) : "") : "") +
+ ? ( (c.getBootstrap() > -1) ? ((c.getName()!=null ? " " : "")+ c.getBootstrap()) : "") : "") +
( (HasDistances) ? (":" + c.dist) : "");
}
return (printRootInfo)
? ( ( (root.getName() == null) ? "" : nodeName(root.getName())) +
( (HasBootstrap)
- ? ( (root.getBootstrap() > -1) ? (" " + root.getBootstrap()) : "") :
+ ? ( (root.getBootstrap() > -1) ? ((root.getName()!=null ? " " : "")+
+ + root.getBootstrap()) : "") :
"") +
( (RootHasDistance) ? (":" + root.dist) : "")) : "";
}