From a179395e789dadf87f043f4443654471ed25169f Mon Sep 17 00:00:00 2001
From: tildiko97 <tildiko97@sch.bme.hu>
Date: Sat, 14 Apr 2018 13:25:30 +0200
Subject: [PATCH] printStat
---
src/killer_sokoban/Crate.java | 7 ++++
src/killer_sokoban/Logger.java | 70 --------------------------------
src/killer_sokoban/Moveable.java | 5 ++-
src/killer_sokoban/Worker.java | 8 ++++
4 files changed, 19 insertions(+), 71 deletions(-)
delete mode 100644 src/killer_sokoban/Logger.java
diff --git a/src/killer_sokoban/Crate.java b/src/killer_sokoban/Crate.java
index b85ee2c..8cdda58 100644
--- a/src/killer_sokoban/Crate.java
+++ b/src/killer_sokoban/Crate.java
@@ -52,5 +52,12 @@ public class Crate extends Moveable {
public void setCouldMove(boolean b) {
couldMove=b;
}
+
+ public void printStat()
+ {
+ super.printStat();
+ System.out.println("couldMove: " + couldMove);
+ System.out.println("isOnTarget: " + isOnTarget);
+ }
}
diff --git a/src/killer_sokoban/Logger.java b/src/killer_sokoban/Logger.java
deleted file mode 100644
index c129f88..0000000
--- a/src/killer_sokoban/Logger.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package killer_sokoban;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Logger {
- static private Map<Object, String> map=new HashMap<Object, String>();
- private static int depth=0;
- private static boolean enabled = false;
-
- public static void register(Object o, String name)
- {
- map.put(o, name);
- }
-
- public static void enter(Object o, String funcName, List<Object> parameters)
- {
- //not doing anything if logger disabled
- if (!enabled) return;
-
- //Intendation
- String tab="";
- for (int i=0; i<depth; i++) tab+=" ";
- depth++;
-
- //Fetching parameter list
- String param = "";
- for (Object i : parameters) {
- param += ", "; //separator
-
- if (i == null)
- param += "null";
- else if (map.containsKey(i))
- param += map.get(i);
- else
- param += i.toString();
- }
- if(param.length()>2) param = param.substring(2); //we had a comma and a space in the front
-
- //Logging
- System.out.println(tab+"-> " + map.get(o) + "." + funcName +"(" + param +")");
-
- }
-
- public static void exit(Object o, String funcName, Object returnValue)
- {
- //not doing anything if logger disabled
- if (!enabled) return;
-
- //Intendation
- String tab="";
- depth--;
- for (int i=0; i<depth; i++) tab+=" ";
-
- //Converting return value into string
- String retVal = "";
- if (returnValue != null) {
- if (map.containsKey(returnValue)) retVal = map.get(returnValue);
- else retVal = returnValue.toString();
- }
-
- //Logging
- System.out.println(tab+"<- " + map.get(o)+ "." + funcName+ "(" + ")" + (retVal.equals("") ? "" : (" [" + retVal + "]")));
-
- }
-
- public static void enable() {enabled=true;}
- public static void disable() {enabled=false;}
-}
diff --git a/src/killer_sokoban/Moveable.java b/src/killer_sokoban/Moveable.java
index e8e90d6..a0b0d4b 100644
--- a/src/killer_sokoban/Moveable.java
+++ b/src/killer_sokoban/Moveable.java
@@ -76,6 +76,9 @@ public abstract class Moveable {
return ret || couldSqueez;
}
-
+ public void printStat()
+ {
+ System.out.println(myField + ": " + Main.getFieldName(myField) );
+ }
}
diff --git a/src/killer_sokoban/Worker.java b/src/killer_sokoban/Worker.java
index 54f4fe5..e7f38ae 100644
--- a/src/killer_sokoban/Worker.java
+++ b/src/killer_sokoban/Worker.java
@@ -86,5 +86,13 @@ public class Worker extends Moveable {
return (activeForce>=0.0);
}
+
+ public void printStat()
+ {
+ super.printStat();
+ System.out.println("points: " + points);
+ System.out.println("force: " + force);
+ System.out.println("alive: " + alive);
+ }
}
--
GitLab