From c9ba1bff30dfee55bc9b389341e5331db8ebd15c Mon Sep 17 00:00:00 2001 From: MickWerf Date: Sun, 7 Jun 2020 17:02:00 +0200 Subject: [PATCH] Util cleaning --- .../game/util/game/GameCharacter.java | 2 -- .../game/util/graphics/FrameRate.java | 4 +-- .../game/util/graphics/TextRenderer.java | 4 +-- .../game/util/tree/AbstractTree.java | 8 +++--- core/src/netwerkprog/game/util/tree/BST.java | 26 +------------------ core/src/netwerkprog/game/util/tree/Tree.java | 16 ++++++------ 6 files changed, 17 insertions(+), 43 deletions(-) diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java index f26cfb0..1f017e5 100644 --- a/core/src/netwerkprog/game/util/game/GameCharacter.java +++ b/core/src/netwerkprog/game/util/game/GameCharacter.java @@ -1,7 +1,5 @@ package netwerkprog.game.util.game; - -import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.scenes.scene2d.Actor; import netwerkprog.game.client.game.map.GameTile; diff --git a/core/src/netwerkprog/game/util/graphics/FrameRate.java b/core/src/netwerkprog/game/util/graphics/FrameRate.java index fdf3e18..501020d 100644 --- a/core/src/netwerkprog/game/util/graphics/FrameRate.java +++ b/core/src/netwerkprog/game/util/graphics/FrameRate.java @@ -17,8 +17,8 @@ public class FrameRate implements Disposable{ long lastTimeCounted; private float sinceChange; private float frameRate; - private BitmapFont font; - private SpriteBatch batch; + private final BitmapFont font; + private final SpriteBatch batch; private OrthographicCamera cam; diff --git a/core/src/netwerkprog/game/util/graphics/TextRenderer.java b/core/src/netwerkprog/game/util/graphics/TextRenderer.java index 158b521..769a80b 100644 --- a/core/src/netwerkprog/game/util/graphics/TextRenderer.java +++ b/core/src/netwerkprog/game/util/graphics/TextRenderer.java @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.utils.Disposable; public class TextRenderer implements Disposable { - private BitmapFont font; - private SpriteBatch batch; + private final BitmapFont font; + private final SpriteBatch batch; private OrthographicCamera cam; public TextRenderer() { diff --git a/core/src/netwerkprog/game/util/tree/AbstractTree.java b/core/src/netwerkprog/game/util/tree/AbstractTree.java index 910ab3c..7c7c9ee 100644 --- a/core/src/netwerkprog/game/util/tree/AbstractTree.java +++ b/core/src/netwerkprog/game/util/tree/AbstractTree.java @@ -1,19 +1,19 @@ package netwerkprog.game.util.tree; public abstract class AbstractTree implements Tree { - @Override /** Inorder traversal from the root*/ + @Override /* Inorder traversal from the root*/ public void inorder() { } - @Override /** Postorder traversal from the root */ + @Override /* Postorder traversal from the root */ public void postorder() { } - @Override /** Preorder traversal from the root */ + @Override /* Preorder traversal from the root */ public void preorder() { } - @Override /** Return true if the tree is empty */ + @Override /* Return true if the tree is empty */ public boolean isEmpty() { return getSize() == 0; } diff --git a/core/src/netwerkprog/game/util/tree/BST.java b/core/src/netwerkprog/game/util/tree/BST.java index b341c48..895a040 100644 --- a/core/src/netwerkprog/game/util/tree/BST.java +++ b/core/src/netwerkprog/game/util/tree/BST.java @@ -1,19 +1,13 @@ package netwerkprog.game.util.tree; -import java.util.Iterator; - public class BST> extends AbstractTree { protected TreeNode root; protected int size = 0; - // Helper methode public int sum () { return this.sum(this.getRoot()); } - // Opgave 1b (10 punten): Maak de recursieve methode sum af in de klasse bst.BST. Deze methode telt de getallen - // van alle elementen van de binaire zoekboom bij elkaar op. De methode geeft de totale som terug van alle getallen - // in de boom. public int sum( TreeNode node ) { // Schrijf hier jouw code... if (node == null) { @@ -24,13 +18,10 @@ public class BST> extends AbstractTree { return sum(node.left) + sum(node.right); } - // Helper methode public int totalLeaves () { return this.totalLeaves(this.getRoot()); } - // Opgave 1c (10 punten): Maak de methode totalLeaves af om de klasse bst.BST. Deze methode telt het aantal - // bladeren (leaves) van de gegeven binaire zoekboom en geeft deze terug. Je hoeft deze methode niet recursief te - // implementeren. Het mag wel. + public int totalLeaves ( TreeNode node ) { if (node == null) { return 0; @@ -58,7 +49,6 @@ public class BST> extends AbstractTree { private boolean search(E e, TreeNode tree) { - // nog niet correct if (tree == null) { return false; @@ -337,18 +327,4 @@ public class BST> extends AbstractTree { ", " + res + '}'; } - - // if (tree == null) { - // return false; - // } - // else if (e.compareTo(tree.element) > 0) { - // return search(e, tree.right); - // } - // else if (e.compareTo(tree.element) < 0) { - // return search(e, tree.left); - // } - // else { - // return true; - // } - // } diff --git a/core/src/netwerkprog/game/util/tree/Tree.java b/core/src/netwerkprog/game/util/tree/Tree.java index 60c982d..cf164a0 100644 --- a/core/src/netwerkprog/game/util/tree/Tree.java +++ b/core/src/netwerkprog/game/util/tree/Tree.java @@ -2,28 +2,28 @@ package netwerkprog.game.util.tree; public interface Tree extends Iterable { /** Return true if the element is in the tree */ - public boolean search(E e); + boolean search(E e); /** Insert element o into the binary tree * Return true if the element is inserted successfully */ - public boolean insert(E e); + boolean insert(E e); /** Delete the specified element from the tree * Return true if the element is deleted successfully */ - public boolean delete(E e); + boolean delete(E e); /** Inorder traversal from the root*/ - public void inorder(); + void inorder(); /** Postorder traversal from the root */ - public void postorder(); + void postorder(); /** Preorder traversal from the root */ - public void preorder(); + void preorder(); /** Get the number of nodes in the tree */ - public int getSize(); + int getSize(); /** Return true if the tree is empty */ - public boolean isEmpty(); + boolean isEmpty(); }