From bd5160b62aa0e9479b6464989bfb446cc39c2ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CKhaoula?=
<“khaoula.arouissi@imt-atlantique.net”>
Date: Mon, 18 Nov 2024 12:08:43 +0100
Subject: [PATCH] Corrections
---
src/main/java/org/petriNet/Arc.java | 4 ----
src/main/java/org/petriNet/IncomingArc_Videur.java | 10 +---------
src/main/java/org/petriNet/PetriNet.java | 2 +-
src/main/java/org/petriNet/Transition.java | 1 -
src/test/java/org/petriNet/PetriNetTest.java | 3 +--
5 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/petriNet/Arc.java b/src/main/java/org/petriNet/Arc.java
index 246ec93..9956578 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 5c29cad..d238af2 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 dac7e9d..0d2523d 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 8fc574c..b5b0918 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 11855b2..982612e 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));
--
GitLab