develop.uap-core.de/git
/
petrinet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
df5d936
)
renames PetriNet to Petrinet and uses the parser as a resource in Main
author
Mike Becker
<universe@uap-core.de>
Thu, 5 Dec 2019 17:58:06 +0000
(18:58 +0100)
committer
Mike Becker
<universe@uap-core.de>
Thu, 5 Dec 2019 17:58:06 +0000
(18:58 +0100)
src/main/java/de/yasc/example/petrinet/Main.java
patch
|
blob
|
history
src/main/java/de/yasc/example/petrinet/Petrinet.java
[moved from
src/main/java/de/yasc/example/petrinet/PetriNet.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/de/yasc/example/petrinet/PetrinetParser.java
patch
|
blob
|
history
diff --git
a/src/main/java/de/yasc/example/petrinet/Main.java
b/src/main/java/de/yasc/example/petrinet/Main.java
index
8788f76
..
a3b5ca3
100644
(file)
--- a/
src/main/java/de/yasc/example/petrinet/Main.java
+++ b/
src/main/java/de/yasc/example/petrinet/Main.java
@@
-5,12
+5,11
@@
import java.util.Arrays;
public class Main {
public static void main(String arg[]) {
public class Main {
public static void main(String arg[]) {
- try {
- var parser = new PetrinetParser(System.in);
+ try (var parser = new PetrinetParser(System.in)) {
var net = parser.read();
var net = parser.read();
+ // test code
net.step(2);
net.step(2);
-
System.out.println(Arrays.asList(net.getMarking()).toString());
} catch (IOException ex) {
System.err.println("Error: "+ex.getMessage());
System.out.println(Arrays.asList(net.getMarking()).toString());
} catch (IOException ex) {
System.err.println("Error: "+ex.getMessage());
diff --git
a/src/main/java/de/yasc/example/petrinet/PetriNet.java
b/src/main/java/de/yasc/example/petrinet/Petrinet.java
similarity index 97%
rename from
src/main/java/de/yasc/example/petrinet/PetriNet.java
rename to
src/main/java/de/yasc/example/petrinet/Petrinet.java
index
010a279
..
f8882f2
100644
(file)
--- a/
src/main/java/de/yasc/example/petrinet/PetriNet.java
+++ b/
src/main/java/de/yasc/example/petrinet/Petrinet.java
@@
-7,7
+7,7
@@
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import java.util.Random;
import java.util.stream.Collectors;
-public final class Petri
N
et {
+public final class Petri
n
et {
private static final class Place {
private static final class Place {
@@
-51,7
+51,7
@@
public final class PetriNet {
final private Place[] places;
final private List<Transition> transitions;
final private Place[] places;
final private List<Transition> transitions;
- public Petri
N
et(int places) {
+ public Petri
n
et(int places) {
this.places = new Place[places];
for (int i = 0 ; i < places ; i++)
this.places[i] = new Place();
this.places = new Place[places];
for (int i = 0 ; i < places ; i++)
this.places[i] = new Place();
diff --git
a/src/main/java/de/yasc/example/petrinet/PetrinetParser.java
b/src/main/java/de/yasc/example/petrinet/PetrinetParser.java
index
9a70a42
..
21d63a8
100644
(file)
--- a/
src/main/java/de/yasc/example/petrinet/PetrinetParser.java
+++ b/
src/main/java/de/yasc/example/petrinet/PetrinetParser.java
@@
-112,8
+112,8
@@
public final class PetrinetParser implements AutoCloseable {
}
}
}
}
- public Petri
N
et read() throws IOException {
- Petri
N
et result = null;
+ public Petri
n
et read() throws IOException {
+ Petri
n
et result = null;
String input;
int line = 0;
String input;
int line = 0;
@@
-125,7
+125,7
@@
public final class PetrinetParser implements AutoCloseable {
case COMMENT: break;
case PLACES:
if (result == null) {
case COMMENT: break;
case PLACES:
if (result == null) {
- result = new Petri
N
et(parsedLine.val0);
+ result = new Petri
n
et(parsedLine.val0);
} else {
throw new IOException("places command must occur once");
}
} else {
throw new IOException("places command must occur once");
}
@@
-154,7
+154,7
@@
public final class PetrinetParser implements AutoCloseable {
}
@Override
}
@Override
- public void close() throws Exception {
+ public void close() throws
IO
Exception {
reader.close();
}
}
reader.close();
}
}