Small sout refactor

Author: JanekDev

src/main/java/com/oopproject/Main.java

@@ -3,15 +3,7 @@
 import com.oopproject.gui.MainWindow;
 import javafx.application.Application;
 
-/**
- * Main class of the application.
- * @author Michal
- */
 public class Main {
-    /**
-     * Main method of the application.
-     * @param args arguments of the application
-     */
     public static void main(String[] args){
         Application.launch(MainWindow.class, args);
     }

src/main/java/com/oopproject/Pathfinder.java

@@ -0,0 +1,91 @@
+package com.oopproject;
+
+import com.oopproject.world.locations.Location;
+import com.oopproject.world.locations.Path;
+import javafx.util.Pair;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.PriorityQueue;
+
+public class Pathfinder {
+    private HashMap<Pair<Integer, Integer>, Location> map_locations;
+    public Pathfinder(HashMap<Pair<Integer, Integer>, Location> map_locations){
+        this.map_locations = map_locations;
+    }
+    private int heuristic(int x1, int y1, int x2, int y2){
+        // euclidean distance
+        return (int) Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2));
+    }
+    private int cost(int x1, int y1, int x2, int y2){
+        if (this.map_locations.containsKey(new Pair<>(x2, y2))){
+            if (this.map_locations.get(new Pair<>(x2, y2)) instanceof Path){
+                return 10;
+            }
+            else{
+                return 10000;
+            }
+        }
+        else{
+            return 3000;
+        }
+    }
+    public ArrayList<Pair<Integer, Integer>> findPath(int x1, int y1, int x2, int y2){
+        //returns path which is comprised of pairs of coordinates
+        ArrayList <Pair<Integer, Integer>> path = new ArrayList<>();
+        // find path from p1 to p1, and make it look like manhattan distance
+        // assign very high cost to already occupied cells by other things that path,
+        // assign very low cost to these nodes
+        // implementation:
+        class Tuple implements Comparable<Tuple>{
+            int x;
+            int y;
+            int cost;
+            int heuristic;
+            int total;
+            Tuple parent;
+            public Tuple(int x, int y, int cost, int heuristic, Tuple parent){
+                this.x = x;
+                this.y = y;
+                this.cost = cost;
+                this.heuristic = heuristic;
+                this.total = cost + heuristic;
+                this.parent = parent;
+            }
+            @Override
+            public int compareTo(Tuple o) {
+                return this.total - o.total;
+            }
+        }
+        PriorityQueue<Tuple> queue = new PriorityQueue<>();
+        HashMap<Pair<Integer, Integer>, Tuple> visited = new HashMap<>();
+        queue.add(new Tuple(x1, y1, 0, heuristic(x1, y1, x2, y2), null));
+        while (!queue.isEmpty()){
+            Tuple t = queue.poll();
+            if (t.x == x2 && t.y == y2){
+                //found path
+                while (t.parent != null){
+                    path.add(new Pair<>(t.x, t.y));
+                    t = t.parent;
+                }
+                break;
+            }
+            if (!visited.containsKey(new Pair<>(t.x, t.y))){
+                visited.put(new Pair<>(t.x, t.y), t);
+                if (t.x > 0){
+                    queue.add(new Tuple(t.x - 1, t.y, t.cost + cost(t.x, t.y, t.x - 1, t.y), heuristic(t.x - 1, t.y, x2, y2), t));
+                }
+                if (t.x < 24){
+                    queue.add(new Tuple(t.x + 1, t.y, t.cost + cost(t.x, t.y, t.x + 1, t.y), heuristic(t.x + 1, t.y, x2, y2), t));
+                }
+                if (t.y > 0){
+                    queue.add(new Tuple(t.x, t.y - 1, t.cost + cost(t.x, t.y, t.x, t.y - 1), heuristic(t.x, t.y - 1, x2, y2), t));
+                }
+                if (t.y < 24){
+                    queue.add(new Tuple(t.x, t.y + 1, t.cost + cost(t.x, t.y, t.x, t.y + 1), heuristic(t.x, t.y + 1, x2, y2), t));
+                }
+            }
+        }
+        return path;
+    }
+}

src/main/java/com/oopproject/gui/MainWindow.java

@@ -5,29 +5,27 @@
 import javafx.event.EventHandler;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.stage.Screen;
 import javafx.stage.WindowEvent;
 
 /**
  * Main window of the application.
- * @author Michal
- *
  */
 public class MainWindow extends Application {
     /**
      * Entry point starting the application.
-     * @param stage the stage to be shown
+     * @param stage
      * @throws IOException
      */
     @Override
     public void start(Stage stage) throws IOException {
         FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("MainWindow.fxml"));
-        double windowSize = (double)((int)Screen.getPrimary().getBounds().getHeight()*0.9);
-        Scene scene = new Scene(fxmlLoader.load(), windowSize*1.1, windowSize);
-        stage.setTitle("Fallout 0");
-        stage.getIcons().add(new javafx.scene.image.Image("file:src/main/resources/images/icon.png"));
+        double window_size = (double)((int)Screen.getPrimary().getBounds().getHeight()) * 0.8;
+        Scene scene = new Scene(fxmlLoader.load(), window_size*1.1, window_size);
+        stage.setTitle("OOP Project");
         stage.setScene(scene);
         stage.setResizable(false);
         stage.show();
@@ -37,7 +35,7 @@ public void handle(WindowEvent e) {
                 // get the controller
                 MainWindowController controller = fxmlLoader.getController();
                 // stop the simulation
-                //controller.terminateSimulation();
+                controller.terminateSimulation();
                 Platform.exit();
                 System.exit(0);
             }

src/main/java/com/oopproject/gui/MainWindowController.java

@@ -1,45 +1,48 @@
 package com.oopproject.gui;
 
-import com.oopproject.world.animals.Animal;
-import com.oopproject.world.animals.Prey;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.control.TextField;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TitledPane;
-import javafx.scene.image.Image;
+import javafx.scene.layout.VBox;
 import javafx.stage.Screen;
 import com.oopproject.world.World;
-import javafx.util.Pair;
+
 import java.net.URL;
 import java.util.ResourceBundle;
 
 /**
- * The main window controller. Managed by The Institute, so watch out for any synth attacks.
+ * The main window controller.
  */
 public class MainWindowController implements Initializable {
     private Mapper animalMapper;
-    private World welcomeToTheJungle;
+    private World welcometothejungle;
     @FXML
     private TextField animalTextField;
+
+    @FXML
+    private VBox mainVBox;
+
     @FXML
     private Canvas mapCanvas;
+
     @FXML
-    private Button startButton;
+    private Button preyButton;
+
     @FXML
-    private Label objectLabel;
+    private Button predatorButton;
+
     @FXML
-    private Canvas objectCanvas;
+    private Button startButton;
+
     @FXML
-    private Canvas bombsCanvas;
+    private Label propertiesViewLabel;
+
     @FXML
     private TitledPane mapTitledPane;
-    private Pair<Integer, Integer> selection;
-    private Animal selectedAnimal;
-    private Image nukaImage;
-    private Image bombImage;
 
     /**
      * Initializes the controller class.
@@ -48,94 +51,45 @@ public class MainWindowController implements Initializable {
      */
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
-        double height = (double)((int) Screen.getPrimary().getBounds().getHeight()*0.9- 315);
+        double height = (double)((int) Screen.getPrimary().getBounds().getHeight() * 0.8 - 220);
         mapTitledPane.setPrefHeight(height);
         mapTitledPane.setMaxHeight(height);
-        nukaImage = new Image("file:src/main/resources/images/nuka.png");
-        //draw the image on the canvas, keeping the aspect ratio of the image
-        objectCanvas.getGraphicsContext2D().drawImage(nukaImage, 0, 0, objectCanvas.getWidth(), objectCanvas.getHeight());
-        bombImage = new Image("file:src/main/resources/images/bombs.png");
-        bombsCanvas.getGraphicsContext2D().drawImage(bombImage, 0, 0, bombsCanvas.getWidth(), bombsCanvas.getHeight());
         animalMapper = new Mapper(mapCanvas, height);
-        welcomeToTheJungle = new World(animalMapper);
-        getClick();
-        // start the music
-    }
-
-    /**
-     * Gets the postion of the click on the map and displays the animal in the given box.
-     */
-    public void getClick(){
-        mapCanvas.setOnMouseClicked(mouseEvent -> {
-            selection = new Pair<>((int) (mouseEvent.getX() / animalMapper.getxStep()), (int) (mouseEvent.getY() / animalMapper.getyStep()));
-            objectLabel.setText(welcomeToTheJungle.getObjectInfo(selection.getKey(), selection.getValue()));
-            for (int i = 0; i < welcomeToTheJungle.getAnimals().size(); i++) {
-                if (welcomeToTheJungle.getAnimals().get(i).getX() == selection.getKey() && welcomeToTheJungle.getAnimals().get(i).getY() == selection.getValue()) {
-                    selectedAnimal = welcomeToTheJungle.getAnimals().get(i);
-                    break;
-                }
-            }
-        });
+        welcometothejungle = new World(animalMapper);
     }
 
-    /**
-     * Summon Conrad Kellogg. He will handle the rest.
-     */
-    public void killAnimal(){
-        selectedAnimal.setHealth(0);
-    }
-    /**
-     * Reroute the animal to previously selected position.
-     */
-    public void rerouteAnimal(){
-        if (selectedAnimal instanceof Prey) {
-            ((Prey) selectedAnimal).reroute(selection.getKey(), selection.getValue());
-        }
-    }
     /**
      * Start/stop button handler.
      */
     public void start(){
         if (startButton.getText().equals("START")){
             startButton.setText("STOP");
-            welcomeToTheJungle.run();
+            welcometothejungle.run();
         }
         else{
             startButton.setText("START");
-            welcomeToTheJungle.stop();
+            welcometothejungle.stop();
         }
     }
 
     /**
      * Add prey button handler.
      */
     public void addPrey(){
-        if (animalTextField.getText().equals("")){
-            //glow border red
-            animalTextField.setStyle("-fx-border-color: red ; -fx-border-width: 2px ;");
-        }
-        else{
-            welcomeToTheJungle.addPrey(animalTextField.getText());
-            animalTextField.setText("");
-            //return to normal
-            animalTextField.setStyle("-fx-border-color: transparent ; -fx-border-width: 0px ;");
-        }
-
+        welcometothejungle.addPrey(animalTextField.getText());
     }
 
     /**
      * Add predator button handler.
      */
     public void addPredator(){
-        if (animalTextField.getText().equals("")){
-            //glow border red
-            animalTextField.setStyle("-fx-border-color: red ; -fx-border-width: 2px ;");
-        }
-        else{
-            welcomeToTheJungle.addPredator(animalTextField.getText());
-            animalTextField.setText("");
-            //return to normal
-            animalTextField.setStyle("-fx-border-color: transparent ; -fx-border-width: 0px ;");
-        }
+        welcometothejungle.addPredator(animalTextField.getText());
+    }
+
+    /**
+     * Terminate the simulation.
+     */
+    public void terminateSimulation(){
+        welcometothejungle.terminate();
     }
 }