From da7acb79c482137edb9c8586f42c87fca5023265 Mon Sep 17 00:00:00 2001 From: Minh VU Date: Tue, 3 Dec 2024 16:28:22 +0100 Subject: [PATCH] ok --- src/Client.java | 2 +- src/Cuisinier.java | 3 ++- src/Restaurant.java | 12 +++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Client.java b/src/Client.java index 100a7a9..efdb521 100644 --- a/src/Client.java +++ b/src/Client.java @@ -52,7 +52,7 @@ public class Client extends Thread { while(!restaurant.libre()){ restaurant.wait(); } - System.out.println("Clien " + Thread.currentThread().getId() + " : est entré dans le restaurant"); + System.out.println("Client " + Thread.currentThread().getId() + " : est entré dans le restaurant"); restaurant.ajouterClient(); restaurant.notifyAll(); }catch (InterruptedException e) { diff --git a/src/Cuisinier.java b/src/Cuisinier.java index 040229e..91d895a 100644 --- a/src/Cuisinier.java +++ b/src/Cuisinier.java @@ -9,7 +9,8 @@ public class Cuisinier extends Thread { } public void run(){ - while(Thread.currentThread().isDaemon()){ + while(Thread.currentThread().isDaemon()){ + //while(true){ Client client= stand.attendClient(); if(client!= null){ faire_cuire(client); diff --git a/src/Restaurant.java b/src/Restaurant.java index 76a1c27..deb9a1e 100644 --- a/src/Restaurant.java +++ b/src/Restaurant.java @@ -1,5 +1,5 @@ public class Restaurant { - protected final int MAX_CLIENTS = 25; + protected final int MAX_CLIENTS = 4; public int nbClient; @@ -41,11 +41,7 @@ public class Restaurant { } public synchronized boolean libre(){ - if(nbClient>MAX_CLIENTS){ - return false; - }else { - return true; - } + return (MAX_CLIENTS>nbClient); } public synchronized void ajouterClient(){ if(nbClientMAX_CLIENTS){ - nbClient--; - } + nbClient--; } } \ No newline at end of file