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

Moved OutputLayout

Browse Source
This commit is contained in:
Andrea Cavalli 2018-03-11 17:47:42 +01:00
parent 28c8eef876
commit c914fac1f5
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -6,7 +6,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -20,6 +20,7 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

1
src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java
View File

@ -7,6 +7,7 @@ import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.expression.CaretState;
import org.warp.picalculator.gui.expression.blocks.Block;
import org.warp.picalculator.gui.expression.blocks.BlockContainer;
import org.warp.picalculator.gui.expression.layouts.OutputLayout;
import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer;

3
src/main/java/org/warp/picalculator/gui/expression/containers/OutputLayout.java
View File

@ -1,3 +0,0 @@
package org.warp.picalculator.gui.expression.containers;
public interface OutputLayout {}

3
src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java Executable file
View File

@ -0,0 +1,3 @@
package org.warp.picalculator.gui.expression.layouts;
public interface OutputLayout {}

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

@ -44,12 +44,12 @@ public class MathSolver {
stepBefore = stepState;
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) {
currFnc = lastFnc;
} else {
for (Function result : stepResult) {
Utils.out.println(Utils.OUTPUTLEVEL_DEBUG_VERBOSE, result.toString());
}
currFnc = stepResult;
steps.add(currFnc);
}