andreacavalli/WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added verbose logs

Browse Source
This commit is contained in:
Cavallium 2018-03-01 10:03:46 +01:00
parent 2a0440bac8
commit 28c8eef876
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/warp/picalculator/Utils.java
View File

@ -69,7 +69,7 @@ public class Utils {
public static final int OUTPUTLEVEL_NODEBUG = 0; public static final int OUTPUTLEVEL_NODEBUG = 0;
public static final int OUTPUTLEVEL_DEBUG_MIN = 1; public static final int OUTPUTLEVEL_DEBUG_MIN = 1;
public static final int OUTPUTLEVEL_DEBUG_MAX = 4; public static final int OUTPUTLEVEL_DEBUG_VERBOSE = 4;
public static boolean debugThirdScreen; public static boolean debugThirdScreen;
public static boolean headlessOverride = false; public static boolean headlessOverride = false;
private static String OS = System.getProperty("os.name").toLowerCase(); private static String OS = System.getProperty("os.name").toLowerCase();

12
src/main/java/org/warp/picalculator/math/parser/MathParser.java
View File

@ -90,11 +90,11 @@ public class MathParser {
Function lastElement; Function lastElement;
if (StaticVars.debugOn) { if (StaticVars.debugOn) {
Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_MAX, "\tStatus: "); Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, "\tStatus: ");
for (Function f : functionsList) { for (Function f : functionsList) {
Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_MAX, f.toString()); Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, f.toString());
} }
Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_MAX); Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE);
} }
for (MathParserStep step : steps) { for (MathParserStep step : steps) {
@ -121,11 +121,11 @@ public class MathParser {
} while (lastLoopDidSomething); } while (lastLoopDidSomething);
if (StaticVars.debugOn) { if (StaticVars.debugOn) {
Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_MAX, "\tStatus: "); Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, "\tStatus: ");
for (Function f : functionsList) { for (Function f : functionsList) {
Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_MAX, f.toString()); Utils.out.print(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, f.toString());
} }
Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_MAX); Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE);
} }
} }

4
src/main/java/org/warp/picalculator/math/solver/MathSolver.java
View File

@ -43,6 +43,10 @@ public class MathSolver {
} }
stepBefore = stepState; stepBefore = stepState;
ObjectArrayList<Function> stepResult = solveStep(lastFnc); ObjectArrayList<Function> stepResult = solveStep(lastFnc);
Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, "Step state: "+stepStates[stepState]+", Consecutive null steps: " + consecutiveNullSteps + ", currentStepStateN: " + currentStepStateN + ", result: ");
for (Function result : stepResult) {
Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, result.toString());
}
if (stepResult == null) { if (stepResult == null) {
currFnc = lastFnc; currFnc = lastFnc;
} else { } else {