diff --git a/src/main/java/org/petriNet/Arc.java b/src/main/java/org/petriNet/Arc.java index 246ec93993f85b3ee250e1af8f4ba14c3d87e0a6..99565782b104e3eac3ada88854e33accac259427 100644 --- a/src/main/java/org/petriNet/Arc.java +++ b/src/main/java/org/petriNet/Arc.java @@ -28,10 +28,6 @@ public abstract class Arc { public int getId() { return this.id; } -// Set weight removed , was not needed -// public void setWeight(int weight) { -// this.weight = weight; -// } public Place getPlace() { return this.place; diff --git a/src/main/java/org/petriNet/IncomingArc_Videur.java b/src/main/java/org/petriNet/IncomingArc_Videur.java index 5c29cadbb0f68bbf3b8bacbbbe5e2c0d8db3f08a..d238af246a6d0a6adc117a534798ebf5d9f489a0 100644 --- a/src/main/java/org/petriNet/IncomingArc_Videur.java +++ b/src/main/java/org/petriNet/IncomingArc_Videur.java @@ -2,11 +2,6 @@ package org.petriNet; public class IncomingArc_Videur extends IncomingArc { - Place place; - Transition transition; - int poids; - int id; - public IncomingArc_Videur(Transition transition, Place place, int poids, int id) { super(transition, place, poids, id); } @@ -16,10 +11,7 @@ public class IncomingArc_Videur extends IncomingArc { @Override public boolean canFire() { - if ( this.getPlace().getTokenCount() > 0) { - return true; - } - return false; + return this.getPlace().getTokenCount() > 0; } @Override diff --git a/src/main/java/org/petriNet/PetriNet.java b/src/main/java/org/petriNet/PetriNet.java index dac7e9def556665831deeb2bc54c75a6c29f3571..0d2523d71e1b7eadb48c7e7878a49b65ec39eaea 100644 --- a/src/main/java/org/petriNet/PetriNet.java +++ b/src/main/java/org/petriNet/PetriNet.java @@ -140,7 +140,7 @@ for (int i = 0; i < numberOfPlaces; i++) { places.add(new Place( numberOfTokens.get(i), this.generateId(1))); - }; + } return places; } diff --git a/src/main/java/org/petriNet/Transition.java b/src/main/java/org/petriNet/Transition.java index 8fc574c23ab59b6e9c002b30b1b6f66e41bc0e28..b5b0918c7b055cdf8bad69581b9a3f676d847e78 100644 --- a/src/main/java/org/petriNet/Transition.java +++ b/src/main/java/org/petriNet/Transition.java @@ -1,6 +1,5 @@ package org.petriNet; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/src/test/java/org/petriNet/PetriNetTest.java b/src/test/java/org/petriNet/PetriNetTest.java index 11855b2ce09aa33fbec62e280282766cc0cd6bd7..982612e13911f6991ddfe888690163d2ef35ab92 100644 --- a/src/test/java/org/petriNet/PetriNetTest.java +++ b/src/test/java/org/petriNet/PetriNetTest.java @@ -3,7 +3,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -108,7 +107,7 @@ public class PetriNetTest { Place P1 = new Place(0, Mutex.generateId(1)); Mutex.addPlace(P1); Mutex.addPlace(P1); - assertEquals(1, Mutex.getPlaces().size(), "Number of places"); ; + assertEquals(1, Mutex.getPlaces().size(), "Number of places"); // CT1 Transition T1 = new Transition("T1", Mutex.generateId(2));