Berack/upo-valpre
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add example network files and update interactive console commands for improved usability

Browse Source
This commit is contained in:
Giacomo Bertolazzi
2025-03-16 16:32:11 +01:00
parent 6cb87be89b
commit 60ef40c0ab
9 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/berack/upo/valpre/InteractiveConsole.java
View File

@@ -39,12 +39,11 @@ public class InteractiveConsole {
/**
* Run the interactive net builder.
*/
public Net runNetBuilder() {
public Net run() {
while (true) {
try {
var choice = choose("Choose the next step to do:",
"Add a node", "Add a connection", "Print Nodes", "Save the net", "Load net", "Clear",
"Exit");
var choice = choose(this.net + "\nChoose the next step to do:",
"Add a node", "Add a connection", "Save the net", "Load net", "Clear", "Exit");
switch (choice) {
case 1 -> {
var node = this.buildNode();
@@ -58,8 +57,9 @@ public class InteractiveConsole {
var targetNode = this.net.getNode(target);
this.net.addConnection(sourceNode, targetNode, weight);
}
case 3 -> this.out.println(this.net);
case 4 -> this.net.save(ask("Enter the filename: "));
case 3 -> this.net.save(ask("Enter the filename: "));
case 4 -> this.net = Net.load(ask("Enter the filename: "));
case 5 -> this.net = new Net();
default -> {
this.scanner.close();
return this.net;

6
src/main/java/net/berack/upo/valpre/Main.java
View File

@@ -31,7 +31,7 @@ public class Main {
var plot = new Plot(csv);
plot.show();
}
case "net" -> new InteractiveConsole().runNetBuilder();
case "interactive" -> new InteractiveConsole().run();
default -> exit("Invalid program!");
}
} catch (Exception e) {
@@ -83,11 +83,11 @@ public class Main {
var uri = Main.class.getProtectionDomain().getCodeSource().getLocation().toURI();
var name = new File(uri).getName();
System.err.println(message);
System.out.println("Usage: java -jar " + name + ".jar [simulation|plot|net] [args]");
System.out.println("Usage: java -jar " + name + ".jar [simulation|plot|interactive] [args]");
System.out.println("simulation args: -net <net> [-csv <csv>] [-runs <runs>] [-seed <seed>]"
+ "[-p] [-end <end>] [-i <indices>]");
System.out.println("plot args: -csv <csv>");
System.out.println("net args: none");
System.out.println("interactive: no args needed");
System.exit(1);
} catch (URISyntaxException e) {
e.printStackTrace();