diff --git a/src/main/java/com/unah/planners/controller/HRRNController.java b/src/main/java/com/unah/planners/controller/HRRNController.java index ad9e50b..dc9a992 100644 --- a/src/main/java/com/unah/planners/controller/HRRNController.java +++ b/src/main/java/com/unah/planners/controller/HRRNController.java @@ -1,6 +1,6 @@ package com.unah.planners.controller; -import com.unah.planners.process.ProcessSRT; +import com.unah.planners.process.SRTProcess; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -33,10 +33,10 @@ public class HRRNController implements Initializable { @FXML private Button applyPlannerButton; - private ObservableList processes = FXCollections.observableArrayList(); - private ObservableList waitingProcesses = FXCollections.observableArrayList(); + private ObservableList processes = FXCollections.observableArrayList(); + private ObservableList waitingProcesses = FXCollections.observableArrayList(); - private ProcessSRT runningProcess; + private SRTProcess runningProcess; @Override public void initialize(URL location, ResourceBundle resources) { @@ -57,7 +57,7 @@ public void initialize(URL location, ResourceBundle resources) { @FXML private void addProcess() { proccessTable.getChildren().add(createProcess(processIdentifier.getText())); - ProcessSRT tempProcess = new ProcessSRT(); + SRTProcess tempProcess = new SRTProcess(); tempProcess.setProcessIdentifier(processIdentifier.getText()); tempProcess.setArrivalTime(Integer.parseInt(arrivalTime.getText()) - 1); tempProcess.setServiceTime(Integer.parseInt(serviceTime.getText())); @@ -147,7 +147,7 @@ private void applyPlanner() { processes.remove(runningProcess); for (int i = runningProcess.getArrivalTime(); i < quantum; i++) { if (!processes.isEmpty()) { - ProcessSRT tempProcess = checkProcessStart(i); + SRTProcess tempProcess = checkProcessStart(i); if (tempProcess != null) { if (runningProcess.getServiceTime() == 0) { runningProcess = tempProcess; @@ -185,8 +185,8 @@ private void applyPlanner() { } } - private ProcessSRT getFirtProcess() { - ProcessSRT firtProcessList; + private SRTProcess getFirtProcess() { + SRTProcess firtProcessList; int smallerNumber = processes.get(0).getArrivalTime(); int posSmallerNumber = 0; for (int i = 1; i < processes.size(); i++) { @@ -201,9 +201,9 @@ private ProcessSRT getFirtProcess() { } - private ProcessSRT checkProcessStart(int position) { - ProcessSRT tempProcess = null; - for (ProcessSRT process : processes) { + private SRTProcess checkProcessStart(int position) { + SRTProcess tempProcess = null; + for (SRTProcess process : processes) { if (process.getArrivalTime() == position) { tempProcess = process; } @@ -211,8 +211,8 @@ private ProcessSRT checkProcessStart(int position) { return tempProcess; } - private ProcessSRT getLowerResponseRate(int position) { - ProcessSRT bestProcess; + private SRTProcess getLowerResponseRate(int position) { + SRTProcess bestProcess; double smallerNumber = (((waitingProcesses.get(0).getArrivalTime() - (double) position) + waitingProcesses.get(0).getServiceTime()) / waitingProcesses.get(0).getServiceTime()); int posSmallerNumber = 0; for (int i = 1; i < waitingProcesses.size(); i++) { diff --git a/src/main/java/com/unah/planners/controller/JSFController.java b/src/main/java/com/unah/planners/controller/JSFController.java index 2f4ba56..52f762d 100644 --- a/src/main/java/com/unah/planners/controller/JSFController.java +++ b/src/main/java/com/unah/planners/controller/JSFController.java @@ -3,7 +3,7 @@ import java.net.URL; import java.util.ResourceBundle; -import com.unah.planners.process.Process; +import com.unah.planners.process.JSFProcess; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -19,132 +19,132 @@ public class JSFController implements Initializable { - @FXML private TableColumn name; - @FXML private TableColumn timeArrival; - @FXML private TableColumn timeService; - @FXML private TableColumn timeStay; - @FXML private TableColumn timeWaiting; - @FXML private TableColumn timeStart; - @FXML private TableColumn timeFinalize; - @FXML private TableColumn timeNormalized; - @FXML private TextField txtTimeArrival; - @FXML private TextField txtName; - @FXML private TextField txtQuantun; - @FXML private TextField txtTimeService; - @FXML private Button btnAlgorithm; - @FXML private Button btnAddProcess; - @FXML private Button btnNewProcesses; - - @FXML private TableView tbTable; - @FXML private ListView lstProcesses; - - private ObservableList contentTable; + @FXML + private TableColumn name; + @FXML + private TableColumn timeArrival; + @FXML + private TableColumn timeService; + @FXML + private TableColumn timeStay; + @FXML + private TableColumn timeWaiting; + @FXML + private TableColumn timeStart; + @FXML + private TableColumn timeFinalize; + @FXML + private TableColumn timeNormalized; + @FXML + private TextField txtTimeArrival; + @FXML + private TextField txtName; + @FXML + private TextField txtQuantun; + @FXML + private TextField txtTimeService; + @FXML + private Button btnAlgorithm; + @FXML + private Button btnAddProcess; + @FXML + private Button btnNewProcesses; + + @FXML + private TableView tbTable; + @FXML + private ListView lstProcesses; + + private ObservableList contentTable; private ObservableList processes; - - @Override - public void initialize(URL arg0, ResourceBundle arg1) { - instantiateObservableList(); - - - - lstProcesses.setItems(processes); - - - } - - public void instantiateObservableList() { - - contentTable = FXCollections.observableArrayList(); - processes = FXCollections.observableArrayList(); - } - - @FXML - public void addProcess() { - contentTable.add(new Process(txtName.getText(), - Integer.parseInt(txtQuantun.getText()), - Integer.parseInt(txtTimeArrival.getText()), - Integer.parseInt(txtTimeService.getText() - )) - ); - processes.add(txtName.getText()); - times(); - System.out.println("------------------------------------"); - cleanRegistry(); - btnAlgorithm.setDisable(false); - } - - public void cleanRegistry() { - txtName.clear(); - txtQuantun.clear(); - txtTimeArrival.clear(); - txtTimeService.clear(); - } - - public void times() { - contentTable.get(0).timeStartJSF(contentTable); - for(int i = 0; i vacio = FXCollections.observableArrayList(); - tbTable.getItems().clear(); - tbTable.setItems(vacio); - processes.clear(); - cleanRegistry(); - btnAddProcess.setDisable(false); - btnNewProcesses.setDisable(true); - } - - public void deleteProcess(ObservableList obs,int index) {obs.remove(index);} - - - public static void chargeComboBoxNumerico(ObservableList obs,int j) { - int i=0; - while(i obs, int index) {obs.remove(index);} - - - public static void bindStringColumn(TableColumn instanciaClm, String identificador) { - instanciaClm.setCellValueFactory(new PropertyValueFactory(identificador)); - } - public static void bindNumberColumn(TableColumn instanciaClm, String identificador) { - instanciaClm.setCellValueFactory(new PropertyValueFactory(identificador)); - } - public static void bindFloatColumn(TableColumn instanciaClm, String identificador) { - instanciaClm.setCellValueFactory(new PropertyValueFactory(identificador)); - } - + + @Override + public void initialize(URL arg0, ResourceBundle arg1) { + instantiateObservableList(); + + lstProcesses.setItems(processes); + + } + + public void instantiateObservableList() { + + contentTable = FXCollections.observableArrayList(); + processes = FXCollections.observableArrayList(); + } + + @FXML + public void addProcess() { + contentTable.add(new JSFProcess(txtName.getText(), + Integer.parseInt(txtQuantun.getText()), + Integer.parseInt(txtTimeArrival.getText()), + Integer.parseInt(txtTimeService.getText() + )) + ); + processes.add(txtName.getText()); + times(); + cleanRegistry(); + btnAlgorithm.setDisable(false); + } + + public void cleanRegistry() { + txtName.clear(); + txtQuantun.clear(); + txtTimeArrival.clear(); + txtTimeService.clear(); + } + + public void times() { + contentTable.get(0).timeStartJSF(contentTable); + for (int i = 0; i < contentTable.size(); i++) { + contentTable.get(i).timeWaitingFF(); + contentTable.get(i).timeFinalizeFF(); + contentTable.get(i).timeStayFF(); + contentTable.get(i).timeNormalizedFF(); + } + } + + @FXML + public void applyAlgorithm() { + btnAddProcess.setDisable(true); + btnAlgorithm.setDisable(true); + btnNewProcesses.setDisable(false); + tbTable.setItems(contentTable); + bindColumns(); + } + + public void bindColumns() { + bindStringColumn(name, "name"); + bindNumberColumn(timeArrival, "timeArrival"); + bindNumberColumn(timeService, "timeService"); + bindNumberColumn(timeStay, "timeStay"); + bindNumberColumn(timeWaiting, "timeWaiting"); + bindNumberColumn(timeStart, "timeStart"); + bindNumberColumn(timeFinalize, "timeFinalize"); + bindFloatColumn(timeNormalized, "timeNormalized"); + } + + @FXML + public void newProcesses() { + ObservableList vacio = FXCollections.observableArrayList(); + tbTable.getItems().clear(); + tbTable.setItems(vacio); + processes.clear(); + cleanRegistry(); + btnAddProcess.setDisable(false); + btnNewProcesses.setDisable(true); + } + + public static void bindStringColumn(TableColumn instanciaClm, String identificador) { + instanciaClm.setCellValueFactory(new PropertyValueFactory<>(identificador)); + } + + public static void bindNumberColumn(TableColumn instanciaClm, String identificador) { + instanciaClm.setCellValueFactory(new PropertyValueFactory<>(identificador)); + } + + public static void bindFloatColumn(TableColumn instanciaClm, String identificador) { + instanciaClm.setCellValueFactory(new PropertyValueFactory<>(identificador)); + } + } diff --git a/src/main/java/com/unah/planners/controller/MainController.java b/src/main/java/com/unah/planners/controller/MainController.java index 3a814d4..bd0c955 100644 --- a/src/main/java/com/unah/planners/controller/MainController.java +++ b/src/main/java/com/unah/planners/controller/MainController.java @@ -21,9 +21,9 @@ public void onOpenForm(ActionEvent actionEvent) throws IOException { switch (value) { case 1 -> fxmlLoader = loadForm("/com/unah/planners/fifo-view.fxml"); case 2 -> fxmlLoader = loadForm("/com/unah/planners/round-robin-view.fxml"); - case 3 -> fxmlLoader = loadForm("/com/unah/planners/JSF-view.fxml"); - case 4 -> fxmlLoader = loadForm("/com/unah/planners/SRT-view.fxml"); - case 5 -> fxmlLoader = loadForm("/com/unah/planners/HRRN-view.fxml"); + case 3 -> fxmlLoader = loadForm("/com/unah/planners/jsf-view.fxml"); + case 4 -> fxmlLoader = loadForm("/com/unah/planners/srt-view.fxml"); + case 5 -> fxmlLoader = loadForm("/com/unah/planners/hrrn-view.fxml"); } Parent root = fxmlLoader.load(); diff --git a/src/main/java/com/unah/planners/controller/SRTController.java b/src/main/java/com/unah/planners/controller/SRTController.java index d01530e..4cde468 100644 --- a/src/main/java/com/unah/planners/controller/SRTController.java +++ b/src/main/java/com/unah/planners/controller/SRTController.java @@ -1,6 +1,6 @@ package com.unah.planners.controller; -import com.unah.planners.process.ProcessSRT; +import com.unah.planners.process.SRTProcess; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -31,9 +31,9 @@ public class SRTController implements Initializable { @FXML private Button applyPlannerButton; - private ObservableList processes = FXCollections.observableArrayList(); - private ObservableList waitingProcesses = FXCollections.observableArrayList(); - private ProcessSRT runningProcess; + private ObservableList processes = FXCollections.observableArrayList(); + private ObservableList waitingProcesses = FXCollections.observableArrayList(); + private SRTProcess runningProcess; @Override public void initialize(URL location, ResourceBundle resources) { @@ -54,7 +54,7 @@ public void initialize(URL location, ResourceBundle resources) { @FXML private void addProcess() { proccessTable.getChildren().add(createProcess(processIdentifierObtained.getText())); - ProcessSRT tempProcess = new ProcessSRT(); + SRTProcess tempProcess = new SRTProcess(); tempProcess.setProcessIdentifier(processIdentifierObtained.getText()); tempProcess.setArrivalTime(Integer.parseInt(arrivalTimeObtained.getText()) - 1); tempProcess.setServiceTime(Integer.parseInt(serviceTimeObtained.getText())); @@ -141,7 +141,7 @@ private void deleteAllProcess() { @FXML private void applyPlanner() { - ObservableList firtProcessList = getFirtProcess(); + ObservableList firtProcessList = getFirtProcess(); if (firtProcessList.size() == 1) { runningProcess = firtProcessList.get(0); } else { @@ -151,7 +151,7 @@ private void applyPlanner() { processes.remove(runningProcess); for (int i = runningProcess.getArrivalTime(); i < quantum; i++) { if (!processes.isEmpty()) { - ProcessSRT tempProcess = checkProcessStart(i); + SRTProcess tempProcess = checkProcessStart(i); if (tempProcess != null) { if (runningProcess.getServiceTime() == 0) { runningProcess = tempProcess; @@ -189,8 +189,8 @@ private void applyPlanner() { } - private ObservableList getFirtProcess() { - ObservableList firtProcessList = FXCollections.observableArrayList(); + private ObservableList getFirtProcess() { + ObservableList firtProcessList = FXCollections.observableArrayList(); int smallerNumber = processes.get(0).getArrivalTime(); int posSmallerNumber = 0; for (int i = 1; i < processes.size(); i++) { @@ -214,9 +214,9 @@ private ObservableList getFirtProcess() { } - private ProcessSRT compareServiceTime(ObservableList processToCompare) { + private SRTProcess compareServiceTime(ObservableList processToCompare) { - ProcessSRT shorterProcess = processes.get(processToCompare.get(0).getPosition()); + SRTProcess shorterProcess = processes.get(processToCompare.get(0).getPosition()); for (int i = 1; i < processToCompare.size(); i++) { if (processes.get(processToCompare.get(i).getPosition()).getServiceTime() < shorterProcess.getServiceTime()) { shorterProcess = processes.get(processToCompare.get(i).getPosition()); @@ -226,9 +226,9 @@ private ProcessSRT compareServiceTime(ObservableList processToCompar } - private ProcessSRT checkProcessStart(int position) { - ProcessSRT tempProcess = null; - for (ProcessSRT process : processes) { + private SRTProcess checkProcessStart(int position) { + SRTProcess tempProcess = null; + for (SRTProcess process : processes) { if (process.getArrivalTime() == position) { tempProcess = process; } @@ -242,7 +242,7 @@ private void orderProcesses() { for (int i = 0; i < waitingProcesses.size(); i++) { for (int j = 0; j < waitingProcesses.size(); j++) { if (waitingProcesses.get(i).getServiceTime() < waitingProcesses.get(j).getServiceTime()) { - ProcessSRT tmpProcess = waitingProcesses.get(i); + SRTProcess tmpProcess = waitingProcesses.get(i); waitingProcesses.set(i, waitingProcesses.get(j)); waitingProcesses.set(j, tmpProcess); diff --git a/src/main/java/com/unah/planners/process/JSFProcess.java b/src/main/java/com/unah/planners/process/JSFProcess.java new file mode 100644 index 0000000..3a98714 --- /dev/null +++ b/src/main/java/com/unah/planners/process/JSFProcess.java @@ -0,0 +1,183 @@ +package com.unah.planners.process; + + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; + +public class JSFProcess { + + private String name; + private Integer quantun; + private String estado; + private Integer timeArrival; + private Integer timeService; + private Integer timeStay; + private Integer timeWaiting; + private Integer timeStart; + private Integer timeFinalize; + private Float timeNormalized; + + public JSFProcess(String name, + Integer quantun, + Integer timeArrival, + Integer timeService + ) { + this.name = name; + this.quantun = quantun; + this.timeArrival = timeArrival; + this.timeService = timeService; + } + + public void timeStayFF() { + this.timeStay = (this.timeFinalize - this.timeArrival); + } + + public void timeWaitingFF() { + System.out.println(this.timeStart); + this.timeWaiting = ((this.timeStart == 0) ? this.timeArrival : this.timeStart - this.timeArrival); + } + + public void timeFinalizeFF() { + this.timeFinalize = (this.timeStart + this.timeService); + } + + public void timeNormalizedFF() { + this.timeNormalized = ((float) (this.timeWaiting) / (float) (this.timeService)); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getQuantun() { + return quantun; + } + + public void setQuantun(Integer quantun) { + this.quantun = quantun; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public Integer getTimeArrival() { + return timeArrival; + } + + public void setTimeArrival(Integer timeArrival) { + this.timeArrival = timeArrival; + } + + public Integer getTimeService() { + return timeService; + } + + public void setTimeService(Integer timeService) { + this.timeService = timeService; + } + + public Integer getTimeStay() { + return timeStay; + } + + public void setTimeStay(Integer timeStay) { + this.timeStay = timeStay; + } + + public Integer getTimeWaiting() { + return timeWaiting; + } + + public void setTimeWaiting(Integer timeWaiting) { + this.timeWaiting = timeWaiting; + } + + public Integer getTimeStart() { + return timeStart; + } + + public void setTimeStart(Integer timeStart) { + this.timeStart = timeStart; + } + + public Integer getTimeFinalize() { + return timeFinalize; + } + + public void setTimeFinalize(Integer timeFinalize) { + this.timeFinalize = timeFinalize; + } + + public Float getTimeNormalized() { + return timeNormalized; + } + + public void setTimeNormalized(Float timeNormalized) { + this.timeNormalized = timeNormalized; + } + + public void timeStartJSF(ObservableList obs) { + + ObservableList obs2 = FXCollections.observableArrayList(); + for (JSFProcess ob : obs) { + obs2.add(new JSFProcess(ob.name, ob.quantun, ob.timeArrival, ob.timeService)); + } + obs.clear(); + + int[] timeCurrent = new int[1]; + int[] timeShorter = new int[1]; + int[] index = new int[1]; + + while (obs2.size() != 0) { + + for (int i1 = 0; i1 < obs2.size(); i1++) { + if (obs2.get(i1).timeArrival == 0) { + obs2.get(i1).timeStart = 0; + timeCurrent[0] = obs2.get(i1).timeService; + obs.add(obs2.get(i1)); + + continue; + } + + if (obs2.get(i1).timeArrival <= timeCurrent[0]) { + + if (obs2.get(i1).timeService < timeShorter[0]) { + timeShorter[0] = obs2.get(i1).timeService; + index[0] = i1; + continue; + } + + if (timeShorter[0] == 0 && obs2.get(i1).timeService >= 0) { + timeShorter[0] = obs2.get(i1).timeService; + index[0] = i1; + continue; + } + } + } + + obs2.get(index[0]).timeStart = timeCurrent[0]; + timeCurrent[0] += obs2.get(index[0]).timeService; + obs.add(obs2.get(index[0])); + obs2.remove(index[0]); + timeShorter[0] = 0; + index[0] = 0; + } + } + + @Override + public String toString() { + return "Process [name=" + name + ", quantun=" + quantun + ", estado=" + estado + ", timeArrival=" + timeArrival + + ", timeService=" + timeService + ", timeStay=" + timeStay + ", timeWaiting=" + timeWaiting + + ", timeStart=" + timeStart + ", timeFinalize=" + timeFinalize + ", timeNormalized=" + timeNormalized + + "]"; + } +} diff --git a/src/main/java/com/unah/planners/process/Process.java b/src/main/java/com/unah/planners/process/Process.java deleted file mode 100644 index 66b3af7..0000000 --- a/src/main/java/com/unah/planners/process/Process.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.unah.planners.process; - - -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; - -public class Process { - - private String name; - private Integer quantun; - private String estado; - private Integer timeArrival; - private Integer timeService; - private Integer timeStay; - private Integer timeWaiting; - private Integer timeStart; - private Integer timeFinalize; - private Float timeNormalized; - - public Process(String name, - Integer quantun, - Integer timeArrival, - Integer timeService - ){ - this.name = name; - this.quantun = quantun; - this.timeArrival = timeArrival; - this.timeService = timeService; - } - - public void timeStayFF() {this.timeStay = (this.timeFinalize-this.timeArrival);} - - public void timeWaitingFF() { - System.out.println(this.timeStart); - this.timeWaiting = ((this.timeStart==0)?this.timeArrival:this.timeStart-this.timeArrival); } - - public void timeFinalizeFF() {this.timeFinalize = (this.timeStart + this.timeService);} - - public void timeNormalizedFF() {this.timeNormalized = ((float)(this.timeWaiting)/(float)(this.timeService));} - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getQuantun() { - return quantun; - } - - public void setQuantun(Integer quantun) { - this.quantun = quantun; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public Integer getTimeArrival() { - return timeArrival; - } - - public void setTimeArrival(Integer timeArrival) { - this.timeArrival = timeArrival; - } - - public Integer getTimeService() { - return timeService; - } - - public void setTimeService(Integer timeService) { - this.timeService = timeService; - } - - public Integer getTimeStay() { - return timeStay; - } - - public void setTimeStay(Integer timeStay) { - this.timeStay = timeStay; - } - - public Integer getTimeWaiting() { - return timeWaiting; - } - - public void setTimeWaiting(Integer timeWaiting) { - this.timeWaiting = timeWaiting; - } - - public Integer getTimeStart() { - return timeStart; - } - - public void setTimeStart(Integer timeStart) { - this.timeStart = timeStart; - } - - public Integer getTimeFinalize() { - return timeFinalize; - } - - public void setTimeFinalize(Integer timeFinalize) { - this.timeFinalize = timeFinalize; - } - - public Float getTimeNormalized() { - return timeNormalized; - } - - public void setTimeNormalized(Float timeNormalized) { - this.timeNormalized = timeNormalized; - } - - public void timeStartJSF(ObservableList obs) { - - ObservableList obs2 = FXCollections.observableArrayList(); - for (Process ob : obs) { - obs2.add(new Process(ob.name, ob.quantun, ob.timeArrival, ob.timeService)); - } - obs.clear(); - - int[] timeCurrent = new int[1]; - int[] timeShorter = new int[1]; - int[] index = new int[1]; - - while (obs2.size() != 0){ - System.out.println("tamanio del observable : "+obs2.size()); - for( int i1 = 0 ; i1 < obs2.size() ; i1++ ) { - if (obs2.get(i1).timeArrival == 0) { - obs2.get(i1).timeStart = 0; - System.out.println("primer if entro"); - System.out.println("Proceso \""+obs2.get(i1).name+ "\", se ejecuto en el tiempo : "+timeCurrent[0]); - timeCurrent[0] = obs2.get(i1).timeService; - obs.add(obs2.get(i1)); - - continue; - } - System.out.println("probando si pasa o no"); - if (obs2.get(i1).timeArrival <= timeCurrent[0]) { - - if (obs2.get(i1).timeService < timeShorter[0]) { - timeShorter[0] = obs2.get(i1).timeService; - index[0] = i1; - continue; - } - System.out.println("su tiempo no es menor que el de tiempo m�s corto actualmente "); - if (timeShorter[0] == 0 && obs2.get(i1).timeService >= 0 ) { - timeShorter[0] = obs2.get(i1).timeService; - index[0] = i1; - continue; - } - System.out.println("su ya llego pero asaber que pedos"); - - } else { - System.out.println("su tiempo aun no ha llegado"); - } - } - - System.out.println("Proceso \""+obs2.get(index[0]).name+ "\", se ejecuto en el tiempo : "+timeCurrent[0]+"al final xd"); - obs2.get(index[0]).timeStart = timeCurrent[0]; - timeCurrent[0] += obs2.get(index[0]).timeService; - obs.add(obs2.get(index[0])); - obs2.remove(index[0]); - timeShorter[0] = 0; - index[0] = 0; - } - - - } - - - @Override - public String toString() { - return "Process [name=" + name + ", quantun=" + quantun + ", estado=" + estado + ", timeArrival=" + timeArrival - + ", timeService=" + timeService + ", timeStay=" + timeStay + ", timeWaiting=" + timeWaiting - + ", timeStart=" + timeStart + ", timeFinalize=" + timeFinalize + ", timeNormalized=" + timeNormalized - + "]"; - } - - - -} diff --git a/src/main/java/com/unah/planners/process/ProcessSRT.java b/src/main/java/com/unah/planners/process/SRTProcess.java similarity index 97% rename from src/main/java/com/unah/planners/process/ProcessSRT.java rename to src/main/java/com/unah/planners/process/SRTProcess.java index e1ee89e..59a8d6a 100644 --- a/src/main/java/com/unah/planners/process/ProcessSRT.java +++ b/src/main/java/com/unah/planners/process/SRTProcess.java @@ -1,6 +1,6 @@ package com.unah.planners.process; -public class ProcessSRT { +public class SRTProcess { private String processIdentifier; private int arrivalTime; private int serviceTime; diff --git a/src/main/resources/com/unah/planners/HRRN-view.fxml b/src/main/resources/com/unah/planners/HRRN-view.fxml deleted file mode 100644 index e830bff..0000000 --- a/src/main/resources/com/unah/planners/HRRN-view.fxml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - -