From f5407d8ae69bc15bd9b318b67f77ce438a5ec27b Mon Sep 17 00:00:00 2001 From: Selebrator Date: Thu, 6 Jun 2019 18:55:38 +0200 Subject: [PATCH 1/2] 9.2 with array for better performance --- src/main/java/_9/_2/Lights.java | 68 +++++++++++++-------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/src/main/java/_9/_2/Lights.java b/src/main/java/_9/_2/Lights.java index 1759e0e..b42578e 100644 --- a/src/main/java/_9/_2/Lights.java +++ b/src/main/java/_9/_2/Lights.java @@ -1,8 +1,6 @@ package _9._2; import javafx.application.Application; -import javafx.collections.ObservableList; -import javafx.scene.Node; import javafx.scene.Scene; import javafx.scene.layout.GridPane; import javafx.scene.paint.Color; @@ -15,48 +13,40 @@ import java.util.Optional; public class Lights extends Application { private static final int DEFAULT_SIZE = 4; - private static final int GAP = 2; private static final Paint ON = Color.YELLOW; private static final Paint OFF = Color.WHITE; @Override - public void start(Stage primaryStage) throws Exception { + public void start(Stage primaryStage) { final int size = Optional.ofNullable(this.getParameters().getNamed().get("size")) .map(Integer::parseInt).orElse(DEFAULT_SIZE); + Rectangle[][] positions = new Rectangle[size][size]; GridPane grid = new GridPane(); Scene scene = new Scene(grid, 600, 600); - scene.setFill(Color.BLACK); - grid.setHgap(GAP); - grid.setVgap(GAP); - for(int x = 0; x < size; x++) { - for(int y = 0; y < size; y++) { - Rectangle rec = new Rectangle(150, 150); - rec.heightProperty().bind(scene.heightProperty().subtract(size * GAP).divide(size)); - rec.widthProperty().bind(scene.widthProperty().subtract(size * GAP).divide(size)); + primaryStage.setScene(scene); + primaryStage.setTitle("Lights"); + + for(int row = 0; row < size; row++) { + for(int column = 0; column < size; column++) { + Rectangle rec = new Rectangle(); rec.setFill(OFF); - grid.add(rec, x, y); - } - } - for(int x = 0; x < size; x++) { - for(int y = 0; y < size; y++) { - Rectangle rec = getNodeByRowColumnIndex(x, y, grid); - assert rec != null; - Rectangle up = getNodeByRowColumnIndex(x, y - 1, grid); - Rectangle down = getNodeByRowColumnIndex(x, y + 1, grid); - Rectangle left = getNodeByRowColumnIndex(x - 1, y, grid); - Rectangle right = getNodeByRowColumnIndex(x + 1, y, grid); - rec.setOnMouseClicked(event -> { - toggle(rec); - toggle(up); - toggle(down); - toggle(left); - toggle(right); - }); + rec.setStroke(Color.BLACK); + rec.heightProperty().bind(scene.heightProperty().divide(size).subtract(1)); // -1 for stroke + rec.widthProperty().bind(scene.widthProperty().divide(size).subtract(1)); + { + final int x = row, y = column; + rec.setOnMouseClicked(event -> { + toggle(rec); + toggle(getMatrixIndexSafe(positions, x, y - 1)); + toggle(getMatrixIndexSafe(positions, x, y + 1)); + toggle(getMatrixIndexSafe(positions, x - 1, y)); + toggle(getMatrixIndexSafe(positions, x + 1, y)); + }); + } + grid.add(rec, row, column); + positions[row][column] = rec; } } - - primaryStage.setScene(scene); - primaryStage.setTitle("Lights"); primaryStage.show(); } @@ -74,14 +64,10 @@ public class Lights extends Application { } } - public static T getNodeByRowColumnIndex(final int column, final int row, GridPane gridPane) { - ObservableList children = gridPane.getChildren(); - for(Node node : children) { - if(GridPane.getRowIndex(node) == row && GridPane.getColumnIndex(node) == column) { - return (T) node; - } - } - return null; + private static T getMatrixIndexSafe(final T[][] positions, final int row, final int column) { + return (0 <= row && row < positions.length) && (0 <= column && column < positions[row].length) + ? positions[row][column] + : null; } public static void main(String[] args) { From 2d234620360bcc5715e53ddbeb4259e4745e5b85 Mon Sep 17 00:00:00 2001 From: Lisa Date: Thu, 6 Jun 2019 20:41:07 +0200 Subject: [PATCH 2/2] Initial commit 9.3 --- src/main/java/_9/_3/DrunkenPirate.java | 37 ++++++++++++++++++ src/main/java/_9/_3/Observable.java | 40 +++++++++++++++++++ src/main/java/_9/_3/Ship.java | 51 +++++++++++++++++++++++++ src/main/java/_9/_3/ShipEvent.java | 19 +++++++++ src/main/java/_9/_3/ShipLog.java | 32 ++++++++++++++++ src/main/java/provided/_9/Captain.java | 22 +++++++++++ src/main/java/provided/_9/Observer.java | 10 +++++ src/main/java/provided/_9/ShipTest.java | 20 ++++++++++ 8 files changed, 231 insertions(+) create mode 100644 src/main/java/_9/_3/DrunkenPirate.java create mode 100644 src/main/java/_9/_3/Observable.java create mode 100644 src/main/java/_9/_3/Ship.java create mode 100644 src/main/java/_9/_3/ShipEvent.java create mode 100644 src/main/java/_9/_3/ShipLog.java create mode 100644 src/main/java/provided/_9/Captain.java create mode 100644 src/main/java/provided/_9/Observer.java create mode 100644 src/main/java/provided/_9/ShipTest.java diff --git a/src/main/java/_9/_3/DrunkenPirate.java b/src/main/java/_9/_3/DrunkenPirate.java new file mode 100644 index 0000000..759858e --- /dev/null +++ b/src/main/java/_9/_3/DrunkenPirate.java @@ -0,0 +1,37 @@ +package _9._3; + +import provided._9.Captain; + +public class DrunkenPirate extends Captain { + + public DrunkenPirate(Ship ship) { + super(ship); + } + + @Override + public void commandShip() { + ShipEvent event = ShipEvent.getRandomShipEvent(); + System.out.println(event); + + switch (event) { + case SET_SAILS: + this.ship.setSails(); + break; + case STRIKE_SAILS: + this.ship.strikeSails(); + break; + case LOAD_CANNONS: + this.ship.loadCannons(); + break; + case FIRE_CANNONS: + this.ship.fireCannons(); + break; + case TURN_LEFT: + this.ship.turnLeft(); + break; + case TURN_RIGHT: + this.ship.turnRight(); + break; + } + } +} diff --git a/src/main/java/_9/_3/Observable.java b/src/main/java/_9/_3/Observable.java new file mode 100644 index 0000000..dbce718 --- /dev/null +++ b/src/main/java/_9/_3/Observable.java @@ -0,0 +1,40 @@ +package _9._3; + +import provided._9.Observer; + +import java.util.ArrayList; +import java.util.List; + +public abstract class Observable { + private List observers = new ArrayList<>(); + private boolean changed = false; + + public void addObserver(Observer o) { + this.observers.add(o); + } + + public void removeObserver(Observer o) { + this.observers.remove(o); + } + + protected void setChanged() { + changed = true; + } + + private void clearChanged() { + changed = false; + } + + public boolean isChanged() { + return changed; + } + + public void notifyObservers(ShipEvent what) { + if (this.isChanged()) { + for (Observer observer : observers) { + observer.update(this, what); + } + this.clearChanged(); + } + } +} diff --git a/src/main/java/_9/_3/Ship.java b/src/main/java/_9/_3/Ship.java new file mode 100644 index 0000000..ded1cc7 --- /dev/null +++ b/src/main/java/_9/_3/Ship.java @@ -0,0 +1,51 @@ +package _9._3; + +public class Ship extends Observable { + private boolean sailsSet = false; + private boolean cannonsLoaded = false; + private int heading = 0; + + public void setSails() { + if (!sailsSet) { + sailsSet = true; + this.setChanged(); + notifyObservers(ShipEvent.SET_SAILS); + } + } + + public void strikeSails() { + if (sailsSet) { + sailsSet = false; + this.setChanged(); + notifyObservers(ShipEvent.STRIKE_SAILS); + } + } + + public void loadCannons() { + if (!cannonsLoaded) { + cannonsLoaded = true; + this.setChanged(); + notifyObservers(ShipEvent.LOAD_CANNONS); + } + } + + public void fireCannons() { + if (cannonsLoaded) { + cannonsLoaded = false; + this.setChanged(); + notifyObservers(ShipEvent.FIRE_CANNONS); + } + } + + public void turnLeft() { + heading = (heading - 90) % 180; + this.setChanged(); + notifyObservers(ShipEvent.TURN_LEFT); + } + + public void turnRight() { + heading = (heading + 90) % 360; + this.setChanged(); + notifyObservers(ShipEvent.TURN_RIGHT); + } +} diff --git a/src/main/java/_9/_3/ShipEvent.java b/src/main/java/_9/_3/ShipEvent.java new file mode 100644 index 0000000..5d1538a --- /dev/null +++ b/src/main/java/_9/_3/ShipEvent.java @@ -0,0 +1,19 @@ +package _9._3; + +import java.util.Random; + +public enum ShipEvent { + + NO_EVENT, + SET_SAILS, + STRIKE_SAILS, + LOAD_CANNONS, + FIRE_CANNONS, + TURN_LEFT, + TURN_RIGHT; + + public static ShipEvent getRandomShipEvent() { + Random random = new Random(); + return values()[random.nextInt(values().length)]; + } +} diff --git a/src/main/java/_9/_3/ShipLog.java b/src/main/java/_9/_3/ShipLog.java new file mode 100644 index 0000000..0e35c8f --- /dev/null +++ b/src/main/java/_9/_3/ShipLog.java @@ -0,0 +1,32 @@ +package _9._3; + +import provided._9.Observer; + +public class ShipLog implements Observer { + private int heading = 0; + @Override + public void update(Observable who, ShipEvent what) { + switch (what) { + case SET_SAILS: + System.out.println("Sails set."); + break; + case STRIKE_SAILS: + System.out.println("Sails struck."); + break; + case LOAD_CANNONS: + System.out.println("Cannons loaded."); + break; + case FIRE_CANNONS: + System.out.println("Cannons fired."); + break; + case TURN_LEFT: + heading = (heading - 90) % 180; + System.out.println("Turned left. New heading " + heading + " degrees."); + break; + case TURN_RIGHT: + heading = (heading + 90) % 180; + System.out.println("Turned right. New heading " + heading + " degrees."); + break; + } + } +} diff --git a/src/main/java/provided/_9/Captain.java b/src/main/java/provided/_9/Captain.java new file mode 100644 index 0000000..e77f50c --- /dev/null +++ b/src/main/java/provided/_9/Captain.java @@ -0,0 +1,22 @@ +package provided._9; + +import _9._3.Ship; + +public abstract class Captain { + + protected Ship ship; + + public Captain(Ship ship) { + super(); + this.ship = ship; + } + + /** + * Gibt ein Kommando an das Schiff. + * Dieses Kommando wird erst auf der Konsole ausgegeben + * und anschliessend wird die entsprechende Methode des + * Schiffs aufgerufen. + */ + public abstract void commandShip(); + +} diff --git a/src/main/java/provided/_9/Observer.java b/src/main/java/provided/_9/Observer.java new file mode 100644 index 0000000..3b755d0 --- /dev/null +++ b/src/main/java/provided/_9/Observer.java @@ -0,0 +1,10 @@ +package provided._9; + +import _9._3.Observable; +import _9._3.ShipEvent; + +public interface Observer { + + void update(Observable who, ShipEvent what); + +} diff --git a/src/main/java/provided/_9/ShipTest.java b/src/main/java/provided/_9/ShipTest.java new file mode 100644 index 0000000..edfa105 --- /dev/null +++ b/src/main/java/provided/_9/ShipTest.java @@ -0,0 +1,20 @@ +package provided._9; + +import _9._3.DrunkenPirate; +import _9._3.Ship; +import _9._3.ShipLog; + +public class ShipTest { + + private static final int MAX_COMMANDS = 50; + + public static void main(String[] args) { + Ship blackPearl = new Ship(); + blackPearl.addObserver(new ShipLog()); + Captain sparrow = new DrunkenPirate(blackPearl); + for (int i = 0; i < MAX_COMMANDS; i++) { + sparrow.commandShip(); + } + } + +}