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

Big update

Browse Source 
(And translated the code to english)
This commit is contained in:
XDrake99 2016-09-12 16:30:51 +02:00
parent f1b74b9842
commit 46138875bb
67 changed files with 1770 additions and 1601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.settings/org.eclipse.core.resources.prefs
View File

@ -3,10 +3,10 @@ encoding//src/org/nevec/rjm/BigSurd.java=UTF-8
encoding//src/org/nevec/rjm/BigSurdVec.java=UTF-8
encoding//src/org/warp/engine=UTF-8
encoding//src/org/warp/engine/Display.java=UTF-8
encoding//src/org/warp/picalculator/Espressione.java=UTF-8
encoding//src/org/warp/picalculator/Expression.java=UTF-8
encoding//src/org/warp/picalculator/Main.java=UTF-8
encoding//src/org/warp/picalculator/Radice.java=UTF-8
encoding//src/org/warp/picalculator/RadiceQuadrata.java=UTF-8
encoding//src/org/warp/picalculator/Simboli.java=UTF-8
encoding//src/org/warp/picalculator/MathematicalSymbols.java=UTF-8
encoding//src/org/warp/picalculator/Root.java=UTF-8
encoding//src/org/warp/picalculator/RootSquare.java=UTF-8
encoding//src/org/warp/picalculator/screens/EquationScreen.java=UTF-8
encoding/<project>=UTF-8

BIN
res/marioground.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/marioground.xcf Normal file
View File

Binary file not shown.

BIN
res/marioskin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
res/marioskin.xcf
View File

Binary file not shown.

BIN
res/temp.rft Normal file
View File

Binary file not shown.

8
src/org/nevec/rjm/Bernoulli.java
View File

@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.BigInteger;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* Bernoulli numbers.
@ -50,9 +50,9 @@ public class Bernoulli {
* @param n
* the index, non-negative.
* @return the B_0=1 for n=0, B_1=-1/2 for n=1, B_2=1/6 for n=2 etc
* @throws Errore
* @throws Error
*/
public Rational at(int n) throws Errore {
public Rational at(int n) throws Error {
if (n == 1)
return (new Rational(-1, 2));
else if (n % 2 != 0)
@ -74,7 +74,7 @@ public class Bernoulli {
*
* @return The Bernoulli number at n.
*/
private Rational doubleSum(int n) throws Errore {
private Rational doubleSum(int n) throws Error {
Rational resul = Rational.ZERO;
for (int k = 0; k <= n; k++) {
Rational jsum = Rational.ZERO;

82
src/org/nevec/rjm/BigDecimalMath.java
View File

@ -5,7 +5,7 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.security.ProviderException;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* BigDecimal special functions.
@ -55,10 +55,10 @@ public class BigDecimalMath {
* @param mc
* The required precision of the result.
* @return 3.14159...
* @throws Errore
* @throws Error
* @since 2009-05-29
*/
static public BigDecimal pi(final MathContext mc) throws Errore {
static public BigDecimal pi(final MathContext mc) throws Error {
/* look it up if possible */
if (mc.getPrecision() < PI.precision())
return PI.round(mc);
@ -79,10 +79,10 @@ public class BigDecimalMath {
* @param mc
* The required precision of the result.
* @return 0.577...
* @throws Errore
* @throws Error
* @since 2009-08-13
*/
static public BigDecimal gamma(MathContext mc) throws Errore {
static public BigDecimal gamma(MathContext mc) throws Error {
/* look it up if possible */
if (mc.getPrecision() < GAMMA.precision())
return GAMMA.round(mc);
@ -574,9 +574,9 @@ public class BigDecimalMath {
* @return ln(n).
* @since 2009-08-08
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static public BigDecimal log(int n, final MathContext mc) throws Errore {
static public BigDecimal log(int n, final MathContext mc) throws Error {
/*
* the value is undefined if x is negative.
*/
@ -1017,10 +1017,10 @@ public class BigDecimalMath {
* @param x
* The argument in radians.
* @return sin(x) in the range -1 to 1.
* @throws Errore
* @throws Error
* @since 2009-06-01
*/
static public BigDecimal sin(final BigDecimal x) throws Errore {
static public BigDecimal sin(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) < 0)
return sin(x.negate()).negate();
else if (x.compareTo(BigDecimal.ZERO) == 0)
@ -1111,10 +1111,10 @@ public class BigDecimalMath {
* @param x
* The argument in radians.
* @return cos(x) in the range -1 to 1.
* @throws Errore
* @throws Error
* @since 2009-06-01
*/
static public BigDecimal cos(final BigDecimal x) throws Errore {
static public BigDecimal cos(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) < 0)
return cos(x.negate());
else if (x.compareTo(BigDecimal.ZERO) == 0)
@ -1207,9 +1207,9 @@ public class BigDecimalMath {
* @param x
* the argument in radians.
* @return the tan(x)
* @throws Errore
* @throws Error
*/
static public BigDecimal tan(final BigDecimal x) throws Errore {
static public BigDecimal tan(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) == 0)
return BigDecimal.ZERO;
else if (x.compareTo(BigDecimal.ZERO) < 0) {
@ -1271,10 +1271,10 @@ public class BigDecimalMath {
* @param x
* the argument in radians.
* @return the cot(x)
* @throws Errore
* @throws Error
* @since 2009-07-31
*/
static public BigDecimal cot(final BigDecimal x) throws Errore {
static public BigDecimal cot(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) == 0) {
throw new ArithmeticException("Cannot take cot of zero " + x.toString());
} else if (x.compareTo(BigDecimal.ZERO) < 0) {
@ -1334,9 +1334,9 @@ public class BigDecimalMath {
* @param x
* the argument.
* @return the arcsin(x) in radians.
* @throws Errore
* @throws Error
*/
static public BigDecimal asin(final BigDecimal x) throws Errore {
static public BigDecimal asin(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ONE) > 0 || x.compareTo(BigDecimal.ONE.negate()) < 0) {
throw new ArithmeticException("Out of range argument " + x.toString() + " of asin");
} else if (x.compareTo(BigDecimal.ZERO) == 0)
@ -1436,10 +1436,10 @@ public class BigDecimalMath {
* @param x
* the argument.
* @return the arccos(x) in radians.
* @throws Errore
* @throws Error
* @since 2009-09-29
*/
static public BigDecimal acos(final BigDecimal x) throws Errore {
static public BigDecimal acos(final BigDecimal x) throws Error {
/*
* Essentially forwarded to pi/2 - asin(x)
*/
@ -1470,10 +1470,10 @@ public class BigDecimalMath {
* the argument.
* @return the principal value of arctan(x) in radians in the range -pi/2 to
* +pi/2.
* @throws Errore
* @throws Error
* @since 2009-08-03
*/
static public BigDecimal atan(final BigDecimal x) throws Errore {
static public BigDecimal atan(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) < 0) {
return atan(x.negate()).negate();
} else if (x.compareTo(BigDecimal.ZERO) == 0)
@ -1568,10 +1568,10 @@ public class BigDecimalMath {
* The argument.
* @return The cosh(x) = (exp(x)+exp(-x))/2 .
* @author Richard J. Mathar
* @throws Errore
* @throws Error
* @since 2009-08-19
*/
static public BigDecimal cosh(final BigDecimal x) throws Errore {
static public BigDecimal cosh(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) < 0)
return cos(x.negate());
else if (x.compareTo(BigDecimal.ZERO) == 0)
@ -1643,10 +1643,10 @@ public class BigDecimalMath {
* the argument.
* @return the sinh(x) = (exp(x)-exp(-x))/2 .
* @author Richard J. Mathar
* @throws Errore
* @throws Error
* @since 2009-08-19
*/
static public BigDecimal sinh(final BigDecimal x) throws Errore {
static public BigDecimal sinh(final BigDecimal x) throws Error {
if (x.compareTo(BigDecimal.ZERO) < 0)
return sinh(x.negate()).negate();
else if (x.compareTo(BigDecimal.ZERO) == 0)
@ -1817,10 +1817,10 @@ public class BigDecimalMath {
* @param x
* The argument.
* @return Gamma(x).
* @throws Errore
* @throws Error
* @since 2009-08-06
*/
static public BigDecimal Gamma(final BigDecimal x) throws Errore {
static public BigDecimal Gamma(final BigDecimal x) throws Error {
/*
* reduce to interval near 1.0 with the functional relation,
* Abramowitz-Stegun 6.1.33
@ -1924,10 +1924,10 @@ public class BigDecimalMath {
* @param mc
* The required accuracy in the result.
* @return Gamma(x).
* @throws Errore
* @throws Error
* @since 2010-05-26
*/
static public BigDecimal Gamma(final Rational q, final MathContext mc) throws Errore {
static public BigDecimal Gamma(final Rational q, final MathContext mc) throws Error {
if (q.isBigInteger()) {
if (q.compareTo(Rational.ZERO) <= 0)
throw new ArithmeticException("Gamma at " + q.toString());
@ -2025,10 +2025,10 @@ public class BigDecimalMath {
* @param x
* the original value
* @return the value modulo 2*pi in the interval from 0 to 2*pi.
* @throws Errore
* @throws Error
* @since 2009-06-01
*/
static public BigDecimal mod2pi(BigDecimal x) throws Errore {
static public BigDecimal mod2pi(BigDecimal x) throws Error {
/*
* write x= 2*pi*k+r with the precision in r defined by the precision of
* x and not
@ -2074,10 +2074,10 @@ public class BigDecimalMath {
* @param x
* The original value
* @return The value modulo pi, shifted to the interval from -Pi/2 to Pi/2.
* @throws Errore
* @throws Error
* @since 2009-07-31
*/
static public BigDecimal modpi(BigDecimal x) throws Errore {
static public BigDecimal modpi(BigDecimal x) throws Error {
/*
* write x= pi*k+r with the precision in r defined by the precision of x
* and not
@ -2128,10 +2128,10 @@ public class BigDecimalMath {
* @param mc
* Specification of the accuracy of the result.
* @return zeta(n).
* @throws Errore
* @throws Error
* @since 2009-08-05
*/
static public BigDecimal zeta(final int n, final MathContext mc) throws Errore {
static public BigDecimal zeta(final int n, final MathContext mc) throws Error {
if (n <= 0)
throw new ProviderException("Not implemented: zeta at negative argument " + n);
if (n == 1)
@ -2311,10 +2311,10 @@ public class BigDecimalMath {
* @param n
* The positive integer argument.
* @return zeta(n)-1.
* @throws Errore
* @throws Error
* @since 2009-08-20
*/
static public double zeta1(final int n) throws Errore {
static public double zeta1(final int n) throws Error {
/*
* precomputed static table in double precision
*/
@ -2358,10 +2358,10 @@ public class BigDecimalMath {
* @return psi(x).
* The error is sometimes up to 10 ulp, where AS 6.3.15 suffers from
* cancellation of digits and psi=0
* @throws Errore
* @throws Error
* @since 2009-08-26
*/
static public double psi(final double x) throws Errore {
static public double psi(final double x) throws Error {
/*
* the single positive zero of psi(x)
*/
@ -2411,11 +2411,11 @@ public class BigDecimalMath {
* @param mc
* Specification of the accuracy of the result
* @return S_(n,p)(a)
* @throws Errore
* @throws Error
* @since 2009-08-09
* @see <a href="http://arxiv.org/abs/math/9803067">arXiv:math/9803067</a>
*/
static protected BigDecimal broadhurstBBP(final int n, final int p, final int a[], MathContext mc) throws Errore {
static protected BigDecimal broadhurstBBP(final int n, final int p, final int a[], MathContext mc) throws Error {
/*
* Explore the actual magnitude of the result first with a quick
* estimate.

10
src/org/nevec/rjm/BigIntegerMath.java
View File

@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.BigInteger;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* BigInteger special functions and Number theory.
@ -416,9 +416,9 @@ public class BigIntegerMath {
* @return The vector of x in A*x=rhs.
* @since 2010-08-28
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static public Rational[] solve(final BigInteger[][] A, final BigInteger[] rhs) throws ArithmeticException, Errore {
static public Rational[] solve(final BigInteger[][] A, final BigInteger[] rhs) throws ArithmeticException, Error {
final int rL = A.length;
if (rL == 0)
@ -547,11 +547,11 @@ public class BigIntegerMath {
* @return t(n,k)
* @since 2009-08-06
* @author Richard J. Mathar
* @throws Errore
* @throws Error
* @see <a href="http://dx.doi.org/10.1080/01630568908816313">P. L. Butzer
* et al, Num. Funct. Anal. Opt. 10 (5)( 1989) 419-488</a>
*/
static public Rational centrlFactNumt(int n, int k) throws Errore {
static public Rational centrlFactNumt(int n, int k) throws Error {
if (k > n || k < 0 || (k % 2) != (n % 2))
return Rational.ZERO;
else if (k == n)

10
src/org/nevec/rjm/BigIntegerPoly.java
View File

@ -5,7 +5,7 @@ import java.math.BigInteger;
import java.util.Scanner;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* Polynomial with integer coefficients.
@ -574,10 +574,10 @@ public class BigIntegerPoly implements Cloneable {
* Only factors with non-zero absolute coefficient are generated.
* This means the factors are of the form x^2+a*x+b=0 with nonzero
* b.
* @throws Errore
* @throws Error
* @since 2012-03-01
*/
protected Vector<BigIntegerPoly> i2roots() throws Errore {
protected Vector<BigIntegerPoly> i2roots() throws Error {
/*
* The vector of the factors to be returned
*/
@ -672,10 +672,10 @@ public class BigIntegerPoly implements Cloneable {
*
* @return The vector of factors. Factors with higher multiplicity are
* represented by repetition.
* @throws Errore
* @throws Error
* @since 2012-03-01
*/
public Vector<BigIntegerPoly> ifactor() throws Errore {
public Vector<BigIntegerPoly> ifactor() throws Error {
/*
* this ought be entirely rewritten in terms of the LLL algorithm
*/

24
src/org/nevec/rjm/BigSurd.java
View File

@ -5,7 +5,7 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.security.ProviderException;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
import org.warp.picalculator.Utils;
/**
@ -70,7 +70,7 @@ public class BigSurd implements Cloneable, Comparable<BigSurd> {
try {
normalize();
normalizeG();
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
}
}
@ -212,10 +212,10 @@ public class BigSurd implements Cloneable, Comparable<BigSurd> {
* @param val
* A second number of this type.
* @return The value of this/val
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public BigSurd divide(final BigSurd val) throws Errore {
public BigSurd divide(final BigSurd val) throws Error {
if (val.signum() == 0)
throw new ArithmeticException("Dividing " + toFancyString() + " through zero.");
return new BigSurd(pref.divide(val.pref), disc.divide(val.disc));
@ -258,10 +258,10 @@ public class BigSurd implements Cloneable, Comparable<BigSurd> {
* @param val
* a second number.
* @return the value of this/val
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public BigSurd divide(final BigInteger val) throws Errore {
public BigSurd divide(final BigInteger val) throws Error {
if (val.signum() == 0)
throw new ArithmeticException("Dividing " + toFancyString() + " through zero.");
return new BigSurd(pref.divide(val), disc);
@ -273,10 +273,10 @@ public class BigSurd implements Cloneable, Comparable<BigSurd> {
* @param val
* A second number.
* @return The value of this/val
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public BigSurd divide(int val) throws Errore {
public BigSurd divide(int val) throws Error {
if (val == 0)
throw new ArithmeticException("Dividing " + toFancyString() + " through zero.");
return new BigSurd(pref.divide(val), disc);
@ -452,10 +452,10 @@ public class BigSurd implements Cloneable, Comparable<BigSurd> {
/**
* Normalize to squarefree discriminant.
*
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
protected void normalize() throws Errore {
protected void normalize() throws Error {
/*
* Move squares out of the numerator and denominator of the discriminant
*/
@ -492,10 +492,10 @@ public class BigSurd implements Cloneable, Comparable<BigSurd> {
* Normalize to coprime numerator and denominator in prefactor and
* discriminant
*
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
protected void normalizeG() throws Errore {
protected void normalizeG() throws Error {
/*
* Is there a common factor between the numerator of the prefactor
* and the denominator of the discriminant ?

44
src/org/nevec/rjm/BigSurdVec.java
View File

@ -5,7 +5,7 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
import org.warp.picalculator.Utils;
/**
@ -69,7 +69,7 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
terms.add(b);
try {
normalize();
} catch (Errore e) {
} catch (Error e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
@ -79,11 +79,11 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* Combine terms that can be written as a single surd. This unites for
* example the terms sqrt(90) and sqrt(10) to 4*sqrt(10).
*
* @throws Errore
* @throws Error
*
* @since 2012-02-15
*/
protected void normalize() throws Errore {
protected void normalize() throws Error {
/*
* nothing to be done if at most one term
*/
@ -148,7 +148,7 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
try {
diff = this.subtract(oth);
return diff.signum();
} catch (Errore e) {
} catch (Error e) {
// TODO Auto-generated catch block
e.printStackTrace();
return 0;
@ -160,10 +160,10 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* equal to or larger than zero.
*
* @return 0 or +-1.
* @throws Errore
* @throws Error
* @since 2012-02-15
*/
public int signum() throws Errore {
public int signum() throws Error {
/*
* the case of zero is unique, because no (reduced) vector of surds
* other than the one element 0 itself can add/subtract to zero.
@ -308,9 +308,9 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* @param val
* The value to be added to this.
* @return The new value representing this+val.
* @throws Errore
* @throws Error
*/
public BigSurdVec add(final BigSurdVec val) throws Errore {
public BigSurdVec add(final BigSurdVec val) throws Error {
BigSurdVec sum = new BigSurdVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -335,9 +335,9 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* @param val
* The value to be added to this.
* @return The new value representing this+val.
* @throws Errore
* @throws Error
*/
public BigSurdVec add(final BigSurd val) throws Errore {
public BigSurdVec add(final BigSurd val) throws Error {
BigSurdVec sum = new BigSurdVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -354,9 +354,9 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* @param val
* The value to be subtracted from this.
* @return The new value representing this-val.
* @throws Errore
* @throws Error
*/
public BigSurdVec subtract(final BigSurdVec val) throws Errore {
public BigSurdVec subtract(final BigSurdVec val) throws Error {
BigSurdVec sum = new BigSurdVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -374,9 +374,9 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* @param val
* The value to be subtracted from this.
* @return The new value representing this-val.
* @throws Errore
* @throws Error
*/
public BigSurdVec subtract(final BigSurd val) throws Errore {
public BigSurdVec subtract(final BigSurd val) throws Error {
BigSurdVec sum = new BigSurdVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -411,10 +411,10 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* Compute the square.
*
* @return this value squared.
* @throws Errore
* @throws Error
* @since 2012-02-15
*/
public BigSurdVec sqr() throws Errore {
public BigSurdVec sqr() throws Error {
/*
* Binomial expansion. First the sum of the terms squared, then 2 times
* the mixed products.
@ -435,10 +435,10 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
* @param val
* a second number of this type.
* @return the product of this with the val.
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public BigSurdVec multiply(final BigSurd val) throws Errore {
public BigSurdVec multiply(final BigSurd val) throws Error {
BigSurdVec resul = new BigSurdVec();
for (BigSurd s : terms)
resul.terms.add(s.multiply(val));
@ -446,7 +446,7 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
return resul;
} /* multiply */
public BigSurdVec multiply(final BigSurdVec val) throws Errore {
public BigSurdVec multiply(final BigSurdVec val) throws Error {
BigSurdVec resul = new BigSurdVec();
for (BigSurd s : terms) {
resul.terms.add(s);
@ -457,7 +457,7 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
return resul;
} /* multiply */
public BigSurdVec divide(final BigSurd val) throws Errore {
public BigSurdVec divide(final BigSurd val) throws Error {
BigSurdVec resul = new BigSurdVec();
for (BigSurd s : terms)
resul.terms.add(s.divide(val));
@ -465,7 +465,7 @@ public class BigSurdVec implements Comparable<BigSurdVec> {
return resul;
} /* multiply */
public BigSurdVec divide(final BigSurdVec val) throws Errore {
public BigSurdVec divide(final BigSurdVec val) throws Error {
BigSurdVec resul = new BigSurdVec();
resul.terms = terms;
for (BigSurd s : val.terms) {

6
src/org/nevec/rjm/Ifactor.java
View File

@ -4,7 +4,7 @@ import java.math.BigInteger;
import java.util.Collections;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* Factored integers.
@ -465,10 +465,10 @@ public class Ifactor implements Cloneable, Comparable<Ifactor> {
* The return value falls into the Ifactor class if r is positive,
* but if r is negative
* a Rational type is needed.
* @throws Errore
* @throws Error
* @since 2009-05-18
*/
public Rational root(final int r) throws ArithmeticException, Errore {
public Rational root(final int r) throws ArithmeticException, Error {
if (r == 0)
throw new ArithmeticException("Cannot pull zeroth root of " + toString());
else if (r < 0) {

192
src/org/nevec/rjm/NumeroAvanzato.java
View File

@ -5,8 +5,8 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.security.ProviderException;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Incognite;
import org.warp.picalculator.Error;
import org.warp.picalculator.Variables;
/**
* Square roots on the real line. These represent numbers which are a product of
@ -32,11 +32,11 @@ public class NumeroAvanzato implements Cloneable {
*/
Rational pref;
private Incognite incognitex;
private Variables variablex;
private Incognite incognitey;
private Variables variabley;
private Incognite incognitez;
private Variables variablez;
/**
* The number underneath the square root, always non-negative. The
@ -52,9 +52,9 @@ public class NumeroAvanzato implements Cloneable {
public NumeroAvanzato() {
pref = Rational.ZERO;
disc = Rational.ZERO;
incognitex = new Incognite();
incognitey = new Incognite();
incognitez = new Incognite();
variablex = new Variables();
variabley = new Variables();
variablez = new Variables();
}
/**
@ -65,7 +65,7 @@ public class NumeroAvanzato implements Cloneable {
* the prefactor.
* @param b
* the discriminant.
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public NumeroAvanzato(Rational a, Rational b) {
@ -76,18 +76,18 @@ public class NumeroAvanzato implements Cloneable {
if (b.signum() < 0)
throw new ProviderException("Not implemented: imaginary surds");
this.disc = b;
incognitex = new Incognite();
incognitey = new Incognite();
incognitez = new Incognite();
variablex = new Variables();
variabley = new Variables();
variablez = new Variables();
try {
normalize();
normalizeG();
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
}
}
public NumeroAvanzato(Rational a, Rational b, Incognite x, Incognite y, Incognite z) {
public NumeroAvanzato(Rational a, Rational b, Variables x, Variables y, Variables z) {
this.pref = a;
/*
* reject attempts to use a negative b
@ -95,13 +95,13 @@ public class NumeroAvanzato implements Cloneable {
if (b.signum() < 0)
throw new ProviderException("Not implemented: imaginary surds");
this.disc = b;
incognitex = x;
incognitey = y;
incognitez = z;
variablex = x;
variabley = y;
variablez = z;
try {
normalize();
normalizeG();
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
}
}
@ -145,9 +145,9 @@ public class NumeroAvanzato implements Cloneable {
public NumeroAvanzato clone() {
Rational fclon = pref.clone();
Rational dclon = disc.clone();
Incognite incognitexb = incognitex;
Incognite incogniteyb = incognitey;
Incognite incognitezb = incognitez;
Variables incognitexb = variablex;
Variables incogniteyb = variabley;
Variables incognitezb = variablez;
/*
* the main intent here is to bypass any attempt to reduce the
* discriminant by figuring out the square-free part in normalize(),
@ -156,9 +156,9 @@ public class NumeroAvanzato implements Cloneable {
NumeroAvanzato cl = new NumeroAvanzato();
cl.pref = fclon;
cl.disc = dclon;
cl.incognitex = incognitexb;
cl.incognitey = incogniteyb;
cl.incognitez = incognitezb;
cl.variablex = incognitexb;
cl.variabley = incogniteyb;
cl.variablez = incognitezb;
return cl;
} /* NumeroAvanzato.clone */
@ -189,7 +189,7 @@ public class NumeroAvanzato implements Cloneable {
* @since 2011-02-12
*/
public NumeroAvanzato multiply(final NumeroAvanzato val) {
return new NumeroAvanzato(pref.multiply(val.pref), disc.multiply(val.disc), incognitex.multiply(val.incognitex), incognitey.multiply(val.incognitey), incognitez.multiply(val.incognitez));
return new NumeroAvanzato(pref.multiply(val.pref), disc.multiply(val.disc), variablex.multiply(val.variablex), variabley.multiply(val.variabley), variablez.multiply(val.variablez));
} /* NumeroAvanzato.multiply */
/**
@ -201,7 +201,7 @@ public class NumeroAvanzato implements Cloneable {
* @since 2011-02-15
*/
public NumeroAvanzato multiply(final Rational val) {
return new NumeroAvanzato(pref.multiply(val), disc, incognitex, incognitey, incognitez);
return new NumeroAvanzato(pref.multiply(val), disc, variablex, variabley, variablez);
} /* NumeroAvanzato.multiply */
/**
@ -213,7 +213,7 @@ public class NumeroAvanzato implements Cloneable {
* @since 2011-02-12
*/
public NumeroAvanzato multiply(final BigInteger val) {
return new NumeroAvanzato(pref.multiply(val), disc, incognitex, incognitey, incognitez);
return new NumeroAvanzato(pref.multiply(val), disc, variablex, variabley, variablez);
} /* NumeroAvanzato.multiply */
/**
@ -233,10 +233,10 @@ public class NumeroAvanzato implements Cloneable {
* Compute the square.
*
* @return this value squared.
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public NumeroAvanzato pow2() throws Errore {
public NumeroAvanzato pow2() throws Error {
NumeroAvanzato res = new NumeroAvanzato();
BigInteger a = pref.a;
BigInteger b = pref.b;
@ -245,9 +245,9 @@ public class NumeroAvanzato implements Cloneable {
res.pref = new Rational(a.pow(2).multiply(c).multiply(d), b.pow(2).multiply(d));
res.disc = new Rational(0, 1);
res.normalize();
res.incognitex = incognitex;
res.incognitey = incognitey.multiply(incognitey);
res.incognitez = incognitez.multiply(incognitez);
res.variablex = variablex;
res.variabley = variabley.multiply(variabley);
res.variablez = variablez.multiply(variablez);
return res;
} /* NumeroAvanzato.sqr */
@ -257,21 +257,21 @@ public class NumeroAvanzato implements Cloneable {
* @param val
* A second number of this type.
* @return The value of this/val
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public NumeroAvanzato divide(final NumeroAvanzato val) throws Errore {
public NumeroAvanzato divide(final NumeroAvanzato val) throws Error {
if (val.signum() == 0)
throw new ArithmeticException("Dividing " + toFancyString() + " through zero.");
NumeroAvanzato result = new NumeroAvanzato(pref.divide(val.pref), disc.divide(val.disc));
result.incognitex = incognitex.divide(val.incognitex);
result.incognitey = incognitey.divide(val.incognitey);
result.incognitez = incognitez.divide(val.incognitez);
result.variablex = variablex.divide(val.variablex);
result.variabley = variabley.divide(val.variabley);
result.variablez = variablez.divide(val.variablez);
result.normalize();
return result;
} /* NumeroAvanzato.divide */
private String toFancyString() throws Errore {
private String toFancyString() throws Error {
return new NumeroAvanzatoVec(this).toFancyString();
}
@ -281,10 +281,10 @@ public class NumeroAvanzato implements Cloneable {
* @param val
* a second number.
* @return the value of this/val
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public NumeroAvanzato divide(final BigInteger val) throws Errore {
public NumeroAvanzato divide(final BigInteger val) throws Error {
if (val.signum() == 0)
throw new ArithmeticException("Dividing " + toFancyString() + " through zero.");
return new NumeroAvanzato(pref.divide(val), disc);
@ -296,10 +296,10 @@ public class NumeroAvanzato implements Cloneable {
* @param val
* A second number.
* @return The value of this/val
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public NumeroAvanzato divide(int val) throws Errore {
public NumeroAvanzato divide(int val) throws Error {
if (val == 0)
throw new ArithmeticException("Dividing " + toFancyString() + " through zero.");
return new NumeroAvanzato(pref.divide(val), disc);
@ -338,10 +338,10 @@ public class NumeroAvanzato implements Cloneable {
* the other constant to compare with
* @return -1, 0 or 1 if this number is numerically less than, equal to, or
* greater than val.
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public int signumComparedTo(final NumeroAvanzato val) throws Errore {
public int signumComparedTo(final NumeroAvanzato val) throws Error {
/*
* Since we keep the discriminant positive, the rough estimate comes
* from comparing the signs of the prefactors.
@ -390,7 +390,7 @@ public class NumeroAvanzato implements Cloneable {
public String toString() {
try {
return toFancyString();
} catch (Errore e) {
} catch (Error e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
@ -442,13 +442,13 @@ public class NumeroAvanzato implements Cloneable {
*/
public boolean isBigInteger(boolean hasBigIntegerVariables) {
if (pref.isBigInteger() && (disc.signum() == 0 || disc.compareTo(Rational.ONE) == 0)) {
if (disc.signum() != 0 && incognitex.count() > 0) {
if (disc.signum() != 0 && variablex.count() > 0) {
return false;
}
if (hasBigIntegerVariables == false && incognitey.count() > 0) {
if (hasBigIntegerVariables == false && variabley.count() > 0) {
return false;
}
if (pref.b.compareTo(BigInteger.ZERO) != 0 && disc.b.compareTo(BigInteger.ZERO) != 0 && incognitez.count() > 0) {
if (pref.b.compareTo(BigInteger.ZERO) != 0 && disc.b.compareTo(BigInteger.ZERO) != 0 && variablez.count() > 0) {
return false;
}
return true;
@ -458,10 +458,10 @@ public class NumeroAvanzato implements Cloneable {
public boolean isRational(boolean hasRationalVariables) {
if (disc.signum() == 0 || disc.compareTo(new Rational(1, 1)) == 0) {
if (incognitex.count() > 0) {
if (variablex.count() > 0) {
return false;
} else if (hasRationalVariables == false) {
if (incognitey.count() > 0 || incognitez.count() > 0) {
if (variabley.count() > 0 || variablez.count() > 0) {
return false;
}
}
@ -477,10 +477,10 @@ public class NumeroAvanzato implements Cloneable {
public boolean isTooPreciseRational(boolean hasRationalVariables) {
if (disc.signum() == 0 || disc.compareTo(new Rational(1, 1)) == 0) {
if (incognitex.count() > 0) {
if (variablex.count() > 0) {
return false;
} else if (hasRationalVariables == false) {
if (incognitey.count() > 0 || incognitez.count() > 0) {
if (variabley.count() > 0 || variablez.count() > 0) {
return false;
}
}
@ -496,18 +496,18 @@ public class NumeroAvanzato implements Cloneable {
/**
* Convert to a rational value if possible
*
* @throws Errore
* @throws Error
*
* @since 2012-02-15
*/
public Rational toRational(boolean hasRationalVariables) throws Errore {
public Rational toRational(boolean hasRationalVariables) throws Error {
if (isRational(hasRationalVariables) || isTooPreciseRational(hasRationalVariables))
return pref;
else
throw new ArithmeticException("Undefined conversion " + toFancyString() + " to Rational.");
} /* NumeroAvanzato.toRational */
public Rational toRational() throws Errore {
public Rational toRational() throws Error {
if (isRational(true))
return pref;
else
@ -532,11 +532,11 @@ public class NumeroAvanzato implements Cloneable {
/**
* Normalize to squarefree discriminant.
*
* @throws Errore
* @throws Error
*
* @since 2011-02-12
*/
protected void normalize() throws Errore {
protected void normalize() throws Error {
/*
* Move squares out of the numerator and denominator of the discriminant
*/
@ -572,31 +572,31 @@ public class NumeroAvanzato implements Cloneable {
disc = new Rational(numC, denC);
if (disc.b.compareTo(BigInteger.ZERO) == 0 || disc.a.compareTo(BigInteger.ZERO) == 0 || pref.a.compareTo(BigInteger.ZERO) == 0) {
incognitex = new Incognite();
incognitey = new Incognite();
variablex = new Variables();
variabley = new Variables();
}
if (disc.b.compareTo(BigInteger.ZERO) == 0 || pref.b.compareTo(BigInteger.ZERO) == 0) {
incognitez = new Incognite();
variablez = new Variables();
}
if (incognitey.compareTo(incognitez)) {
incognitey = new Incognite();
incognitez = new Incognite();
if (variabley.compareTo(variablez)) {
variabley = new Variables();
variablez = new Variables();
}
/**/
Incognite[] incognitetemp = new Incognite[] { incognitex, incognitey, incognitez };
incognitetemp = Incognite.normalizeBigSurdVariables(incognitetemp);
incognitex = incognitetemp[0];
incognitey = incognitetemp[1];
incognitez = incognitetemp[2];
Variables[] incognitetemp = new Variables[] { variablex, variabley, variablez };
incognitetemp = Variables.normalizeBigSurdVariables(incognitetemp);
variablex = incognitetemp[0];
variabley = incognitetemp[1];
variablez = incognitetemp[2];
/**/
} else {
pref = Rational.ZERO;
incognitex = new Incognite();
incognitey = new Incognite();
incognitez = new Incognite();
variablex = new Variables();
variabley = new Variables();
variablez = new Variables();
}
} /* NumeroAvanzato.normalize */
@ -604,11 +604,11 @@ public class NumeroAvanzato implements Cloneable {
* Normalize to coprime numerator and denominator in prefactor and
* discriminant
*
* @throws Errore
* @throws Error
*
* @since 2011-02-12
*/
protected void normalizeG() throws Errore {
protected void normalizeG() throws Error {
/*
* Is there a common factor between the numerator of the prefactor and
* the denominator of the discriminant ?
@ -681,65 +681,65 @@ public class NumeroAvanzato implements Cloneable {
if (pow2().pref == Rational.ZERO) {
return true;
} else {
if (incognitex == na.incognitex) {
if (incognitey == na.incognitey) {
if (incognitez == na.incognitez) {
if (variablex == na.variablex) {
if (variabley == na.variabley) {
if (variablez == na.variablez) {
return true;
}
}
}
}
}
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
}
}
return false;
}
public Incognite getIncognitex() {
if (incognitex == null) {
return incognitex;
public Variables getVariableX() {
if (variablex == null) {
return variablex;
}
return incognitex.clone();
return variablex.clone();
}
public NumeroAvanzato setIncognitex(Incognite incognitex) {
public NumeroAvanzato setVariableX(Variables x) {
NumeroAvanzato result = this.clone();
result.incognitex = incognitex;
result.variablex = x;
return result;
}
public Incognite getIncognitey() {
if (incognitey == null) {
return incognitey;
public Variables getVariableY() {
if (variabley == null) {
return variabley;
}
return incognitey.clone();
return variabley.clone();
}
public NumeroAvanzato setIncognitey(Incognite incognitey) {
public NumeroAvanzato setVariableY(Variables y) {
NumeroAvanzato result = this.clone();
result.incognitey = incognitey;
result.variabley = y;
return result;
}
public Incognite getIncognitez() {
if (incognitez == null) {
return incognitez;
public Variables getVariableZ() {
if (variablez == null) {
return variablez;
}
return incognitez.clone();
return variablez.clone();
}
public NumeroAvanzato setIncognitez(Incognite incognitez) {
public NumeroAvanzato setVariableZ(Variables z) {
NumeroAvanzato result = this.clone();
result.incognitez = incognitez;
result.variablez = z;
return result;
}
public NumeroAvanzato divideUnsafe(BigInteger denominator) {
try {
return divide(denominator);
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
return new NumeroAvanzato();
}

100
src/org/nevec/rjm/NumeroAvanzatoVec.java
View File

@ -6,8 +6,8 @@ import java.math.MathContext;
import java.util.Comparator;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Incognite;
import org.warp.picalculator.Error;
import org.warp.picalculator.Variables;
import org.warp.picalculator.Utils;
/**
@ -75,7 +75,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
terms.add(b);
try {
normalize();
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
}
} /* ctor */
@ -84,11 +84,11 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* Combine terms that can be written as a single surd. This unites for
* example the terms sqrt(90) and sqrt(10) to 4*sqrt(10).
*
* @throws Errore
* @throws Error
*
* @since 2012-02-15
*/
protected void normalize() throws Errore {
protected void normalize() throws Error {
/*
* nothing to be done if at most one term
*/
@ -111,7 +111,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* if this reduction works.
*/
NumeroAvanzato r = todo.divide(v);
if ((r.isRational(true) || r.isTooPreciseRational(true)) && todo.getIncognitex().compareTo(v.getIncognitex()) && todo.getIncognitey().compareTo(v.getIncognitey()) && todo.getIncognitez().compareTo(v.getIncognitez())) {
if ((r.isRational(true) || r.isTooPreciseRational(true)) && todo.getVariableX().compareTo(v.getVariableX()) && todo.getVariableY().compareTo(v.getVariableY()) && todo.getVariableZ().compareTo(v.getVariableZ())) {
/* compute r+1 */
Rational newpref = r.toRational(true).add(1);
/*
@ -137,8 +137,8 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
newter.sort(new Comparator<NumeroAvanzato>() {
@Override
public int compare(NumeroAvanzato o1, NumeroAvanzato o2) {
int index1 = Incognite.priorità(o1.getIncognitex().sqrt().multiply(o1.getIncognitey()).divide(o1.getIncognitez()));
int index2 = Incognite.priorità(o2.getIncognitex().sqrt().multiply(o2.getIncognitey()).divide(o2.getIncognitez()));
int index1 = Variables.priority(o1.getVariableX().sqrt().multiply(o1.getVariableY()).divide(o1.getVariableZ()));
int index2 = Variables.priority(o2.getVariableX().sqrt().multiply(o2.getVariableY()).divide(o2.getVariableZ()));
return index2 - index1;
}
});
@ -162,7 +162,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
try {
diff = this.subtract(oth);
return diff.signum();
} catch (Errore e) {
} catch (Error e) {
e.printStackTrace();
return 0;
}
@ -173,10 +173,10 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* equal to or larger than zero.
*
* @return 0 or +-1.
* @throws Errore
* @throws Error
* @since 2012-02-15
*/
public int signum() throws Errore {
public int signum() throws Error {
/*
* the case of zero is unique, because no (reduced) vector of surds
* other than the one element 0 itself can add/subtract to zero.
@ -325,9 +325,9 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* @param val
* The value to be added to this.
* @return The new value representing this+val.
* @throws Errore
* @throws Error
*/
public NumeroAvanzatoVec add(final NumeroAvanzatoVec val) throws Errore {
public NumeroAvanzatoVec add(final NumeroAvanzatoVec val) throws Error {
NumeroAvanzatoVec sum = new NumeroAvanzatoVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -352,9 +352,9 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* @param val
* The value to be added to this.
* @return The new value representing this+val.
* @throws Errore
* @throws Error
*/
public NumeroAvanzatoVec add(final NumeroAvanzato val) throws Errore {
public NumeroAvanzatoVec add(final NumeroAvanzato val) throws Error {
NumeroAvanzatoVec sum = new NumeroAvanzatoVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -371,9 +371,9 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* @param val
* The value to be subtracted from this.
* @return The new value representing this-val.
* @throws Errore
* @throws Error
*/
public NumeroAvanzatoVec subtract(final NumeroAvanzatoVec val) throws Errore {
public NumeroAvanzatoVec subtract(final NumeroAvanzatoVec val) throws Error {
NumeroAvanzatoVec sum = new NumeroAvanzatoVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -391,9 +391,9 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* @param val
* The value to be subtracted from this.
* @return The new value representing this-val.
* @throws Errore
* @throws Error
*/
public NumeroAvanzatoVec subtract(final NumeroAvanzato val) throws Errore {
public NumeroAvanzatoVec subtract(final NumeroAvanzato val) throws Error {
NumeroAvanzatoVec sum = new NumeroAvanzatoVec();
/*
* concatenate the vectors and eliminate common overlaps
@ -428,10 +428,10 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* Compute the square.
*
* @return this value squared.
* @throws Errore
* @throws Error
* @since 2012-02-15
*/
public NumeroAvanzatoVec sqr() throws Errore {
public NumeroAvanzatoVec sqr() throws Error {
/*
* Binomial expansion. First the sum of the terms squared, then 2 times
* the mixed products.
@ -452,10 +452,10 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
* @param val
* a second number of this type.
* @return the product of this with the val.
* @throws Errore
* @throws Error
* @since 2011-02-12
*/
public NumeroAvanzatoVec multiply(final NumeroAvanzato val) throws Errore {
public NumeroAvanzatoVec multiply(final NumeroAvanzato val) throws Error {
NumeroAvanzatoVec resul = new NumeroAvanzatoVec();
for (NumeroAvanzato s : terms)
resul.terms.add(s.multiply(val));
@ -463,7 +463,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
return resul;
} /* multiply */
public NumeroAvanzatoVec multiply(final NumeroAvanzatoVec val) throws Errore {
public NumeroAvanzatoVec multiply(final NumeroAvanzatoVec val) throws Error {
NumeroAvanzatoVec resul = new NumeroAvanzatoVec();
for (NumeroAvanzato s : terms) {
for (NumeroAvanzato s2 : val.terms) {
@ -473,7 +473,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
return resul;
} /* multiply */
public NumeroAvanzatoVec divide(final NumeroAvanzato val) throws Errore {
public NumeroAvanzatoVec divide(final NumeroAvanzato val) throws Error {
NumeroAvanzatoVec resul = new NumeroAvanzatoVec();
for (NumeroAvanzato s : terms) {
resul.terms.add(s.divide(val));
@ -482,7 +482,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
return resul;
} /* divide */
public NumeroAvanzatoVec divide(final NumeroAvanzatoVec val) throws Errore {
public NumeroAvanzatoVec divide(final NumeroAvanzatoVec val) throws Error {
NumeroAvanzatoVec resul = new NumeroAvanzatoVec();
resul.terms = this.terms;
for (NumeroAvanzato s : val.terms) {
@ -523,7 +523,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
for (NumeroAvanzato s : terms) {
val = s.isBigInteger(hasBigIntegerVariables);
if (val == true) {
if (s.getIncognitex().count() > 0 || s.getIncognitez().count() > 0) {
if (s.getVariableX().count() > 0 || s.getVariableZ().count() > 0) {
val = false;
}
}
@ -625,17 +625,17 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
} else {
s += num;
}
s += bs.getIncognitey().toString();
s += bs.getVariableY().toString();
return s;
} else {
BigInteger denominator = BigInteger.ONE;
Incognite incognitedenom = new Incognite();
Variables incognitedenom = new Variables();
for (int i = 0; i < terms.size(); i++) {
denominator = BigIntegerMath.lcm(denominator, terms.elementAt(i).pref.b);
// denominator =
// denominator.multiply(terms.elementAt(i).pref.b);
Incognite iz = terms.elementAt(i).getIncognitez();
incognitedenom = Incognite.lcm(incognitedenom, iz);
Variables iz = terms.elementAt(i).getVariableZ();
incognitedenom = Variables.lcm(incognitedenom, iz);
}
String s = "";
@ -660,7 +660,7 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
}
s += num;
}
s += bs.getIncognitey().toString();
s += bs.getVariableY().toString();
}
return s;
}
@ -673,10 +673,10 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
for (int t = 0; t < terms.size(); t++) {
NumeroAvanzato bs = terms.elementAt(t).clone();
bs = bs.setIncognitey(bs.getIncognitey().divide(bs.getIncognitez()));
bs = bs.setIncognitey(bs.getIncognitey().multiply(incognitedenom));
bs = bs.setVariableY(bs.getVariableY().divide(bs.getVariableZ()));
bs = bs.setVariableY(bs.getVariableY().multiply(incognitedenom));
bs = bs.multiply(denominator);
bs = bs.setIncognitez(incognitedenom);
bs = bs.setVariableZ(incognitedenom);
bs.pref = new Rational(bs.pref.a, BigInteger.ONE);
if (bs.signum() > 0 && t > 0)
@ -685,12 +685,12 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
String numb;
try {
numb = bs.toRational(true).a.toString();
} catch (Errore e) {
} catch (Error e) {
// TODO Auto-generated catch block
e.printStackTrace();
numb = "";
}
String incognite = bs.getIncognitey().toString();
String incognite = bs.getVariableY().toString();
if (((numb.equals("1") || numb.equals("-1")) == false && incognite.length() > 0) || incognite.length() == 0) {
s += numb;
} else if (numb.equals("-1")) {
@ -700,16 +700,16 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
} else if (bs.isRational(true) || bs.isTooPreciseRational(true)) {
try {
s += bs.toRational(true).toString();
} catch (Errore e) {
} catch (Error e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
s += bs.getIncognitey().toString();
s += bs.getVariableY().toString();
} else {
BigInteger numerator = bs.pref.numer();
if ((numerator.compareTo(BigInteger.ONE) != 0 || bs.getIncognitey().count() > 0) && (bs.disc.compareTo(BigInteger.ONE) != 0 || bs.getIncognitex().count() > 0)) {
if (((bs.getIncognitey().count() > 0) || (bs.getIncognitey().count() == 0 && numerator.toString().length() > 0))) {
if ((bs.getIncognitey().count() > 0 && (numerator.toString().equals("1") || numerator.toString().equals("-1")) == false) || bs.getIncognitey().count() == 0) {
if ((numerator.compareTo(BigInteger.ONE) != 0 || bs.getVariableY().count() > 0) && (bs.disc.compareTo(BigInteger.ONE) != 0 || bs.getVariableX().count() > 0)) {
if (((bs.getVariableY().count() > 0) || (bs.getVariableY().count() == 0 && numerator.toString().length() > 0))) {
if ((bs.getVariableY().count() > 0 && (numerator.toString().equals("1") || numerator.toString().equals("-1")) == false) || bs.getVariableY().count() == 0) {
s += numerator.toString();
} else if (numerator.toString().equals("-1")) {
s += "-";
@ -717,27 +717,27 @@ public class NumeroAvanzatoVec implements Comparable<NumeroAvanzatoVec> {
}
// s += "(";
}
if (bs.disc.isInteger() && bs.getIncognitex().count() == 0) {
if (bs.disc.isInteger() && bs.getVariableX().count() == 0) {
s += "Ⓐ(";
s += bs.disc.toString();
s += ")";
} else if ((bs.disc.toString().equals("1") || bs.disc.toString().equals("-1")) && bs.getIncognitex().count() > 0) {
} else if ((bs.disc.toString().equals("1") || bs.disc.toString().equals("-1")) && bs.getVariableX().count() > 0) {
s += "Ⓐ(";
if (bs.disc.toString().equals("-1")) {
s += "-";
}
s += bs.getIncognitex().toString();
s += bs.getVariableX().toString();
s += ")";
} else {
s += "Ⓐ(" + bs.disc.toString() + bs.getIncognitex().toString() + ")";
s += "Ⓐ(" + bs.disc.toString() + bs.getVariableX().toString() + ")";
}
if ((numerator.compareTo(BigInteger.ONE) != 0 || bs.getIncognitey().count() > 0) && (bs.disc.compareTo(BigInteger.ONE) != 0 || bs.getIncognitex().count() > 0)) {
if (((bs.getIncognitey().count() > 0) || (bs.getIncognitey().count() == 0 && numerator.toString().length() > 0))) {
s += bs.getIncognitey().toString();
if ((numerator.compareTo(BigInteger.ONE) != 0 || bs.getVariableY().count() > 0) && (bs.disc.compareTo(BigInteger.ONE) != 0 || bs.getVariableX().count() > 0)) {
if (((bs.getVariableY().count() > 0) || (bs.getVariableY().count() == 0 && numerator.toString().length() > 0))) {
s += bs.getVariableY().toString();
}
// s += "(";
}
if ((numerator.compareTo(BigInteger.ONE) != 0 || bs.getIncognitey().count() > 0) && (bs.disc.compareTo(BigInteger.ONE) != 0 || bs.getIncognitex().count() > 0)) {
if ((numerator.compareTo(BigInteger.ONE) != 0 || bs.getVariableY().count() > 0) && (bs.disc.compareTo(BigInteger.ONE) != 0 || bs.getVariableX().count() > 0)) {
// s += ")";
}
}

38
src/org/nevec/rjm/RatPoly.java
View File

@ -7,7 +7,7 @@ import java.util.Random;
import java.util.Scanner;
import java.util.Vector;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* A one-parameter polynomial with rational coefficients.
@ -75,10 +75,10 @@ class RatPoly {
* the list of values in the denominator of AFB
* @param nmax
* the order of the truncated polynomial representation
* @throws Errore
* @throws Error
* @since 2008-11-13
*/
public RatPoly(final Vector<BigInteger> A, final Vector<BigInteger> B, int nmax) throws Errore {
public RatPoly(final Vector<BigInteger> A, final Vector<BigInteger> B, int nmax) throws Error {
/*
* To allow common initialization with the signature below,
* the main body is assembled in a separate function.
@ -96,10 +96,10 @@ class RatPoly {
* the order of the new polynomial.
* @param B
* the list of values in the denominator of AFB
* @throws Errore
* @throws Error
* @since 2009-08-05
*/
public RatPoly(final Vector<BigInteger> A, final Vector<BigInteger> B) throws Errore {
public RatPoly(final Vector<BigInteger> A, final Vector<BigInteger> B) throws Error {
BigInteger Nmax = BigInteger.ONE.negate();
for (int j = 0; j < A.size(); j++) {
if (A.elementAt(j).compareTo(BigInteger.ZERO) <= 0) {
@ -125,10 +125,10 @@ class RatPoly {
* the list of values in the denominator of AFB
* @param nmax
* the order of the truncated polynomial representation
* @throws Errore
* @throws Error
* @since 2008-11-13
*/
protected void init(final Vector<BigInteger> A, final Vector<BigInteger> B, int nmax) throws Errore {
protected void init(final Vector<BigInteger> A, final Vector<BigInteger> B, int nmax) throws Error {
a = new Vector<Rational>();
Factorial f = new Factorial();
for (int n = 0; n <= nmax; n++) {
@ -433,10 +433,10 @@ class RatPoly {
* @param r
* the exponent of the power
* @return This^r .
* @throws Errore
* @throws Error
* @since 2009-05-18
*/
public RatPoly pow(final Rational r) throws ArithmeticException, Errore {
public RatPoly pow(final Rational r) throws ArithmeticException, Error {
/*
* split (a0+a1*x+a2*x^2+...)^r = a0^r*(1+a1/a0*r+a2/a0*r^2+..)^r
*/
@ -520,10 +520,10 @@ class RatPoly {
* @param val
* the constant through which the coefficients will be divided.
* @return the Taylor expansion of this/val .
* @throws Errore
* @throws Error
* @since 2009-05-18
*/
public RatPoly divide(final Rational val) throws Errore {
public RatPoly divide(final Rational val) throws Error {
if (val.compareTo(Rational.ZERO) != 0) {
RatPoly resul = new RatPoly();
for (int n = 0; n < a.size(); n++)
@ -541,9 +541,9 @@ class RatPoly {
* @param nmax
* the maximum degree of the Taylor expansion of the result.
* @return the Taylor expansion of this/val up to degree nmax.
* @throws Errore
* @throws Error
*/
public RatPoly divide(final RatPoly val, int nmax) throws Errore {
public RatPoly divide(final RatPoly val, int nmax) throws Error {
RatPoly num = this;
RatPoly denom = val;
@ -583,10 +583,10 @@ class RatPoly {
* difference of thisdegree and the degree of val. [1] the remainder
* polynomial.
* This = returnvalue[0] + returnvalue[1]/val .
* @throws Errore
* @throws Error
* @since 2012-03-01
*/
public RatPoly[] divideAndRemainder(final RatPoly val) throws Errore {
public RatPoly[] divideAndRemainder(final RatPoly val) throws Error {
RatPoly[] ret = new RatPoly[2];
/*
* remove any high-order zeros
@ -738,10 +738,10 @@ class RatPoly {
* degree is unity.
*
* @return The scaled polynomial
* @throws Errore
* @throws Error
* @since 2008-10-26
*/
public RatPoly monic() throws Errore {
public RatPoly monic() throws Error {
RatPoly m = new RatPoly();
final int d = degree();
for (int i = 0; i <= d; i++) {
@ -879,10 +879,10 @@ class RatPoly {
* Kerner method</a>
* @param the
* number of floating point digits
* @throws Errore
* @throws Error
* @since 2008-10-26
*/
public Vector<BigComplex> roots(int digits) throws Errore {
public Vector<BigComplex> roots(int digits) throws Error {
RatPoly mon = monic();
Random rand = new Random();

70
src/org/nevec/rjm/Rational.java
View File

@ -5,8 +5,8 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.math.RoundingMode;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Errori;
import org.warp.picalculator.Error;
import org.warp.picalculator.Errors;
/**
* Fractions (rational numbers). They are divisions of two BigInteger numbers,
@ -232,15 +232,15 @@ public class Rational implements Cloneable, Comparable<Rational> {
* the exponent.
* @return this value raised to the power given by the exponent. If the
* exponent is 0, the value 1 is returned.
* @throws Errore
* @throws Error
* @since 2009-05-18
*/
public Rational pow(BigInteger exponent) throws Errore {
public Rational pow(BigInteger exponent) throws Error {
/* test for overflow */
if (exponent.compareTo(MAX_INT) == 1)
throw new Errore(Errori.NUMBER_TOO_LARGE);
throw new Error(Errors.NUMBER_TOO_LARGE);
if (exponent.compareTo(MIN_INT) == -1)
throw new Errore(Errori.NUMBER_TOO_SMALL);
throw new Error(Errors.NUMBER_TOO_SMALL);
/* promote to the simpler interface above */
return pow(exponent.intValue());
@ -254,20 +254,20 @@ public class Rational implements Cloneable, Comparable<Rational> {
* third root etc
* @return this value raised to the inverse power given by the root
* argument, this^(1/r).
* @throws Errore
* @throws Error
* @since 2009-05-18
*/
public Rational root(BigInteger r) throws Errore {
public Rational root(BigInteger r) throws Error {
/* test for overflow */
if (r.compareTo(MAX_INT) == 1)
throw new Errore(Errori.NUMBER_TOO_LARGE);
throw new Error(Errors.NUMBER_TOO_LARGE);
if (r.compareTo(MIN_INT) == -1)
throw new Errore(Errori.NUMBER_TOO_SMALL);
throw new Error(Errors.NUMBER_TOO_SMALL);
int rthroot = r.intValue();
/* cannot pull root of a negative value with even-valued root */
if (compareTo(ZERO) == -1 && (rthroot % 2) == 0)
throw new Errore(Errori.NEGATIVE_PARAMETER);
throw new Error(Errors.NEGATIVE_PARAMETER);
/*
* extract a sign such that we calculate |n|^(1/r), still r carrying any
@ -294,10 +294,10 @@ public class Rational implements Cloneable, Comparable<Rational> {
* The exponent.
* @return This value raised to the power given by the exponent. If the
* exponent is 0, the value 1 is returned.
* @throws Errore
* @throws Error
* @since 2009-05-18
*/
public Rational pow(Rational exponent) throws Errore {
public Rational pow(Rational exponent) throws Error {
if (exponent.a.compareTo(BigInteger.ZERO) == 0)
return new Rational(1, 1);
@ -315,11 +315,11 @@ public class Rational implements Cloneable, Comparable<Rational> {
* @param val
* A second rational number.
* @return The value of this/val
* @throws Errore
* @throws Error
*/
public Rational divide(final Rational val) throws Errore {
public Rational divide(final Rational val) throws Error {
if (val.compareTo(Rational.ZERO) == 0)
throw new Errore(Errori.DIVISION_BY_ZERO);
throw new Error(Errors.DIVISION_BY_ZERO);
BigInteger num = a.multiply(val.b);
BigInteger deno = b.multiply(val.a);
/*
@ -335,11 +335,11 @@ public class Rational implements Cloneable, Comparable<Rational> {
* @param val
* a second number.
* @return the value of this/val
* @throws Errore
* @throws Error
*/
public Rational divide(BigInteger val) throws Errore {
public Rational divide(BigInteger val) throws Error {
if (val.compareTo(BigInteger.ZERO) == 0)
throw new Errore(Errori.DIVISION_BY_ZERO);
throw new Error(Errors.DIVISION_BY_ZERO);
Rational val2 = new Rational(val, BigInteger.ONE);
return (divide(val2));
} /* Rational.divide */
@ -350,11 +350,11 @@ public class Rational implements Cloneable, Comparable<Rational> {
* @param val
* A second number.
* @return The value of this/val
* @throws Errore
* @throws Error
*/
public Rational divide(int val) throws Errore {
public Rational divide(int val) throws Error {
if (val == 0)
throw new Errore(Errori.DIVISION_BY_ZERO);
throw new Error(Errors.DIVISION_BY_ZERO);
Rational val2 = new Rational(val, 1);
return (divide(val2));
} /* Rational.divide */
@ -452,9 +452,9 @@ public class Rational implements Cloneable, Comparable<Rational> {
* @return the binomial coefficient.
* @since 2006-06-27
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
public static Rational binomial(Rational n, BigInteger m) throws Errore {
public static Rational binomial(Rational n, BigInteger m) throws Error {
if (m.compareTo(BigInteger.ZERO) == 0)
return Rational.ONE;
Rational bin = n;
@ -474,9 +474,9 @@ public class Rational implements Cloneable, Comparable<Rational> {
* @return the binomial coefficient.
* @since 2009-05-19
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
public static Rational binomial(Rational n, int m) throws Errore {
public static Rational binomial(Rational n, int m) throws Error {
if (m == 0)
return Rational.ONE;
Rational bin = n;
@ -496,13 +496,13 @@ public class Rational implements Cloneable, Comparable<Rational> {
* @return Gamma(n+k+1/2)/k!/GAMMA(n-k+1/2)
* @since 2010-07-18
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
public static Rational hankelSymb(Rational n, int k) throws Errore {
public static Rational hankelSymb(Rational n, int k) throws Error {
if (k == 0)
return Rational.ONE;
else if (k < 0)
throw new Errore(Errori.NEGATIVE_PARAMETER);
throw new Error(Errors.NEGATIVE_PARAMETER);
Rational nkhalf = n.subtract(k).add(Rational.HALF);
nkhalf = nkhalf.Pochhammer(2 * k);
Factorial f = new Factorial();
@ -792,26 +792,26 @@ public class Rational implements Cloneable, Comparable<Rational> {
/**
* Conversion to an integer value, if this can be done exactly.
*
* @throws Errore
* @throws Error
*
* @since 2011-02-13
*/
int intValue() throws Errore {
int intValue() throws Error {
if (!isInteger())
throw new Errore(Errori.CONVERSION_ERROR);
throw new Error(Errors.CONVERSION_ERROR);
return a.intValue();
}
/**
* Conversion to a BigInteger value, if this can be done exactly.
*
* @throws Errore
* @throws Error
*
* @since 2012-03-02
*/
BigInteger BigIntegerValue() throws Errore {
BigInteger BigIntegerValue() throws Error {
if (!isBigInteger())
throw new Errore(Errori.CONVERSION_ERROR);
throw new Error(Errors.CONVERSION_ERROR);
return a;
}

22
src/org/nevec/rjm/Wigner3j.java
View File

@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.BigInteger;
import java.util.Scanner;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* Exact representations of Wigner 3jm and 3nj values of half-integer arguments.
@ -32,9 +32,9 @@ public class Wigner3j {
*
* @since 2011-02-15
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static public void main(String args[]) throws Errore {
static public void main(String args[]) throws Error {
if (args[0].compareTo("6j") == 0) {
try {
String m1 = "6";
@ -105,9 +105,9 @@ public class Wigner3j {
* inequalities is violated or some parameters are out of range.
* @since 2011-02-13
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static public BigSurd wigner3jm(int j1, int j2, int j3, int m1, int m2, int m3) throws Errore {
static public BigSurd wigner3jm(int j1, int j2, int j3, int m1, int m2, int m3) throws Error {
Rational J1 = new Rational(j1, 2);
Rational J2 = new Rational(j2, 2);
Rational J3 = new Rational(j3, 2);
@ -140,9 +140,9 @@ public class Wigner3j {
* @since 2011-02-13
* @since 2012-02-15 Upgraded return value to BigSurdVec
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static public BigSurdVec wigner3j(String m1, String t1, String t2, String j) throws Errore {
static public BigSurdVec wigner3j(String m1, String t1, String t2, String j) throws Error {
/*
* The first number in the line "m" is the number of angular momenta.
* The rest of the line is ignored.
@ -270,10 +270,10 @@ public class Wigner3j {
* @since 2011-02-13
* @since 2012-02-15 Upgraded to return BigSurdVec
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static private BigSurdVec wigner3j(final int[] tvec, final Rational[] J, final Rational[] M, final int[] triadidx)
throws Errore {
throws Error {
/*
* The result of the computation. The sum over all m-combinations of the
* triads.
@ -480,10 +480,10 @@ public class Wigner3j {
* inequalities is violated or some parameters are out of range.
* @since 2011-02-13
* @author Richard J. Mathar
* @throws Errore
* @throws Error
*/
static protected BigSurd wigner3jm(Rational j1, Rational j2, Rational j3, Rational m1, Rational m2, Rational m3)
throws Errore {
throws Error {
/*
* Check that m1+m2+m3 = 0
*/

8
src/org/nevec/rjm/Wigner3jGUI.java
View File

@ -16,7 +16,7 @@ import javax.swing.JList;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
/**
* An interactive interface to the Wigner3j class. The GUI allows to preselect
@ -134,10 +134,10 @@ public class Wigner3jGUI implements ActionListener, ListSelectionListener {
} /* init */
/**
* @throws Errore
* @throws Error
* @since 2010-08-27
*/
public void compute() throws Errore {
public void compute() throws Error {
String tr = inpGtria.getText();
String[] trias = new String[4];
@ -211,7 +211,7 @@ public class Wigner3jGUI implements ActionListener, ListSelectionListener {
outG.setText("");
try {
compute();
} catch (Errore e1) {
} catch (Error e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}

11
src/org/warp/device/Keyboard.java
View File

@ -25,7 +25,8 @@ public class Keyboard {
private static final int QH_pin = 40;
private static final int CLK_INH_pin = 33;
private static boolean[][] precedentStates = new boolean[8][8];
private static volatile boolean[][] precedentStates = new boolean[8][8];
public static volatile boolean[][] debugKeysDown = new boolean[8][8];
public static void startKeyboard() {
if (Utils.debugOn == false) {
@ -75,7 +76,11 @@ public class Keyboard {
}
public static boolean isKeyDown(int row, int col) {
return precedentStates[row][col];
if (Utils.debugOn == false) {
return precedentStates[row-1][col-1];
} else {
return debugKeysDown[row-1][col-1];
}
}
private static void keyReleasedRaw(int row, int col) {
@ -84,7 +89,7 @@ public class Keyboard {
}
}
private static void keyPressedRaw(int row, int col) {
static void keyPressedRaw(int row, int col) {
if (row == 1 && col == 1) {
keyPressed(Key.SHIFT);
} else if (row == 1 && col == 2) {

15
src/org/warp/device/PIDisplay.java
View File

@ -1,15 +1,6 @@
package org.warp.device;
import static org.warp.engine.Display.Render.getMatrixOfImage;
import static org.warp.engine.Display.Render.glClear;
import static org.warp.engine.Display.Render.glColor3f;
import static org.warp.engine.Display.Render.glColor4f;
import static org.warp.engine.Display.Render.glDrawLine;
import static org.warp.engine.Display.Render.glDrawSkin;
import static org.warp.engine.Display.Render.glDrawStringCenter;
import static org.warp.engine.Display.Render.glDrawStringLeft;
import static org.warp.engine.Display.Render.glDrawStringRight;
import static org.warp.engine.Display.Render.setFont;
import static org.warp.engine.Display.Render.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
@ -203,6 +194,8 @@ public final class PIDisplay {
}
private void draw_status() {
glColor3f(204, 231, 212);
glFillRect(0, 0, Main.screenSize[0], 20);
glColor3f(0, 0, 0);
glDrawLine(0, 20, Main.screenSize[0]-1, 20);
glColor3f(0, 0, 0);
@ -317,8 +310,8 @@ public final class PIDisplay {
colore(0.0f, 0.0f, 0.0f, 0.5f);
glDrawStringCenter((Main.screenSize[0] / 2), (Main.screenSize[1]/ 2) + 22, "PLEASE WAIT...");
} else {
draw_status();
draw_screen();
draw_status();
draw_bottom();
}
}

24
src/org/warp/device/PIFrame.java
View File

@ -103,6 +103,9 @@ public class PIFrame extends JFrame {
} else {
Keyboard.keyPressed(Key.NONE);
}
int row = 2;
int col = 1;
Keyboard.debugKeysDown[row-1][col-1] = true;
break;
case KeyEvent.VK_1:
if (!Keyboard.shift && !Keyboard.alpha) {
@ -223,6 +226,10 @@ public class PIFrame extends JFrame {
}
break;
case KeyEvent.VK_LEFT:
//LEFT
row = 2;
col = 3;
Keyboard.debugKeysDown[row-1][col-1] = true;
if (!Keyboard.shift && !Keyboard.alpha) {
Keyboard.keyPressed(Key.LEFT);
} else {
@ -230,6 +237,10 @@ public class PIFrame extends JFrame {
}
break;
case KeyEvent.VK_RIGHT:
//RIGHT
row = 2;
col = 5;
Keyboard.debugKeysDown[row-1][col-1] = true;
if (!Keyboard.shift && !Keyboard.alpha) {
Keyboard.keyPressed(Key.RIGHT);
} else {
@ -315,6 +326,9 @@ public class PIFrame extends JFrame {
} else {
Keyboard.keyReleased(Key.NONE);
}
int row = 2;
int col = 1;
Keyboard.debugKeysDown[row-1][col-1] = false;
break;
case KeyEvent.VK_1:
if (!Keyboard.shift && !Keyboard.alpha) {
@ -357,6 +371,16 @@ public class PIFrame extends JFrame {
case KeyEvent.VK_A:
Keyboard.keyReleased(Key.ALPHA);
break;
case KeyEvent.VK_LEFT:
//LEFT
row = 2;
col = 3;
Keyboard.debugKeysDown[row-1][col-1] = false;
case KeyEvent.VK_RIGHT:
//RIGHT
row = 2;
col = 5;
Keyboard.debugKeysDown[row-1][col-1] = false;
}
}

46
src/org/warp/engine/Display.java
View File

@ -147,22 +147,56 @@ public class Display {
public static void glDrawSkin(int skinwidth, int[] skin, int x0, int y0, int s0, int t0, int s1, int t1, boolean transparent) {
x0+=Main.screenPos[0];
y0+=Main.screenPos[1];
int oldColor;
int newColor;
int onex = s0 <= s1?1:-1;
int oney = t0 <= t1?1:-1;
int width = 0;
int height = 0;
if (onex == -1) {
int s00 = s0;
s0 = s1;
s1 = s00;
width = s1-s0;
}
if (oney == -1) {
int t00 = t0;
t0 = t1;
t1 = t00;
height = t1-t0;
}
if (x0 >= size[0] || y0 >= size[0]) {
return;
}
if (x0 + (s1-s0) >= size[0]) {
if (x0 + width >= size[0]) {
s1 = size[0] - x0 + s0;
}
if (y0 + (t1-t0) >= size[1]) {
if (y0 + height >= size[1]) {
t1 = size[1] - y0 + t0;
}
int oldColor;
int newColor;
if (x0 < 0) {
if (onex == -1) {
width += x0;
s1 += x0 + 1;
} else {
s0 -= x0;
}
x0 = 0;
}
if (y0 < 0) {
if (oney == -1) {
height += y0;
t1 += y0 + 1;
} else {
t0 -= y0;
}
y0 = 0;
}
for (int texx = 0; texx < s1 - s0; texx++) {
for (int texy = 0; texy < t1 - t0; texy++) {
newColor = skin[(s0 + texx) + (t0 + texy) * skinwidth];
if (transparent) {
oldColor = canvas2d[(x0 + texx) + (y0 + texy) * size[0]];
oldColor = canvas2d[(x0 + texx*onex + width) + (y0 + texy*oney + height) * size[0]];
float a2 = ((float)(newColor >> 24 & 0xFF)) / 255f;
float a1 = 1f-a2;
int r = (int) ((oldColor >> 16 & 0xFF) * a1 + (newColor >> 16 & 0xFF) * a2);
@ -170,7 +204,7 @@ public class Display {
int b = (int) ((oldColor & 0xFF) * a1 + (newColor & 0xFF) * a2);
newColor = 0xFF000000 | r << 16 | g << 8 | b;
}
canvas2d[(x0 + texx) + (y0 + texy) * size[0]] = newColor;
canvas2d[(x0 + texx*onex + width) + (y0 + texy*oney + height) * size[0]] = newColor;
}
}
}

30
src/org/warp/picalculator/FunzioneAnteriore.java → src/org/warp/picalculator/AnteriorFunction.java
View File

@ -9,37 +9,37 @@ import org.warp.engine.Display;
import com.rits.cloning.Cloner;
public abstract class FunzioneAnteriore implements Funzione {
public FunzioneAnteriore(Funzione value) {
public abstract class AnteriorFunction implements Function {
public AnteriorFunction(Function value) {
setVariable(value);
}
protected Funzione variable = new Termine(NumeroAvanzatoVec.ZERO);
protected Function variable = new Number(NumeroAvanzatoVec.ZERO);
protected int width;
protected int height;
protected int line;
protected boolean small;
public Funzione getVariable() {
public Function getVariable() {
return variable;
}
public void setVariable(Funzione value) {
public void setVariable(Function value) {
variable = value;
}
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Funzione calcola() throws Errore;
public abstract Function solve() throws Error;
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable.setSmall(small);
variable.calcolaGrafica();
variable.generateGraphics();
width = getStringWidth(simbolo()) + 1 + getVariable().getWidth();
width = getStringWidth(getSymbol()) + 1 + getVariable().getWidth();
height = variable.getHeight();
line = variable.getLine();
}
@ -47,7 +47,7 @@ public abstract class FunzioneAnteriore implements Funzione {
@Override
public void draw(int x, int y) {
float h1 = getVariable().getHeight();
int wsegno = getStringWidth(simbolo());
int wsegno = getStringWidth(getSymbol());
float hsegno = Utils.getFontHeight(small);
float maxh = getHeight();
if (small) {
@ -56,7 +56,7 @@ public abstract class FunzioneAnteriore implements Funzione {
Display.Render.setFont(PIDisplay.fonts[0]);
}
glDrawStringLeft(x, (int) Math.floor(y + (maxh - hsegno) / 2), simbolo());
glDrawStringLeft(x, (int) Math.floor(y + (maxh - hsegno) / 2), getSymbol());
getVariable().draw(x + wsegno + 1, (int) Math.floor(y + (maxh - h1) / 2));
}
@ -78,14 +78,14 @@ public abstract class FunzioneAnteriore implements Funzione {
@Override
public String toString() {
try {
return calcola().toString();
} catch (Errore e) {
return solve().toString();
} catch (Error e) {
return e.id.toString();
}
}
@Override
public FunzioneAnteriore clone() {
public AnteriorFunction clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}

30
src/org/warp/picalculator/FunzioneAnterioreBase.java → src/org/warp/picalculator/AnteriorFunctionBase.java
View File

@ -9,37 +9,37 @@ import org.warp.engine.Display;
import com.rits.cloning.Cloner;
public abstract class FunzioneAnterioreBase extends FunzioneBase {
public FunzioneAnterioreBase(FunzioneBase value) {
public abstract class AnteriorFunctionBase extends FunctionBase {
public AnteriorFunctionBase(FunctionBase value) {
setVariable(value);
}
protected FunzioneBase variable = new Termine(NumeroAvanzatoVec.ZERO);
protected FunctionBase variable = new Number(NumeroAvanzatoVec.ZERO);
protected int width;
protected int height;
protected int line;
protected boolean small;
public FunzioneBase getVariable() {
public FunctionBase getVariable() {
return variable;
}
public void setVariable(FunzioneBase value) {
public void setVariable(FunctionBase value) {
variable = value;
}
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Termine calcola() throws Errore;
public abstract Number solve() throws Error;
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable.setSmall(small);
variable.calcolaGrafica();
variable.generateGraphics();
width = getStringWidth(simbolo()) + 1 + getVariable().getWidth();
width = getStringWidth(getSymbol()) + 1 + getVariable().getWidth();
height = variable.getHeight();
line = variable.getLine();
}
@ -47,7 +47,7 @@ public abstract class FunzioneAnterioreBase extends FunzioneBase {
@Override
public void draw(int x, int y) {
float h1 = getVariable().getHeight();
int wsegno = getStringWidth(simbolo());
int wsegno = getStringWidth(getSymbol());
float hsegno = Utils.getFontHeight(small);
float maxh = getHeight();
if (small) {
@ -56,7 +56,7 @@ public abstract class FunzioneAnterioreBase extends FunzioneBase {
Display.Render.setFont(PIDisplay.fonts[0]);
}
glDrawStringLeft(x, (int) Math.floor(y + (maxh - hsegno) / 2), simbolo());
glDrawStringLeft(x, (int) Math.floor(y + (maxh - hsegno) / 2), getSymbol());
getVariable().draw(x + wsegno + 1, (int) Math.floor(y + (maxh - h1) / 2));
}
@ -78,14 +78,14 @@ public abstract class FunzioneAnterioreBase extends FunzioneBase {
@Override
public String toString() {
try {
return calcola().toString();
} catch (Errore e) {
return solve().toString();
} catch (Error e) {
return e.id.toString();
}
}
@Override
public FunzioneAnterioreBase clone() {
public AnteriorFunctionBase clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}

46
src/org/warp/picalculator/Calculator.java
View File

@ -13,61 +13,61 @@ public class Calculator {
public static int currentSession = 0;
public static boolean haxMode = true;
public static Termine calcolarisultato(String string) throws Errore {
public static Number solveResult(String string) throws Error {
System.out.println("INPUT: " + string);
Espressione espressione = new Espressione(string);
return espressione.calcola();
Expression expression = new Expression(string);
return expression.solve();
}
public static Funzione interpreta(String string) throws Errore {
public static Function parseString(String string) throws Error {
if (string.contains("{")) {
if (!string.startsWith("{")) {
throw new Errore(Errori.SYNTAX_ERROR);
throw new Error(Errors.SYNTAX_ERROR);
}
String[] parts = string.substring(1).split("\\{");
Sistema s = new Sistema();
EquationsSystem s = new EquationsSystem();
for (String part : parts) {
s.addVariableToEnd(interpretaEquazione(part));
s.addVariableToEnd(parseEquationString(part));
}
return s;
} else if (string.contains("=")) {
return interpretaEquazione(string);
return parseEquationString(string);
} else {
return new Espressione(string);
return new Expression(string);
}
}
public static Funzione interpretaEquazione(String string) throws Errore {
public static Function parseEquationString(String string) throws Error {
String[] parts = string.split("=");
if (parts.length == 1) {
return new Equazione(new Espressione(parts[0]), new Termine(NumeroAvanzato.ZERO));
return new Equation(new Expression(parts[0]), new Number(NumeroAvanzato.ZERO));
} else if (parts.length == 2) {
return new Equazione(new Espressione(parts[0]), new Espressione(parts[1]));
return new Equation(new Expression(parts[0]), new Expression(parts[1]));
} else {
throw new Errore(Errori.SYNTAX_ERROR);
throw new Error(Errors.SYNTAX_ERROR);
}
}
public static void solve() throws Errore {
public static void solve() throws Error {
if (Calculator.currentSession == 0 && Calculator.sessions[0] instanceof EquationScreen) {
EquationScreen es = (EquationScreen) Calculator.sessions[0];
Funzione f = es.f;
if (f instanceof Equazione) {
Function f = es.f;
if (f instanceof Equation) {
PIDisplay.INSTANCE.setScreen(new SolveEquationScreen(es));
} else {
es.f2 = es.f.calcola();
es.f2.calcolaGrafica();
es.f2 = es.f.solve();
es.f2.generateGraphics();
}
}
}
public static void solve(char letter) throws Errore {
public static void solve(char letter) throws Error {
if (Calculator.currentSession == 0 && Calculator.sessions[0] instanceof EquationScreen) {
EquationScreen es = (EquationScreen) Calculator.sessions[0];
Funzione f = es.f;
if (f instanceof Equazione) {
es.f2 = ((Equazione)f).calcola(letter);
es.f2.calcolaGrafica();
Function f = es.f;
if (f instanceof Equation) {
es.f2 = ((Equation)f).solve(letter);
es.f2.generateGraphics();
}
}
}

42
src/org/warp/picalculator/Divisione.java → src/org/warp/picalculator/Division.java
View File

@ -9,26 +9,26 @@ import org.nevec.rjm.NumeroAvanzatoVec;
import org.warp.device.PIDisplay;
import org.warp.engine.Display;
public class Divisione extends FunzioneDueValoriBase {
public class Division extends FunctionTwoValuesBase {
public Divisione(FunzioneBase value1, FunzioneBase value2) {
public Division(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.DIVISION;
public String getSymbol() {
return MathematicalSymbols.DIVISION;
}
@Override
public Termine calcola() throws Errore {
public Number solve() throws Error {
if (variable2 == null || variable1 == null) {
return new Termine("0");
return new Number("0");
}
if (variable2.calcola().getTerm().compareTo(NumeroAvanzatoVec.ZERO) == 0) {
throw new Errore(Errori.DIVISION_BY_ZERO);
if (variable2.solve().getTerm().compareTo(NumeroAvanzatoVec.ZERO) == 0) {
throw new Error(Errors.DIVISION_BY_ZERO);
}
return variable1.calcola().divide(variable2.calcola());
return variable1.solve().divide(variable2.solve());
}
public boolean hasMinus() {
@ -49,12 +49,12 @@ public class Divisione extends FunzioneDueValoriBase {
private boolean drawMinus = true;
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable1.setSmall(true);
variable1.calcolaGrafica();
variable1.generateGraphics();
variable2.setSmall(true);
variable2.calcolaGrafica();
variable2.generateGraphics();
width = calcWidth();
height = calcHeight();
@ -72,8 +72,8 @@ public class Divisione extends FunzioneDueValoriBase {
boolean minus = false;
int minusw = 0;
int minush = 0;
String numerator = ((Funzione) var1).toString();
if (numerator.startsWith("-") && ((Funzione) var1) instanceof Termine && ((Termine) var1).term.isBigInteger(true)) {
String numerator = ((Function) var1).toString();
if (numerator.startsWith("-") && ((Function) var1) instanceof Number && ((Number) var1).term.isBigInteger(true)) {
minus = true;
numerator = numerator.substring(1);
}
@ -83,10 +83,10 @@ public class Divisione extends FunzioneDueValoriBase {
w1 = getStringWidth(numerator);
h1 = Utils.getFontHeight(small);
} else {
w1 = ((Funzione) var1).getWidth();
h1 = ((Funzione) var1).getHeight();
w1 = ((Function) var1).getWidth();
h1 = ((Function) var1).getHeight();
}
int w2 = ((Funzione) var2).getWidth();
int w2 = ((Function) var2).getWidth();
int maxw;
if (w1 > w2) {
maxw = 1 + w1;
@ -104,9 +104,9 @@ public class Divisione extends FunzioneDueValoriBase {
glDrawStringLeft(x+1, y + h1 + 1 + 1 - (minush / 2), "-");
glDrawStringLeft((int) (x+1 + minusw + 1 + (maxw - w1) / 2d), y, numerator);
} else {
((Funzione) var1).draw((int) (x+1 + minusw + (maxw - w1) / 2d), y);
((Function) var1).draw((int) (x+1 + minusw + (maxw - w1) / 2d), y);
}
((Funzione) var2).draw((int) (x+1 + minusw + (maxw - w2) / 2d), y + h1 + 1 + 1 + 1);
((Function) var2).draw((int) (x+1 + minusw + (maxw - w2) / 2d), y + h1 + 1 + 1 + 1);
glColor3f(0, 0, 0);
glFillRect(x+1+ minusw, y + h1 + 1, maxw, 1);
}
@ -121,7 +121,7 @@ public class Divisione extends FunzioneDueValoriBase {
boolean minus = false;
String numerator = variable1.toString();
if (numerator.startsWith("-") && variable1 instanceof Termine && ((Termine) variable1).term.isBigInteger(true)) {
if (numerator.startsWith("-") && variable1 instanceof Number && ((Number) variable1).term.isBigInteger(true)) {
minus = true;
numerator = numerator.substring(1);
}
@ -149,7 +149,7 @@ public class Divisione extends FunzioneDueValoriBase {
protected int calcWidth() {
boolean minus = false;
String numerator = variable1.toString();
if (numerator.startsWith("-") && variable1 instanceof Termine && ((Termine) variable1).term.isBigInteger(true)) {
if (numerator.startsWith("-") && variable1 instanceof Number && ((Number) variable1).term.isBigInteger(true)) {
minus = true;
numerator = numerator.substring(1);
}

59
src/org/warp/picalculator/Equation.java Normal file
View File

@ -0,0 +1,59 @@
package org.warp.picalculator;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import com.rits.cloning.Cloner;
public class Equation extends FunctionTwoValues {
public Equation(Function value1, Function value2) {
super(value1,value2);
}
@Override
public String getSymbol() {
return MathematicalSymbols.EQUATION;
}
@Override
public Function solve() throws Error {
return new Equation(new Subtraction((FunctionBase)variable1.solve(), (FunctionBase)variable2.solve()).solve(), new Number("0"));
}
public Function solve(char variableCharacter) {
@SuppressWarnings("unused")
ArrayList<Equation> e;
//TODO: WORK IN PROGRESS.
//TODO: Finire. Fare in modo che risolva i passaggi fino a che non ce ne sono più
return null;
}
//WORK IN PROGRESS
public ArrayList<Equation> solveStep(char charIncognita) {
ArrayList<Equation> result = new ArrayList<Equation>();
result.add(this.clone());
for (SolveMethod t : SolveMethod.techniques) {
ArrayList<Equation> newResults = new ArrayList<Equation>();
final int sz = result.size();
for (int n = 0; n < sz; n++) {
newResults.addAll(t.solve(result.get(n)));
}
Set<Equation> hs = new HashSet<>();
hs.addAll(newResults);
newResults.clear();
newResults.addAll(hs);
result = newResults;
}
// TODO: controllare se è a posto
return result;
}
@Override
public Equation clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}
}

13
src/org/warp/picalculator/EquationResult.java Normal file
View File

@ -0,0 +1,13 @@
package org.warp.picalculator;
import java.math.BigInteger;
public class EquationResult {
public boolean isAnEquation = false;
public Number LR = new Number(new BigInteger("0"));
public EquationResult(Number LR, boolean isAnEquation) {
this.LR = LR;
this.isAnEquation = isAnEquation;
}
}

92
src/org/warp/picalculator/EquationsSystem.java Normal file
View File

@ -0,0 +1,92 @@
package org.warp.picalculator;
import static org.warp.engine.Display.Render.glDrawLine;
public class EquationsSystem extends FunctionMultipleValues {
static final int spacing = 2;
public EquationsSystem() {
super();
}
public EquationsSystem(Function value) {
super(new Function[]{value});
}
public EquationsSystem(Function[] value) {
super(value);
}
@Override
public String getSymbol() {
return null;
}
@Override
public Function solve() throws NumberFormatException, Error {
// TODO implementare il calcolo dei sistemi
return variables[0].solve();
}
@Override
public void generateGraphics() {
for (Function f : variables) {
f.setSmall(false);
f.generateGraphics();
}
width = 0;
for (Function f : variables) {
if (f.getWidth() > width) {
width = f.getWidth();
}
}
width += 5;
height = 3;
for (Function f : variables) {
height += f.getHeight()+spacing;
}
height = height - spacing + 2;
line = height/2;
}
@Override
public void draw(int x, int y) {
final int h = this.getHeight() - 1;
final int marginTop = 3;
final int marginBottom = (h - 3 - 2) / 2 + marginTop;
final int spazioSopra = h - marginBottom;
int dy = marginTop;
for (Function f : variables) {
f.draw(x + 5, y + dy);
dy+=f.getHeight()+spacing;
}
glDrawLine(x + 2, y + 0, x + 3, y + 0);
glDrawLine(x + 1, y + 1, x + 1, y + marginBottom / 2);
glDrawLine(x + 2, y + marginBottom / 2 + 1, x + 2, y + marginBottom - 1);
glDrawLine(x + 0, y + marginBottom, x + 1, y + marginBottom);
glDrawLine(x + 2, y + marginBottom + 1, x + 2, y + marginBottom + spazioSopra / 2 - 1);
glDrawLine(x + 1, y + marginBottom + spazioSopra / 2, x + 1, y + h - 1);
glDrawLine(x + 2, y + h, x + 3, y + h);
}
@Override
public int getWidth() {
return width;
}
@Override
public int getHeight() {
return height;
}
@Override
public int getLine() {
return line;
}
}

16
src/org/warp/picalculator/ParteSistema.java → src/org/warp/picalculator/EquationsSystemPart.java
View File

@ -3,27 +3,27 @@ package org.warp.picalculator;
import static org.warp.engine.Display.Render.glColor3f;
import static org.warp.engine.Display.Render.glDrawLine;
public class ParteSistema extends FunzioneAnteriore {
public class EquationsSystemPart extends AnteriorFunction {
public ParteSistema(Equazione equazione) {
public EquationsSystemPart(Equation equazione) {
super(equazione);
}
@Override
public String simbolo() {
return Simboli.SYSTEM;
public String getSymbol() {
return MathematicalSymbols.SYSTEM;
}
@Override
public Equazione calcola() throws NumberFormatException, Errore {
public Equation solve() throws NumberFormatException, Error {
// TODO implementare il calcolo dei sistemi
return (Equazione) variable.calcola();
return (Equation) variable.solve();
}
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable.setSmall(false);
variable.calcolaGrafica();
variable.generateGraphics();
width = 5 + getVariable().getWidth();
height = 3 + getVariable().getHeight() + 2;

57
src/org/warp/picalculator/Equazione.java
View File

@ -1,57 +0,0 @@
package org.warp.picalculator;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import com.rits.cloning.Cloner;
public class Equazione extends FunzioneDueValori {
public Equazione(Funzione value1, Funzione value2) {
super(value1,value2);
}
@Override
public String simbolo() {
return Simboli.EQUATION;
}
@Override
public Funzione calcola() throws Errore {
return new Equazione(new Sottrazione((FunzioneBase)variable1.calcola(), (FunzioneBase)variable2.calcola()).calcola(), new Termine("0"));
}
public Funzione calcola(char charIncognita) {
@SuppressWarnings("unused")
ArrayList<Equazione> e;
//TODO: Finire. Fare in modo che risolva i passaggi fino a che non ce ne sono più
return null;
}
public ArrayList<Equazione> risolviPassaggio(char charIncognita) {
ArrayList<Equazione> result = new ArrayList<Equazione>();
result.add(this.clone());
for (Tecnica t : Tecnica.tecniche) {
ArrayList<Equazione> newResults = new ArrayList<Equazione>();
final int sz = result.size();
for (int n = 0; n < sz; n++) {
newResults.addAll(t.risolvi(result.get(n)));
}
Set<Equazione> hs = new HashSet<>();
hs.addAll(newResults);
newResults.clear();
newResults.addAll(hs);
result = newResults;
}
// TODO: controllare se è a posto
return result;
}
@Override
public Equazione clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}
}

15
src/org/warp/picalculator/Error.java Normal file
View File

@ -0,0 +1,15 @@
package org.warp.picalculator;
public class Error extends java.lang.Throwable {
/**
*
*/
private static final long serialVersionUID = -1014947815755694651L;
public Error(Errors ErrorID) {
id = ErrorID;
}
public Errors id = Errors.ERROR;
}

15
src/org/warp/picalculator/Errore.java
View File

@ -1,15 +0,0 @@
package org.warp.picalculator;
public class Errore extends java.lang.Throwable {
/**
*
*/
private static final long serialVersionUID = -1014947815755694651L;
public Errore(Errori IDErrore) {
id = IDErrore;
}
public Errori id = Errori.ERROR;
}

2
src/org/warp/picalculator/Errori.java → src/org/warp/picalculator/Errors.java
View File

@ -1,5 +1,5 @@
package org.warp.picalculator;
public enum Errori {
public enum Errors {
ERROR, DIVISION_BY_ZERO, UNBALANCED_BRACKETS, NOT_IMPLEMENTED, NEGATIVE_PARAMETER, NUMBER_TOO_LARGE, NUMBER_TOO_SMALL, CONVERSION_ERROR, SYNTAX_ERROR, NOT_AN_EQUATION
}

385
src/org/warp/picalculator/Espressione.java → src/org/warp/picalculator/Expression.java
View File

@ -14,30 +14,31 @@ import java.util.regex.Pattern;
import org.nevec.rjm.NumeroAvanzato;
import org.nevec.rjm.NumeroAvanzatoVec;
public class Espressione extends FunzioneMultiplaBase {
public class Expression extends FunctionMultipleValuesBase {
public Espressione() {
public Expression() {
super();
}
public Espressione(FunzioneBase[] values) {
public Expression(FunctionBase[] values) {
super(values);
}
private boolean parentesiIniziale = false;
private boolean initialParenthesis = false;
public Espressione(String string) throws Errore {
public Expression(String string) throws Error {
this(string, "", true);
}
public Espressione(String string, String debugSpaces, boolean parentesiIniziale) throws Errore {
public Expression(String string, String debugSpaces, boolean initialParenthesis) throws Error {
super();
this.parentesiIniziale = parentesiIniziale;
this.initialParenthesis = initialParenthesis;
boolean isNumber = false;
// Determine if the expression is already a number:
// Determina se l'espressione è già un numero:
try {
new Termine(string);
new Number(string);
isNumber = true;
} catch (NumberFormatException ex) {
isNumber = false;
@ -47,115 +48,121 @@ public class Espressione extends FunzioneMultiplaBase {
Utils.debug.println(debugSpaces + "•Analyzing expression:" + processExpression);
if (isNumber){
// If the expression is already a number:
// Se l'espressione è già un numero:
Termine t = new Termine(string);
setVariables(new FunzioneBase[] { t });
Number t = new Number(string);
setVariables(new FunctionBase[] { t });
Utils.debug.println(debugSpaces + "•Result:" + t.toString());
} else {
// Else prepare the expression:
// Altrimenti prepara l'espressione:
debugSpaces += " ";
// IF the expression is not a number:
// Se l'espressione non è già un numero:
// Controlla se ci sono più di un uguale
// Check if there are more than one equal symbol (=)
// Controlla se ci sono più di un uguale (=)
int equationsFound = 0;
int systemsFound = 0;
for (char c : processExpression.toCharArray()) {
if (("" + c).equals(Simboli.EQUATION)) {
if (("" + c).equals(MathematicalSymbols.EQUATION)) {
equationsFound += 1;
}
if (("" + c).equals(Simboli.SYSTEM)) {
if (("" + c).equals(MathematicalSymbols.SYSTEM)) {
equationsFound += 1;
}
}
if (equationsFound == 1 && systemsFound == 0) {
processExpression = Simboli.SYSTEM + processExpression;
processExpression = MathematicalSymbols.SYSTEM + processExpression;
systemsFound += 1;
}
if (equationsFound != systemsFound) {
throw new Errore(Errori.SYNTAX_ERROR);
throw new Error(Errors.SYNTAX_ERROR);
}
//Solve the exceeding symbols ++ and --
// Correggi i segni ++ e -- in eccesso
Pattern pattern = Pattern.compile("\\+\\++?|\\-\\-+?");
Matcher matcher = pattern.matcher(processExpression);
boolean cambiati = false;
boolean symbolsChanged = false;
while (matcher.find()) {
cambiati = true;
symbolsChanged = true;
String correzione = "+";
processExpression = processExpression.substring(0, matcher.start(0) + 1) + correzione + processExpression.substring(matcher.start(0) + matcher.group(0).length(), processExpression.length());
matcher = pattern.matcher(processExpression);
}
// Correct the exceeding symbols +- and -+
// Correggi i segni +- e -+ in eccesso
pattern = Pattern.compile("\\+\\-|\\-\\+");
matcher = pattern.matcher(processExpression);
while (matcher.find()) {
cambiati = true;
symbolsChanged = true;
String correzione = "-";
processExpression = processExpression.substring(0, matcher.start(0)) + correzione + processExpression.substring(matcher.start(0) + matcher.group(0).length(), processExpression.length());
matcher = pattern.matcher(processExpression);
}
// Rimuovi i segni appena dopo le parentesi
if (processExpression.contains("(+")) {
cambiati = true;
symbolsChanged = true;
processExpression = processExpression.replace("(+", "(");
}
// Cambia i segni appena prima le parentesi
if (processExpression.contains("-(")) {
cambiati = true;
symbolsChanged = true;
processExpression = processExpression.replace("-(", "-1*(");
}
// Rimuovi i segni appena dopo l'inizio
if (processExpression.startsWith("+")) {
cambiati = true;
symbolsChanged = true;
processExpression = processExpression.substring(1, processExpression.length());
}
// Rimuovi i + in eccesso
pattern = Pattern.compile("[" + ArrayToRegex(Utils.add(concat(Simboli.segni(true, true), Simboli.funzioni()), "(")) + "]\\+[^" + ArrayToRegex(concat(concat(Simboli.segni(true, true), Simboli.funzioni()), new String[] { "(", ")" })) + "]+?[" + ArrayToRegex(concat(Simboli.segni(true, true), Simboli.funzioni())) + "]|[" + ArrayToRegex(concat(Simboli.segni(true, true), Simboli.funzioni())) + "]+?\\+[^" + ArrayToRegex(concat(concat(Simboli.segni(true, true), Simboli.funzioni()), new String[] { "(", ")" })) + "]");
pattern = Pattern.compile("[" + ArrayToRegex(Utils.add(concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.functions()), "(")) + "]\\+[^" + ArrayToRegex(concat(concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.functions()), new String[] { "(", ")" })) + "]+?[" + ArrayToRegex(concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.functions())) + "]|[" + ArrayToRegex(concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.functions())) + "]+?\\+[^" + ArrayToRegex(concat(concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.functions()), new String[] { "(", ")" })) + "]");
matcher = pattern.matcher(processExpression);
cambiati = false;
symbolsChanged = false;
while (matcher.find()) {
cambiati = true;
symbolsChanged = true;
String correzione = matcher.group(0).replaceFirst(Matcher.quoteReplacement("+"), "");
processExpression = processExpression.substring(0, matcher.start(0) + 1) + correzione + processExpression.substring(matcher.start(0) + matcher.group(0).length(), processExpression.length());
matcher = pattern.matcher(processExpression);
}
// Correggi i segni - in +-
pattern = Pattern.compile("[^" + Utils.ArrayToRegex(concat(concat(Simboli.funzioni(), new String[] { Simboli.PARENTHESIS_OPEN }), Simboli.segni(true, true))) + "]-");
pattern = Pattern.compile("[^" + Utils.ArrayToRegex(concat(concat(MathematicalSymbols.functions(), new String[] { MathematicalSymbols.PARENTHESIS_OPEN }), MathematicalSymbols.signums(true, true))) + "]-");
matcher = pattern.matcher(processExpression);
while (matcher.find()) {
cambiati = true;
symbolsChanged = true;
String correzione = "+-";
processExpression = processExpression.substring(0, matcher.start(0) + 1) + correzione + processExpression.substring(matcher.start(0) + matcher.group(0).length(), processExpression.length());
matcher = pattern.matcher(processExpression);
}
if (cambiati) {
if (symbolsChanged) {
Utils.debug.println(debugSpaces + "•Resolved signs:" + processExpression);
}
// Aggiungi i segni * accanto alle parentesi
pattern = Pattern.compile("\\([^\\(]+?\\)");
matcher = pattern.matcher(processExpression);
cambiati = false;
symbolsChanged = false;
while (matcher.find()) {
cambiati = true;
symbolsChanged = true;
// sistema i segni * impliciti prima e dopo l'espressione.
String beforeexp = processExpression.substring(0, matcher.start(0));
String newexp = matcher.group(0).substring(1, matcher.group(0).length() - 1);
String afterexp = processExpression.substring(matcher.start(0) + matcher.group(0).length(), processExpression.length());
if (Pattern.compile("[^\\-" + Utils.ArrayToRegex(Utils.add(concat(Simboli.funzioni(), concat(Simboli.segni(true, true), Simboli.sintassiGenerale())), "(")) + "]$").matcher(beforeexp).find()) {
if (Pattern.compile("[^\\-" + Utils.ArrayToRegex(Utils.add(concat(MathematicalSymbols.functions(), concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.genericSyntax())), "(")) + "]$").matcher(beforeexp).find()) {
// Se la stringa precedente finisce con un numero
beforeexp += Simboli.MULTIPLICATION;
beforeexp += MathematicalSymbols.MULTIPLICATION;
}
if (Pattern.compile("^[^\\-" + Utils.ArrayToRegex(Utils.add(concat(Simboli.funzioni(), concat(Simboli.segni(true, true), Simboli.sintassiGenerale())), ")")) + "]").matcher(afterexp).find()) {
if (Pattern.compile("^[^\\-" + Utils.ArrayToRegex(Utils.add(concat(MathematicalSymbols.functions(), concat(MathematicalSymbols.signums(true, true), MathematicalSymbols.genericSyntax())), ")")) + "]").matcher(afterexp).find()) {
// Se la stringa successiva inizia con un numero
afterexp = Simboli.MULTIPLICATION + afterexp;
afterexp = MathematicalSymbols.MULTIPLICATION + afterexp;
}
processExpression = beforeexp + "⑴" + newexp + "⑵" + afterexp;
matcher = pattern.matcher(processExpression);
@ -163,7 +170,7 @@ public class Espressione extends FunzioneMultiplaBase {
processExpression = processExpression.replace("⑴", "(").replace("⑵", ")");
if (cambiati) {
if (symbolsChanged) {
Utils.debug.println(debugSpaces + "•Added implicit multiplications:" + processExpression);
}
@ -171,61 +178,63 @@ public class Espressione extends FunzioneMultiplaBase {
debugSpaces += " ";
// Suddividi tutto
Espressione parentesiNonSuddivisaCorrettamente = new Espressione();
parentesiNonSuddivisaCorrettamente.setVariables(new FunzioneBase[] {});
// Convert the expression to a list of objects
Expression imputRawParenthesis = new Expression();
imputRawParenthesis.setVariables(new FunctionBase[] {});
String tmp = "";
final String[] funzioni = concat(concat(concat(concat(Simboli.funzioni(), Simboli.parentesi()), Simboli.segni(true, true)), Simboli.incognite()), Simboli.sintassiGenerale());
final String[] functions = concat(concat(concat(concat(MathematicalSymbols.functions(), MathematicalSymbols.parentheses()), MathematicalSymbols.signums(true, true)), MathematicalSymbols.variables()), MathematicalSymbols.genericSyntax());
for (int i = 0; i < processExpression.length(); i++) {
// Per ogni carattere cerca se è un numero o una funzione:
String charI = processExpression.charAt(i) + "";
if (Utils.isInArray(charI, funzioni)) {
if (Utils.isInArray(charI, functions)) {
// Finds the type of function fron the following list
// Cerca il tipo di funzione tra le esistenti
FunzioneBase f = null;
FunctionBase f = null;
switch (charI) {
case Simboli.SUM:
f = new Somma(null, null);
case MathematicalSymbols.SUM:
f = new Sum(null, null);
break;
case Simboli.MULTIPLICATION:
f = new Moltiplicazione(null, null);
case MathematicalSymbols.MULTIPLICATION:
f = new Multiplication(null, null);
break;
case Simboli.PRIORITARY_MULTIPLICATION:
f = new MoltiplicazionePrioritaria(null, null);
case MathematicalSymbols.PRIORITARY_MULTIPLICATION:
f = new PrioritaryMultiplication(null, null);
break;
case Simboli.DIVISION:
f = new Divisione(null, null);
case MathematicalSymbols.DIVISION:
f = new Division(null, null);
break;
case Simboli.NTH_ROOT:
f = new Radice(null, null);
case MathematicalSymbols.NTH_ROOT:
f = new Root(null, null);
break;
case Simboli.SQUARE_ROOT:
f = new RadiceQuadrata(null);
case MathematicalSymbols.SQUARE_ROOT:
f = new RootSquare(null);
break;
case Simboli.POTENZA:
f = new Potenza(null, null);
case MathematicalSymbols.POWER:
f = new Power(null, null);
break;
case Simboli.PARENTHESIS_OPEN:
case MathematicalSymbols.PARENTHESIS_OPEN:
// Find the last closed parenthesis
// cerca l'ultima parentesi chiusa
int startIndex = i;
int endIndex = -1;
int jumps = -1;
for (int i2 = startIndex; i2 < processExpression.length(); i2++) {
if ((processExpression.charAt(i2) + "").equals(Simboli.PARENTHESIS_CLOSE)) {
if ((processExpression.charAt(i2) + "").equals(MathematicalSymbols.PARENTHESIS_CLOSE)) {
if (jumps == 0) {
endIndex = i2;
break;
} else if (jumps > 0) {
jumps -= 1;
} else if (jumps < 0) {
throw new Errore(Errori.UNBALANCED_BRACKETS);
throw new Error(Errors.UNBALANCED_BRACKETS);
}
} else if ((processExpression.charAt(i2) + "").equals(Simboli.PARENTHESIS_OPEN)) {
} else if ((processExpression.charAt(i2) + "").equals(MathematicalSymbols.PARENTHESIS_OPEN)) {
jumps += 1;
}
}
if (endIndex == -1 || endIndex < startIndex) {
throw new Errore(Errori.UNBALANCED_BRACKETS);
throw new Error(Errors.UNBALANCED_BRACKETS);
}
startIndex += 1;
i = startIndex;
@ -235,55 +244,55 @@ public class Espressione extends FunzioneMultiplaBase {
tmpExpr += processExpression.charAt(i);
i++;
}
f = new Espressione(tmpExpr, debugSpaces, false);
f = new Expression(tmpExpr, debugSpaces, false);
break;
default:
if (Utils.isInArray(charI, Simboli.incognite())) {
if (Utils.isInArray(charI, MathematicalSymbols.variables())) {
// Fallback
NumeroAvanzato na = NumeroAvanzato.ONE;
Incognite iy = na.getIncognitey();
iy.incognite.add(new Incognita(charI.charAt(0), 1, 1));
na = na.setIncognitey(iy);
f = new Termine(na);
Variables iy = na.getVariableY();
iy.variables.add(new Variable(charI.charAt(0), 1, 1));
na = na.setVariableY(iy);
f = new Number(na);
} else {
throw new java.lang.RuntimeException("Il carattere " + charI + " non è tra le funzioni designate!\nAggiungerlo ad esse o rimuovere il carattere dall'espressione!");
}
}
if (f instanceof Espressione) {
if (f instanceof Expression) {
tmp = "";
} else if (f instanceof Termine) {
if (parentesiNonSuddivisaCorrettamente.getVariablesLength() == 0) {
} else if (f instanceof Number) {
if (imputRawParenthesis.getVariablesLength() == 0) {
if (tmp.length() > 0) {
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new Termine(tmp));
imputRawParenthesis.addVariableToEnd(new Number(tmp));
Utils.debug.println(debugSpaces + "•Added value to expression:" + tmp);
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new MoltiplicazionePrioritaria(null, null));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + new MoltiplicazionePrioritaria(null, null).simbolo());
imputRawParenthesis.addVariableToEnd(new PrioritaryMultiplication(null, null));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + new PrioritaryMultiplication(null, null).getSymbol());
}
} else {
if (tmp.length() > 0) {
if (parentesiNonSuddivisaCorrettamente.getVariable(parentesiNonSuddivisaCorrettamente.getVariablesLength() - 1) instanceof Termine) {
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new MoltiplicazionePrioritaria(null, null));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + new MoltiplicazionePrioritaria(null, null).simbolo());
if (imputRawParenthesis.getVariable(imputRawParenthesis.getVariablesLength() - 1) instanceof Number) {
imputRawParenthesis.addVariableToEnd(new PrioritaryMultiplication(null, null));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + new PrioritaryMultiplication(null, null).getSymbol());
}
if (tmp.equals("-")) {
tmp = "-1";
}
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new Termine(tmp));
imputRawParenthesis.addVariableToEnd(new Number(tmp));
Utils.debug.println(debugSpaces + "•Added value to expression:" + tmp);
}
if (tmp.length() > 0 || parentesiNonSuddivisaCorrettamente.getVariable(parentesiNonSuddivisaCorrettamente.getVariablesLength() - 1) instanceof Termine) {
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new MoltiplicazionePrioritaria(null, null));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + new MoltiplicazionePrioritaria(null, null).simbolo());
if (tmp.length() > 0 || imputRawParenthesis.getVariable(imputRawParenthesis.getVariablesLength() - 1) instanceof Number) {
imputRawParenthesis.addVariableToEnd(new PrioritaryMultiplication(null, null));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + new PrioritaryMultiplication(null, null).getSymbol());
}
}
} else {
if (tmp.length() != 0) {
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new Termine(tmp));
imputRawParenthesis.addVariableToEnd(new Number(tmp));
Utils.debug.println(debugSpaces + "•Added variable to expression:" + tmp);
}
}
parentesiNonSuddivisaCorrettamente.addVariableToEnd(f);
Utils.debug.println(debugSpaces + "•Added variable to expression:" + f.simbolo());
imputRawParenthesis.addVariableToEnd(f);
Utils.debug.println(debugSpaces + "•Added variable to expression:" + f.getSymbol());
tmp = "";
} else {
try {
@ -301,9 +310,9 @@ public class Espressione extends FunzioneMultiplaBase {
if (tmp.length() > 0) {
Utils.debug.println(debugSpaces + "•Added variable to expression:" + tmp);
try {
parentesiNonSuddivisaCorrettamente.addVariableToEnd(new Termine(tmp));
imputRawParenthesis.addVariableToEnd(new Number(tmp));
} catch (NumberFormatException ex) {
throw new Errore(Errori.SYNTAX_ERROR);
throw new Error(Errors.SYNTAX_ERROR);
}
tmp = "";
}
@ -317,13 +326,13 @@ public class Espressione extends FunzioneMultiplaBase {
// Fine suddivisione di insieme
Utils.debug.println(debugSpaces + "•Removing useless parentheses");
for (int i = 0; i < parentesiNonSuddivisaCorrettamente.variables.length; i++) {
if (parentesiNonSuddivisaCorrettamente.variables[i] instanceof Espressione) {
Espressione par = (Espressione) parentesiNonSuddivisaCorrettamente.variables[i];
for (int i = 0; i < imputRawParenthesis.variables.length; i++) {
if (imputRawParenthesis.variables[i] instanceof Expression) {
Expression par = (Expression) imputRawParenthesis.variables[i];
if (par.variables.length == 1) {
FunzioneBase subFunz = par.variables[0];
if (subFunz instanceof Espressione || subFunz instanceof Termine) {
parentesiNonSuddivisaCorrettamente.variables[i] = subFunz;
FunctionBase subFunz = par.variables[0];
if (subFunz instanceof Expression || subFunz instanceof Number) {
imputRawParenthesis.variables[i] = subFunz;
Utils.debug.println(debugSpaces + " •Useless parentheses removed");
}
}
@ -333,142 +342,142 @@ public class Espressione extends FunzioneMultiplaBase {
// Inizia l'affinazione dell'espressione
Utils.debug.println(debugSpaces + "•Pushing classes...");
FunzioneBase[] funzioniOLDArray = parentesiNonSuddivisaCorrettamente.getVariables();
ArrayList<FunzioneBase> funzioniOLD = new ArrayList<FunzioneBase>();
for (int i = 0; i < funzioniOLDArray.length; i++) {
FunzioneBase funzione = funzioniOLDArray[i];
FunctionBase[] oldFunctionsArray = imputRawParenthesis.getVariables();
ArrayList<FunctionBase> oldFunctionsList = new ArrayList<FunctionBase>();
for (int i = 0; i < oldFunctionsArray.length; i++) {
FunctionBase funzione = oldFunctionsArray[i];
if (funzione != null) {
//Affinazione
if (funzione instanceof Radice) {
if ((i - 1) >= 0 && funzioniOLDArray[i-1] instanceof Termine && ((Termine)funzioniOLDArray[i-1]).getTerm().compareTo(new NumeroAvanzatoVec(new NumeroAvanzato(new BigInteger("2")))) == 0) {
funzioniOLDArray[i] = null;
funzioniOLDArray[i-1] = null;
funzioniOLD.remove(funzioniOLD.size()-1);
if (funzione instanceof Root) {
if ((i - 1) >= 0 && oldFunctionsArray[i-1] instanceof Number && ((Number)oldFunctionsArray[i-1]).getTerm().compareTo(new NumeroAvanzatoVec(new NumeroAvanzato(new BigInteger("2")))) == 0) {
oldFunctionsArray[i] = null;
oldFunctionsArray[i-1] = null;
oldFunctionsList.remove(oldFunctionsList.size()-1);
i -= 1;
funzione = new RadiceQuadrata(null);
funzione = new RootSquare(null);
}
}
//Aggiunta della funzione alla lista grezza
funzioniOLD.add(funzione);
oldFunctionsList.add(funzione);
}
}
if (funzioniOLD.size() > 1) {
if (oldFunctionsList.size() > 1) {
Utils.debug.println(debugSpaces + " •Correcting classes:");
int before = 0;
String fase = "funzioniSN";
String step = "SN Functions";
int n = 0;
do {
before = funzioniOLD.size();
before = oldFunctionsList.size();
int i = 0;
boolean change = false;
if (Utils.ciSonoMoltiplicazioniPrioritarieNonImpostate(funzioniOLD)) {
fase = "moltiplicazioni prioritarie"; // PRIMA FASE
} else if (Utils.ciSonoFunzioniSNnonImpostate(funzioniOLD)) {
fase = "funzioniSN"; // SECONDA FASE
} else if (Utils.ciSonoFunzioniNSNnonImpostate(funzioniOLD)) {
fase = "funzioniNSN"; // TERZA FASE
} else if (Utils.ciSonoMoltiplicazioniNonImpostate(funzioniOLD)) {
fase = "moltiplicazioni"; // QUARTA FASE
} else if (Utils.ciSonoSommeNonImpostate(funzioniOLD)) {
fase = "somme"; // QUINTA FASE
if (Utils.areThereEmptyPrioritaryMultiplications(oldFunctionsList)) {
step = "prioritary multiplications"; // PRIMA FASE
} else if (Utils.areThereOnlyEmptySNFunctions(oldFunctionsList)) {
step = "SN Functions"; // SECONDA FASE
} else if (Utils.areThereOnlyEmptyNSNFunctions(oldFunctionsList)) {
step = "NSN Functions"; // TERZA FASE
} else if (Utils.areThereEmptyMultiplications(oldFunctionsList)) {
step = "multiplications"; // QUARTA FASE
} else if (Utils.areThereEmptySums(oldFunctionsList)) {
step = "sums"; // QUINTA FASE
} else {
// fase = "errore";
System.out.println("WARN: ---> POSSIBILE ERRORE????? <---");// BOH
// throw new Errore(Errori.SYNTAX_ERROR);
while (funzioniOLD.size() > 1) {
funzioniOLD.set(0, new Moltiplicazione(funzioniOLD.get(0), funzioniOLD.remove(1)));
while (oldFunctionsList.size() > 1) {
oldFunctionsList.set(0, new Multiplication(oldFunctionsList.get(0), oldFunctionsList.remove(1)));
}
}
Utils.debug.println(debugSpaces + " •Phase: "+fase);
while (i < funzioniOLD.size() && change == false && funzioniOLD.size() > 1) {
FunzioneBase funzioneTMP = funzioniOLD.get(i);
if (funzioneTMP instanceof FunzioneDueValoriBase) {
if (fase != "funzioniSN") {
Utils.debug.println(debugSpaces + " •Phase: "+step);
while (i < oldFunctionsList.size() && change == false && oldFunctionsList.size() > 1) {
FunctionBase funzioneTMP = oldFunctionsList.get(i);
if (funzioneTMP instanceof FunctionTwoValuesBase) {
if (step != "SN Functions") {
if (
(fase == "somme" && (funzioneTMP instanceof Somma) == true && ((funzioneTMP instanceof FunzioneAnterioreBase && ((FunzioneAnterioreBase) funzioneTMP).variable == null) || (funzioneTMP instanceof FunzioneDueValoriBase && ((FunzioneDueValoriBase) funzioneTMP).variable1 == null && ((FunzioneDueValoriBase) funzioneTMP).variable2 == null) || (!(funzioneTMP instanceof FunzioneAnterioreBase) && !(funzioneTMP instanceof FunzioneDueValoriBase))))
(step == "sums" && (funzioneTMP instanceof Sum) == true && ((funzioneTMP instanceof AnteriorFunctionBase && ((AnteriorFunctionBase) funzioneTMP).variable == null) || (funzioneTMP instanceof FunctionTwoValuesBase && ((FunctionTwoValuesBase) funzioneTMP).variable1 == null && ((FunctionTwoValuesBase) funzioneTMP).variable2 == null) || (!(funzioneTMP instanceof AnteriorFunctionBase) && !(funzioneTMP instanceof FunctionTwoValuesBase))))
||
(
fase.equals("moltiplicazioni prioritarie")
step.equals("prioritary multiplications")
&&
(funzioneTMP instanceof MoltiplicazionePrioritaria)
(funzioneTMP instanceof PrioritaryMultiplication)
&&
((FunzioneDueValoriBase) funzioneTMP).variable1 == null
((FunctionTwoValuesBase) funzioneTMP).variable1 == null
&&
((FunzioneDueValoriBase) funzioneTMP).variable2 == null
((FunctionTwoValuesBase) funzioneTMP).variable2 == null
)
||
(
fase.equals("moltiplicazioni")
step.equals("multiplications")
&&
(
(funzioneTMP instanceof Moltiplicazione)
(funzioneTMP instanceof Multiplication)
||
(funzioneTMP instanceof Divisione)
(funzioneTMP instanceof Division)
)
&&
((FunzioneDueValoriBase) funzioneTMP).variable1 == null
((FunctionTwoValuesBase) funzioneTMP).variable1 == null
&&
((FunzioneDueValoriBase) funzioneTMP).variable2 == null
((FunctionTwoValuesBase) funzioneTMP).variable2 == null
)
||
(
fase == "funzioniNSN"
step == "NSN Functions"
&&
(funzioneTMP instanceof Somma) == false
(funzioneTMP instanceof Sum) == false
&&
(funzioneTMP instanceof Moltiplicazione) == false
(funzioneTMP instanceof Multiplication) == false
&&
(funzioneTMP instanceof MoltiplicazionePrioritaria) == false
(funzioneTMP instanceof PrioritaryMultiplication) == false
&&
(funzioneTMP instanceof Divisione) == false
(funzioneTMP instanceof Division) == false
&&
(
(
funzioneTMP instanceof FunzioneAnterioreBase
funzioneTMP instanceof AnteriorFunctionBase
&&
((FunzioneAnterioreBase) funzioneTMP).variable == null
((AnteriorFunctionBase) funzioneTMP).variable == null
)
||
(
funzioneTMP instanceof FunzioneDueValoriBase
funzioneTMP instanceof FunctionTwoValuesBase
&&
((FunzioneDueValoriBase) funzioneTMP).variable1 == null
((FunctionTwoValuesBase) funzioneTMP).variable1 == null
&&
((FunzioneDueValoriBase) funzioneTMP).variable2 == null
((FunctionTwoValuesBase) funzioneTMP).variable2 == null
)
||
(
!(funzioneTMP instanceof FunzioneAnterioreBase)
!(funzioneTMP instanceof AnteriorFunctionBase)
&&
!(funzioneTMP instanceof FunzioneDueValoriBase)
!(funzioneTMP instanceof FunctionTwoValuesBase)
)
)
)
) {
change = true;
if (i + 1 < funzioniOLD.size() && i - 1 >= 0) {
((FunzioneDueValoriBase) funzioneTMP).setVariable1((FunzioneBase) funzioniOLD.get(i - 1));
((FunzioneDueValoriBase) funzioneTMP).setVariable2((FunzioneBase) funzioniOLD.get(i + 1));
funzioniOLD.set(i, funzioneTMP);
if (i + 1 < oldFunctionsList.size() && i - 1 >= 0) {
((FunctionTwoValuesBase) funzioneTMP).setVariable1((FunctionBase) oldFunctionsList.get(i - 1));
((FunctionTwoValuesBase) funzioneTMP).setVariable2((FunctionBase) oldFunctionsList.get(i + 1));
oldFunctionsList.set(i, funzioneTMP);
// è importante togliere prima gli elementi
// in fondo e poi quelli davanti, perché gli
// indici scalano da destra a sinistra.
funzioniOLD.remove(i + 1);
funzioniOLD.remove(i - 1);
oldFunctionsList.remove(i + 1);
oldFunctionsList.remove(i - 1);
Utils.debug.println(debugSpaces + " •Set variable to expression:" + funzioneTMP.simbolo());
Utils.debug.println(debugSpaces + " •Set variable to expression:" + funzioneTMP.getSymbol());
try {
Utils.debug.println(debugSpaces + " " + "var1=" + ((FunzioneDueValoriBase) funzioneTMP).getVariable1().calcola());
Utils.debug.println(debugSpaces + " " + "var1=" + ((FunctionTwoValuesBase) funzioneTMP).getVariable1().solve());
} catch (NullPointerException ex2) {}
try {
Utils.debug.println(debugSpaces + " " + "var2=" + ((FunzioneDueValoriBase) funzioneTMP).getVariable2().calcola());
Utils.debug.println(debugSpaces + " " + "var2=" + ((FunctionTwoValuesBase) funzioneTMP).getVariable2().solve());
} catch (NullPointerException ex2) {}
try {
Utils.debug.println(debugSpaces + " " + "(result)=" + ((FunzioneDueValoriBase) funzioneTMP).calcola());
Utils.debug.println(debugSpaces + " " + "(result)=" + ((FunctionTwoValuesBase) funzioneTMP).solve());
} catch (NullPointerException ex2) {}
} else {
@ -476,24 +485,24 @@ public class Espressione extends FunzioneMultiplaBase {
}
}
}
} else if (funzioneTMP instanceof FunzioneAnterioreBase) {
if ((fase == "funzioniSN" && ((FunzioneAnterioreBase) funzioneTMP).variable == null)) {
if (i + 1 < funzioniOLD.size()) {
FunzioneBase nextFunc = funzioniOLD.get(i + 1);
if (nextFunc instanceof FunzioneAnterioreBase && ((FunzioneAnterioreBase)nextFunc).variable == null) {
} else if (funzioneTMP instanceof AnteriorFunctionBase) {
if ((step == "SN Functions" && ((AnteriorFunctionBase) funzioneTMP).variable == null)) {
if (i + 1 < oldFunctionsList.size()) {
FunctionBase nextFunc = oldFunctionsList.get(i + 1);
if (nextFunc instanceof AnteriorFunctionBase && ((AnteriorFunctionBase)nextFunc).variable == null) {
} else {
change = true;
((FunzioneAnterioreBase) funzioneTMP).setVariable((FunzioneBase) nextFunc);
funzioniOLD.set(i, funzioneTMP);
((AnteriorFunctionBase) funzioneTMP).setVariable((FunctionBase) nextFunc);
oldFunctionsList.set(i, funzioneTMP);
// è importante togliere prima gli elementi in
// fondo e poi quelli davanti, perché gli indici
// scalano da destra a sinistra.
funzioniOLD.remove(i + 1);
oldFunctionsList.remove(i + 1);
Utils.debug.println(debugSpaces + " •Set variable to expression:" + funzioneTMP.simbolo());
FunzioneBase var = ((FunzioneAnterioreBase) funzioneTMP).getVariable().calcola();
Utils.debug.println(debugSpaces + " •Set variable to expression:" + funzioneTMP.getSymbol());
FunctionBase var = ((AnteriorFunctionBase) funzioneTMP).getVariable().solve();
if (var == null) {
Utils.debug.println(debugSpaces + " " + "var=null");
} else {
@ -504,7 +513,7 @@ public class Espressione extends FunzioneMultiplaBase {
throw new java.lang.RuntimeException("Argomenti mancanti! Sistemare l'equazione!");
}
}
} else if (funzioneTMP instanceof Termine || funzioneTMP instanceof Espressione) {
} else if (funzioneTMP instanceof Number || funzioneTMP instanceof Expression) {
if (n < 300) {
// Utils.debug.println(debugSpaces+" •Set variable
// to number:"+funzioneTMP.calcola());
@ -515,9 +524,9 @@ public class Espressione extends FunzioneMultiplaBase {
i++;
n++;
}
} while (((funzioniOLD.size() != before || fase != "somme") && funzioniOLD.size() > 1));
} while (((oldFunctionsList.size() != before || step != "sums") && oldFunctionsList.size() > 1));
}
setVariables(funzioniOLD);
setVariables(oldFunctionsList);
dsl = debugSpaces.length();
debugSpaces = "";
@ -526,36 +535,36 @@ public class Espressione extends FunzioneMultiplaBase {
}
Utils.debug.println(debugSpaces + "•Finished correcting classes.");
Termine result = calcola();
Number result = solve();
Utils.debug.println(debugSpaces + "•Result:" + result);
}
}
@Override
public String simbolo() {
public String getSymbol() {
return "Parentesi";
}
@Override
public Termine calcola() throws Errore {
public Number solve() throws Error {
if (variables.length == 0) {
return new Termine("0");
return new Number("0");
} else if (variables.length == 1) {
return (Termine) variables[0].calcola();
return (Number) variables[0].solve();
} else {
Termine result = new Termine("0");
for (Funzione f : variables) {
result = result.add((Termine) f.calcola());
Number result = new Number("0");
for (Function f : variables) {
result = result.add((Number) f.solve());
}
return result;
}
}
@Override
public void calcolaGrafica() {
for (Funzione var : variables) {
public void generateGraphics() {
for (Function var : variables) {
var.setSmall(small);
var.calcolaGrafica();
var.generateGraphics();
}
width = calcWidth();
@ -565,11 +574,11 @@ public class Espressione extends FunzioneMultiplaBase {
public boolean parenthesesNeeded() {
boolean parenthesesneeded = true;
if (parentesiIniziale) {
if (initialParenthesis) {
parenthesesneeded = false;
} else {
if (variables.length == 1) {
if (variables[0] instanceof Divisione) {
if (variables[0] instanceof Division) {
parenthesesneeded = false;
} else {
parenthesesneeded = true;
@ -593,7 +602,7 @@ public class Espressione extends FunzioneMultiplaBase {
glDrawLine(x, y + 2, x, y + h - 3);
glDrawLine(x, y + h - 3, x + 2, y + h - 1);
x += 4;
for (Funzione f : variables) {
for (Function f : variables) {
float fheight = f.getHeight();
float y2 = miny + ((maxy - miny) / 2 - fheight / 2);
f.draw(x, (int) y2);
@ -617,7 +626,7 @@ public class Espressione extends FunzioneMultiplaBase {
return this.variables[0].getWidth();
} else {
int w = 0;
for (Funzione f : variables) {
for (Function f : variables) {
w += f.getWidth();
}
return 1 + 4 + w + 2 + 4;
@ -630,12 +639,12 @@ public class Espressione extends FunzioneMultiplaBase {
}
private int calcHeight() {
if (parentesiIniziale || variables.length == 1) {
if (initialParenthesis || variables.length == 1) {
return this.variables[0].getHeight();
} else {
Funzione tmin = null;
Funzione tmax = null;
for (Funzione t : variables) {
Function tmin = null;
Function tmax = null;
for (Function t : variables) {
if (tmin == null || t.getLine() >= tmin.getLine()) {
tmin = t;
}
@ -655,11 +664,11 @@ public class Espressione extends FunzioneMultiplaBase {
}
private int calcLine() {
if (parentesiIniziale || variables.length == 1) {
if (initialParenthesis || variables.length == 1) {
return this.variables[0].getLine();
} else {
Funzione tl = null;
for (Funzione t : variables) {
Function tl = null;
for (Function t : variables) {
if (tl == null || t.getLine() >= tl.getLine()) {
tl = t;
}

8
src/org/warp/picalculator/Funzione.java → src/org/warp/picalculator/Function.java
View File

@ -1,11 +1,11 @@
package org.warp.picalculator;
public interface Funzione {
public String simbolo();
public interface Function {
public String getSymbol();
public Funzione calcola() throws Errore;
public Function solve() throws Error;
public void calcolaGrafica();
public void generateGraphics();
public void draw(int x, int y);

8
src/org/warp/picalculator/FunzioneBase.java → src/org/warp/picalculator/FunctionBase.java
View File

@ -1,15 +1,15 @@
package org.warp.picalculator;
public abstract class FunzioneBase implements Funzione {
public abstract class FunctionBase implements Function {
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Termine calcola() throws Errore;
public abstract Number solve() throws Error;
@Override
public abstract void calcolaGrafica();
public abstract void generateGraphics();
@Override
public abstract void draw(int x, int y);

36
src/org/warp/picalculator/FunzioneMultipla.java → src/org/warp/picalculator/FunctionMultipleValues.java
View File

@ -5,47 +5,47 @@ import java.util.List;
import com.rits.cloning.Cloner;
public abstract class FunzioneMultipla implements Funzione {
public FunzioneMultipla() {
setVariables(new Funzione[] {});
public abstract class FunctionMultipleValues implements Function {
public FunctionMultipleValues() {
setVariables(new Function[] {});
}
public FunzioneMultipla(Funzione[] values) {
public FunctionMultipleValues(Function[] values) {
setVariables(values);
}
protected Funzione[] variables;
protected Function[] variables;
protected int width;
protected int height;
protected int line;
protected boolean small;
public Funzione[] getVariables() {
public Function[] getVariables() {
return variables;
}
public void setVariables(Funzione[] value) {
public void setVariables(Function[] value) {
variables = value;
}
public void setVariables(final List<Funzione> value) {
public void setVariables(final List<Function> value) {
int vsize = value.size();
Funzione[] tmp = new Funzione[vsize];
Function[] tmp = new Function[vsize];
for (int i = 0; i < vsize; i++) {
tmp[i] = value.get(i);
}
variables = tmp;
}
public Funzione getVariable(int index) {
public Function getVariable(int index) {
return variables[index];
}
public void setVariable(int index, Funzione value) {
public void setVariable(int index, Function value) {
variables[index] = value;
}
public void addVariableToEnd(Funzione value) {
public void addVariableToEnd(Function value) {
int index = variables.length;
setVariablesLength(index + 1);
variables[index] = value;
@ -60,25 +60,25 @@ public abstract class FunzioneMultipla implements Funzione {
}
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Funzione calcola() throws Errore;
public abstract Function solve() throws Error;
@Override
public abstract void calcolaGrafica();
public abstract void generateGraphics();
@Override
public String toString() {
try {
return calcola().toString();
} catch (Errore e) {
return solve().toString();
} catch (Error e) {
return e.id.toString();
}
}
@Override
public Funzione clone() {
public Function clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}

36
src/org/warp/picalculator/FunzioneMultiplaBase.java → src/org/warp/picalculator/FunctionMultipleValuesBase.java
View File

@ -5,47 +5,47 @@ import java.util.List;
import com.rits.cloning.Cloner;
public abstract class FunzioneMultiplaBase extends FunzioneBase {
public FunzioneMultiplaBase() {
setVariables(new FunzioneBase[] {});
public abstract class FunctionMultipleValuesBase extends FunctionBase {
public FunctionMultipleValuesBase() {
setVariables(new FunctionBase[] {});
}
public FunzioneMultiplaBase(FunzioneBase[] values) {
public FunctionMultipleValuesBase(FunctionBase[] values) {
setVariables(values);
}
protected FunzioneBase[] variables;
protected FunctionBase[] variables;
protected int width;
protected int height;
protected int line;
protected boolean small;
public FunzioneBase[] getVariables() {
public FunctionBase[] getVariables() {
return variables;
}
public void setVariables(FunzioneBase[] value) {
public void setVariables(FunctionBase[] value) {
variables = value;
}
public void setVariables(final List<FunzioneBase> value) {
public void setVariables(final List<FunctionBase> value) {
int vsize = value.size();
FunzioneBase[] tmp = new FunzioneBase[vsize];
FunctionBase[] tmp = new FunctionBase[vsize];
for (int i = 0; i < vsize; i++) {
tmp[i] = value.get(i);
}
variables = tmp;
}
public FunzioneBase getVariable(int index) {
public FunctionBase getVariable(int index) {
return variables[index];
}
public void setVariable(int index, FunzioneBase value) {
public void setVariable(int index, FunctionBase value) {
variables[index] = value;
}
public void addVariableToEnd(FunzioneBase value) {
public void addVariableToEnd(FunctionBase value) {
int index = variables.length;
setVariablesLength(index + 1);
variables[index] = value;
@ -60,25 +60,25 @@ public abstract class FunzioneMultiplaBase extends FunzioneBase {
}
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Termine calcola() throws Errore;
public abstract Number solve() throws Error;
@Override
public abstract void calcolaGrafica();
public abstract void generateGraphics();
@Override
public String toString() {
try {
return calcola().toString();
} catch (Errore e) {
return solve().toString();
} catch (Error e) {
return e.id.toString();
}
}
@Override
public FunzioneMultiplaBase clone() {
public FunctionMultipleValuesBase clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}

44
src/org/warp/picalculator/FunzioneDueValori.java → src/org/warp/picalculator/FunctionTwoValues.java
View File

@ -9,49 +9,49 @@ import org.warp.engine.Display;
import com.rits.cloning.Cloner;
public abstract class FunzioneDueValori implements Funzione {
public FunzioneDueValori(Funzione value1, Funzione value2) {
public abstract class FunctionTwoValues implements Function {
public FunctionTwoValues(Function value1, Function value2) {
setVariable1(value1);
setVariable2(value2);
}
protected Funzione variable1 = new Termine(Rational.ZERO);
protected Function variable1 = new Number(Rational.ZERO);
protected int width;
protected int height;
protected int line;
protected boolean small;
public Funzione getVariable1() {
public Function getVariable1() {
return variable1;
}
public void setVariable1(Funzione value) {
public void setVariable1(Function value) {
variable1 = value;
}
protected Funzione variable2 = new Termine(Rational.ZERO);
protected Function variable2 = new Number(Rational.ZERO);
public Funzione getVariable2() {
public Function getVariable2() {
return variable2;
}
public void setVariable2(Funzione value) {
public void setVariable2(Function value) {
variable2 = value;
}
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Funzione calcola() throws Errore;
public abstract Function solve() throws Error;
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable1.setSmall(small);
variable1.calcolaGrafica();
variable1.generateGraphics();
variable2.setSmall(small);
variable2.calcolaGrafica();
variable2.generateGraphics();
width = calcWidth();
height = calcHeight();
@ -70,8 +70,8 @@ public abstract class FunzioneDueValori implements Funzione {
} else {
Display.Render.setFont(PIDisplay.fonts[1]);
}
glDrawStringLeft(dx + x, ln - Utils.getFontHeight(small) / 2 + y, simbolo());
dx += getStringWidth(simbolo());
glDrawStringLeft(dx + x, ln - Utils.getFontHeight(small) / 2 + y, getSymbol());
dx += getStringWidth(getSymbol());
}
variable2.draw(dx + x, ln - variable2.getLine() + y);
}
@ -94,14 +94,14 @@ public abstract class FunzioneDueValori implements Funzione {
@Override
public String toString() {
try {
return calcola().toString();
} catch (Errore e) {
return solve().toString();
} catch (Error e) {
return e.id.toString();
}
}
@Override
public FunzioneDueValori clone() {
public FunctionTwoValues clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}
@ -116,13 +116,13 @@ public abstract class FunzioneDueValori implements Funzione {
}
protected int calcWidth() {
return variable1.getWidth() + 1 + (drawSignum() ? getStringWidth(simbolo()) : 0) + variable2.getWidth();
return variable1.getWidth() + 1 + (drawSignum() ? getStringWidth(getSymbol()) : 0) + variable2.getWidth();
}
protected int calcHeight() {
Funzione tmin = variable1;
Funzione tmax = variable1;
Function tmin = variable1;
Function tmax = variable1;
if (tmin == null || variable2.getLine() >= tmin.getLine()) {
tmin = variable2;
}
@ -133,7 +133,7 @@ public abstract class FunzioneDueValori implements Funzione {
}
protected int calcLine() {
Funzione tl = variable1;
Function tl = variable1;
if (tl == null || variable2.getLine() >= tl.getLine()) {
tl = variable2;
}

44
src/org/warp/picalculator/FunzioneDueValoriBase.java → src/org/warp/picalculator/FunctionTwoValuesBase.java
View File

@ -9,49 +9,49 @@ import org.warp.engine.Display;
import com.rits.cloning.Cloner;
public abstract class FunzioneDueValoriBase extends FunzioneBase {
public FunzioneDueValoriBase(FunzioneBase value1, FunzioneBase value2) {
public abstract class FunctionTwoValuesBase extends FunctionBase {
public FunctionTwoValuesBase(FunctionBase value1, FunctionBase value2) {
setVariable1(value1);
setVariable2(value2);
}
protected FunzioneBase variable1 = new Termine(Rational.ZERO);
protected FunctionBase variable1 = new Number(Rational.ZERO);
protected int width;
protected int height;
protected int line;
protected boolean small;
public FunzioneBase getVariable1() {
public FunctionBase getVariable1() {
return variable1;
}
public void setVariable1(FunzioneBase value) {
public void setVariable1(FunctionBase value) {
variable1 = value;
}
protected FunzioneBase variable2 = new Termine(Rational.ZERO);
protected FunctionBase variable2 = new Number(Rational.ZERO);
public FunzioneBase getVariable2() {
public FunctionBase getVariable2() {
return variable2;
}
public void setVariable2(FunzioneBase value) {
public void setVariable2(FunctionBase value) {
variable2 = value;
}
@Override
public abstract String simbolo();
public abstract String getSymbol();
@Override
public abstract Termine calcola() throws Errore;
public abstract Number solve() throws Error;
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable1.setSmall(small);
variable1.calcolaGrafica();
variable1.generateGraphics();
variable2.setSmall(small);
variable2.calcolaGrafica();
variable2.generateGraphics();
width = calcWidth();
height = calcHeight();
@ -70,8 +70,8 @@ public abstract class FunzioneDueValoriBase extends FunzioneBase {
} else {
Display.Render.setFont(PIDisplay.fonts[0]);
}
glDrawStringLeft(dx + x, ln - Utils.getFontHeight(small) / 2 + y, simbolo());
dx += getStringWidth(simbolo());
glDrawStringLeft(dx + x, ln - Utils.getFontHeight(small) / 2 + y, getSymbol());
dx += getStringWidth(getSymbol());
}
variable2.draw(dx + x, ln - variable2.getLine() + y);
}
@ -94,14 +94,14 @@ public abstract class FunzioneDueValoriBase extends FunzioneBase {
@Override
public String toString() {
try {
return calcola().toString();
} catch (Errore e) {
return solve().toString();
} catch (Error e) {
return e.id.toString();
}
}
@Override
public FunzioneDueValoriBase clone() {
public FunctionTwoValuesBase clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}
@ -116,13 +116,13 @@ public abstract class FunzioneDueValoriBase extends FunzioneBase {
}
protected int calcWidth() {
return variable1.getWidth() + 1 + (drawSignum() ? getStringWidth(simbolo()) : 0) + variable2.getWidth();
return variable1.getWidth() + 1 + (drawSignum() ? getStringWidth(getSymbol()) : 0) + variable2.getWidth();
}
protected int calcHeight() {
FunzioneBase tmin = variable1;
FunzioneBase tmax = variable1;
FunctionBase tmin = variable1;
FunctionBase tmax = variable1;
if (tmin == null || variable2.getLine() >= tmin.getLine()) {
tmin = variable2;
}
@ -133,7 +133,7 @@ public abstract class FunzioneDueValoriBase extends FunzioneBase {
}
protected int calcLine() {
FunzioneBase tl = variable1;
FunctionBase tl = variable1;
if (tl == null || variable2.getLine() >= tl.getLine()) {
tl = variable2;
}

40
src/org/warp/picalculator/Incognita.java
View File

@ -1,40 +0,0 @@
package org.warp.picalculator;
import org.nevec.rjm.Rational;
public class Incognita {
public char simbolo = 'X';
public Rational esponente = Rational.ONE;
public Incognita(char simbolo, Rational esponente) {
this.simbolo = simbolo;
this.esponente = esponente;
}
public Incognita(char simbolo, int a, int b) {
this.simbolo = simbolo;
this.esponente = new Rational(a, b);
}
public Incognita(char simbolo) {
this.simbolo = simbolo;
this.esponente = new Rational(1, 1);
}
@Override
public boolean equals(Object o) {
if (o instanceof Incognita) {
if (this.simbolo == ((Incognita) o).simbolo) {
if (this.esponente == ((Incognita) o).esponente) {
return true;
}
}
}
return false;
}
@Override
public int hashCode() {
return Character.getNumericValue(simbolo) * 3 + esponente.hashCode();
}
}

391
src/org/warp/picalculator/Incognite.java
View File

@ -1,391 +0,0 @@
package org.warp.picalculator;
import java.math.BigInteger;
import java.util.Comparator;
import java.util.Vector;
import org.nevec.rjm.BigIntegerMath;
import org.nevec.rjm.Rational;
public class Incognite {
Vector<Incognita> incognite;
public Incognite() {
incognite = new Vector<Incognita>();
}
public Incognite(Incognita[] value) {
this();
for (Incognita i : value) {
incognite.add(i);
}
}
public Incognite(Vector<Incognita> value) {
this();
incognite = value;
}
public Incognite(Incognita value) {
this();
incognite.add(value);
}
public int count() {
return incognite.size();
}
public boolean contieneSimbolo(char simbolo) {
for (Incognita i : incognite) {
if (i.simbolo == simbolo) {
return true;
}
}
return false;
}
public Rational prendiEsponenteSimbolo(char simbolo) {
for (Incognita i : incognite) {
if (i.simbolo == simbolo) {
return i.esponente;
}
}
return new Rational(0, 1);
}
public void impostaEsponenteSimbolo(char simbolo, Rational esponente) {
for (Incognita i : incognite) {
if (i.simbolo == simbolo) {
i.esponente = esponente;
}
}
}
@SuppressWarnings("unchecked")
@Override
public Incognite clone() {
return new Incognite((Vector<Incognita>) incognite.clone()).normalize();
}
public Incognite multiply(Incognite val) {
Incognite result = new Incognite();
// Passaggio 1: test vari
// Se il primo gruppo di incognite à nullo allora ritorna il secondo
// gruppo
if (this.count() == 0) {
result = val.clone();
return result;
}
// Se il secondo gruppo di incognite à nullo allora ritorna il primo
// gruppo
if (val.count() == 0) {
result = this.clone();
return result;
}
// Passaggio 2: le incognite doppie vengono raggruppate.
for (Incognita i1 : incognite) {
for (Incognita i2 : val.incognite) {
if (i1.simbolo == i2.simbolo) {
if (!result.contieneSimbolo(i1.simbolo)) {
Incognita ir = new Incognita(i1.simbolo, i1.esponente.add(i2.esponente));
result.incognite.add(ir);
}
}
}
}
// Passaggio 3: le incognite non ancora presenti vengono aggiunte.
for (Incognita i : incognite) {
if (!result.contieneSimbolo(i.simbolo)) {
result.incognite.add(i);
}
}
for (Incognita i : val.incognite) {
if (!result.contieneSimbolo(i.simbolo)) {
result.incognite.add(i);
}
}
return result.normalize();
}
public Incognite divide(Incognite val) {
Incognite result = new Incognite();
// Passaggio 2: le incognite doppie vengono raggruppate.
for (Incognita i1 : incognite) {
for (Incognita i2 : val.incognite) {
if (i1.simbolo == i2.simbolo) {
if (!result.contieneSimbolo(i1.simbolo)) {
Incognita ir = new Incognita(i1.simbolo, i1.esponente.add(i2.esponente.multiply(new Rational(-1, 1))));
result.incognite.add(ir);
}
}
}
}
// Passaggio 3: le incognite non ancora presenti vengono aggiunte.
for (Incognita i : incognite) {
if (!result.contieneSimbolo(i.simbolo)) {
result.incognite.add(i);
}
}
for (Incognita i : val.incognite) {
if (!result.contieneSimbolo(i.simbolo)) {
result.incognite.add(new Incognita(i.simbolo, i.esponente.multiply(new Rational(-1, 1))));
}
}
return result.normalize();
}
public Incognite sqrt() {
Incognite result = new Incognite();
for (Incognita i1 : incognite) {
Incognita ir = null;
try {
ir = new Incognita(i1.simbolo, i1.esponente.divide(new Rational(2, 1)));
} catch (Errore e) {
e.printStackTrace();
}
result.incognite.add(ir);
}
return result.normalize();
}
public Incognite normalize() {
Incognite result = new Incognite();
for (Incognita i1 : incognite) {
if (i1.esponente.compareTo(Rational.ZERO) != 0) {
result.incognite.add(i1);
}
}
result.incognite.sort(new Comparator<Incognita>() {
@Override
public int compare(Incognita o1, Incognita o2) {
int index1 = letterIndex(o1.simbolo);
int index2 = letterIndex(o2.simbolo);
return index1 - index2;
}
});
return result;
}
public byte letterIndex(char l) {
return letterIndex(l, false);
}
public static byte letterIndex(char l, boolean reverse) {
int total = Simboli.incognite().length - 1;
for (byte x = 0; x < Simboli.incognite().length; x++) {
if (Simboli.incognite()[x].equals("" + l)) {
if (reverse) {
return (byte) (total - x);
} else {
return x;
}
}
}
return -1;
}
public boolean compareTo(Incognite val) {
if (this.equals(val))
return true;
return false;
}
@Override
public boolean equals(Object val) {
if (val == null)
return false;
if (val instanceof Incognite) {
Incognite ii2 = (Incognite) val;
for (Incognita i1 : incognite) {
boolean found = false;
for (Incognita i2 : ii2.incognite) {
if (i1.simbolo == i2.simbolo) {
if (i1.esponente.compareTo(i2.esponente) != 0)
return false;
found = true;
}
}
if (!found) {
return false;
}
}
for (Incognita i1 : ii2.incognite) {
boolean found = false;
for (Incognita i2 : incognite) {
if (i1.simbolo == i2.simbolo) {
if (i1.esponente.compareTo(i2.esponente) != 0)
return false;
found = true;
}
}
if (!found) {
return false;
}
}
return true;
}
return false;
}
@Override
public String toString() {
String result = "";
if (incognite.size() != 1) {
for (Incognita i : incognite) {
if (i.esponente.compareTo(Rational.ONE) != 0) {
result += "(" + i.simbolo + "^" + i.esponente + ")";
} else {
result += i.simbolo;
}
}
} else if (incognite.size() == 1) {
Incognita i = incognite.get(0);
if (i.esponente.compareTo(Rational.ONE) != 0) {
result += "" + i.simbolo + "^" + i.esponente + "";
} else if (i.esponente.compareTo(Rational.ONE) == 0) {
result += i.simbolo;
}
}
return result;
}
public static Incognite lcm(Incognite val1, Incognite val2) {
Incognite result = new Incognite();
// Passaggio 1: test vari
// Se il primo gruppo di incognite à nullo allora ritorna il secondo
// gruppo
if (val1.count() == 0) {
result = val2.clone();
return result;
}
// Se il secondo gruppo di incognite à nullo allora ritorna il primo
// gruppo
if (val2.count() == 0) {
result = val1.clone();
return result;
}
// Passaggio 2: le incognite doppie vengono raggruppate.
for (Incognita i1 : val1.incognite) {
for (Incognita i2 : val2.incognite) {
if (i1.simbolo == i2.simbolo) {
if (!result.contieneSimbolo(i1.simbolo)) {
Incognita ir = new Incognita(i1.simbolo);
if (i1.esponente.compareTo(i2.esponente) > 0) {
ir.esponente = i1.esponente;
} else {
ir.esponente = i2.esponente;
}
result.incognite.add(ir);
}
}
}
}
// Passaggio 3: le incognite non ancora presenti vengono aggiunte.
for (Incognita i : val1.incognite) {
if (!result.contieneSimbolo(i.simbolo)) {
result.incognite.add(i);
}
}
for (Incognita i : val2.incognite) {
if (!result.contieneSimbolo(i.simbolo)) {
result.incognite.add(i);
}
}
return result.normalize();
}
@SuppressWarnings("unchecked")
public Vector<Incognita> listaIncognite() {
return (Vector<Incognita>) this.incognite.clone();
}
public static Incognite[] normalizeBigSurdVariables(Incognite[] incognitetemp) throws Errore {
Incognite incognitex = incognitetemp[0].clone();
Incognite incognitey = incognitetemp[1].clone();
Incognite incognitez = incognitetemp[2].clone();
Incognite newincognitex = new Incognite();
for (Incognita i : incognitex.incognite) {
Vector<BigInteger> divisori = BigIntegerMath.divisors(i.esponente.divide(2).denom());
if (divisori.contains(new BigInteger("2"))) {
newincognitex = newincognitex.multiply(new Incognite(i));
} else {
incognitey = incognitey.multiply(new Incognite(new Incognita(i.simbolo, i.esponente.divide(2))));
}
}
incognitex = newincognitex;
for (Incognita i : incognitey.incognite) {
if (i.esponente.signum() < 0) {
incognitey = incognitey.divide(new Incognite(i));
incognitez = incognitez.divide(new Incognite(i));
}
}
for (Incognita i : incognitez.incognite) {
if (i.esponente.signum() < 0) {
incognitey = incognitey.divide(new Incognite(i));
incognitez = incognitez.divide(new Incognite(i));
}
}
// TODO: SPOSTARE LE Y NEGATIVE SOTTO LA FRAZIONE, DALLA Y ALLA Z
Incognite incogniteyresult = new Incognite();
Incognite incognitezresult = new Incognite();
// Le incognite doppie vengono tolte
for (Incognita i1 : incognitey.incognite) {
for (Incognita i2 : incognitez.incognite) {
if (i1.simbolo == i2.simbolo) {
if (i1.esponente.compareTo(i2.esponente) > 0) {
incogniteyresult = incogniteyresult.multiply(new Incognite(new Incognita(i1.simbolo, i1.esponente.subtract(i2.esponente))));
} else if (i2.esponente.compareTo(i1.esponente) > 0) {
incognitezresult = incognitezresult.multiply(new Incognite(new Incognita(i1.simbolo, i2.esponente.subtract(i1.esponente))));
}
}
}
}
// Le altre incognite vengono ri-messe
for (Incognita i : incognitey.incognite) {
if (!incogniteyresult.contieneSimbolo(i.simbolo)) {
incogniteyresult = incogniteyresult.multiply(new Incognite(i));
}
}
for (Incognita i : incognitez.incognite) {
if (!incognitezresult.contieneSimbolo(i.simbolo)) {
incognitezresult = incognitezresult.multiply(new Incognite(i));
}
}
incognitey = incogniteyresult;
incognitez = incognitezresult;
return new Incognite[] { incognitex, incognitey, incognitez };
}
public static int priorità(Incognite ii) {
double priorità = 0;
double letterMax = 0;
for (Incognita i : ii.incognite) {
int lettIndex = letterIndex(i.simbolo, true);
if (lettIndex > letterMax) {
letterMax = lettIndex;
}
}
priorità += letterMax * 100000;
for (Incognita i : ii.incognite) {
int lettIndex = letterIndex(i.simbolo, true);
if (letterMax == lettIndex) {
priorità += i.esponente.doubleValue() * 100000;
}
priorità += +i.esponente.doubleValue();
}
return (int) priorità;
}
}

9
src/org/warp/picalculator/Main.java
View File

@ -47,15 +47,6 @@ public class Main {
}
public static void main(String[] args) throws InterruptedException {
try {
Termine t = new Termine("9999.9");
Termine r = t.calcola();
System.out.println(t.toString());
System.out.println(r.toString());
} catch (Errore e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
new Main();
}
}

22
src/org/warp/picalculator/Simboli.java → src/org/warp/picalculator/MathematicalSymbols.java
View File

@ -2,7 +2,7 @@ package org.warp.picalculator;
import static org.warp.picalculator.Utils.concat;
public class Simboli {
public class MathematicalSymbols {
public static final String SUM = "+";
public static final String SUBTRACTION = "-";
public static final String MULTIPLICATION = "*";
@ -12,23 +12,23 @@ public class Simboli {
public static final String SQUARE_ROOT = "Ⓐ";
public static final String PARENTHESIS_OPEN = "(";
public static final String PARENTHESIS_CLOSE = ")";
public static final String POTENZA = "Ⓑ";
public static final String POWER = "Ⓑ";
public static final String EQUATION = "=";
public static final String SYSTEM = "{";
public static final String[] funzioni() {
return concat(funzioniNSN(), funzioniSN());
public static final String[] functions() {
return concat(functionsNSN(), functionsSN());
}
public static final String[] funzioniNSN() {
return new String[] { NTH_ROOT, POTENZA };
public static final String[] functionsNSN() {
return new String[] { NTH_ROOT, POWER };
}
public static final String[] funzioniSN() {
public static final String[] functionsSN() {
return new String[] { SQUARE_ROOT };
}
public static final String[] segni(boolean withMultiplication, boolean withPrioritaryMultiplication) {
public static final String[] signums(boolean withMultiplication, boolean withPrioritaryMultiplication) {
String[] ret = new String[] { SUM, DIVISION };
if (withMultiplication) {
ret = Utils.add(ret, MULTIPLICATION);
@ -39,15 +39,15 @@ public class Simboli {
return ret;
}
public static final String[] parentesi() {
public static final String[] parentheses() {
return new String[] { PARENTHESIS_OPEN, PARENTHESIS_CLOSE };
}
public static String[] incognite() {
public static String[] variables() {
return new String[] { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
}
public static String[] sintassiGenerale() {
public static String[] genericSyntax() {
return new String[] { SYSTEM, EQUATION };
}
}

81
src/org/warp/picalculator/Moltiplicazione.java
View File

@ -1,81 +0,0 @@
package org.warp.picalculator;
import java.math.BigInteger;
public class Moltiplicazione extends FunzioneDueValoriBase {
public Moltiplicazione(FunzioneBase value1, FunzioneBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.MULTIPLICATION;
}
@Override
public Termine calcola() throws Errore {
return getVariable1().calcola().multiply(getVariable2().calcola());
}
@Override
public boolean drawSignum() {
Funzione[] tmpVar = new Funzione[] { variable1, variable2 };
boolean[] ok = new boolean[] { false, false };
for (int val = 0; val < 2; val++) {
while (!ok[val]) {
if (tmpVar[val] instanceof Divisione) {
ok[0] = true;
ok[1] = true;
} else if (tmpVar[val] instanceof Incognita) {
ok[val] = true;
} else if (tmpVar[val] instanceof Termine) {
if (val == 0) {
ok[val] = true;
} else {
if (!(tmpVar[0] instanceof Termine)) {
ok[val] = true;
} else {
if (((Termine) tmpVar[val]).term.isBigInteger(false)) { // TODO: prima era tmpVar[0], ma crashava. RICONTROLLARE! La logica potrebbe essere sbagliata
if (((Termine) tmpVar[val]).term.toBigInteger(true).compareTo(new BigInteger("1")) == 0) {
if (((Termine) tmpVar[val]).term.toNumeroAvanzato().getIncognitey().count() > 0) {
ok[val] = true;
} else {
break;
}
} else {
break;
}
} else {
ok[val] = true;
}
}
}
} else if (tmpVar[val] instanceof Potenza) {
tmpVar[val] = ((Potenza) tmpVar[val]).variable1;
} else if (tmpVar[val] instanceof Radice) {
ok[val] = true;
} else if (tmpVar[val] instanceof RadiceQuadrata) {
ok[val] = true;
} else if (tmpVar[val] instanceof Espressione) {
ok[0] = true;
ok[1] = true;
} else if (tmpVar[val] instanceof FunzioneDueValoriBase) {
if (val == 0) {
tmpVar[val] = ((FunzioneDueValoriBase) tmpVar[val]).variable2;
} else {
tmpVar[val] = ((FunzioneDueValoriBase) tmpVar[val]).variable1;
}
} else if (tmpVar[val] instanceof FunzioneAnterioreBase) {
tmpVar[val] = ((FunzioneAnterioreBase) tmpVar[val]).variable;
}
}
}
if (ok[0] == true && ok[1] == true) {
return false;
} else {
return true;
}
}
}

23
src/org/warp/picalculator/MoltiplicazionePrioritaria.java
View File

@ -1,23 +0,0 @@
package org.warp.picalculator;
public class MoltiplicazionePrioritaria extends FunzioneDueValoriBase {
public MoltiplicazionePrioritaria(FunzioneBase value1, FunzioneBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.PRIORITARY_MULTIPLICATION;
}
@Override
public Termine calcola() throws Errore {
return getVariable1().calcola().multiply(getVariable2().calcola());
}
@Override
public boolean drawSignum() {
return false;
}
}

81
src/org/warp/picalculator/Multiplication.java Normal file
View File

@ -0,0 +1,81 @@
package org.warp.picalculator;
import java.math.BigInteger;
public class Multiplication extends FunctionTwoValuesBase {
public Multiplication(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String getSymbol() {
return MathematicalSymbols.MULTIPLICATION;
}
@Override
public Number solve() throws Error {
return getVariable1().solve().multiply(getVariable2().solve());
}
@Override
public boolean drawSignum() {
Function[] tmpVar = new Function[] { variable1, variable2 };
boolean[] ok = new boolean[] { false, false };
for (int val = 0; val < 2; val++) {
while (!ok[val]) {
if (tmpVar[val] instanceof Division) {
ok[0] = true;
ok[1] = true;
} else if (tmpVar[val] instanceof Variable) {
ok[val] = true;
} else if (tmpVar[val] instanceof Number) {
if (val == 0) {
ok[val] = true;
} else {
if (!(tmpVar[0] instanceof Number)) {
ok[val] = true;
} else {
if (((Number) tmpVar[val]).term.isBigInteger(false)) { // TODO: prima era tmpVar[0], ma crashava. RICONTROLLARE! La logica potrebbe essere sbagliata
if (((Number) tmpVar[val]).term.toBigInteger(true).compareTo(new BigInteger("1")) == 0) {
if (((Number) tmpVar[val]).term.toNumeroAvanzato().getVariableY().count() > 0) {
ok[val] = true;
} else {
break;
}
} else {
break;
}
} else {
ok[val] = true;
}
}
}
} else if (tmpVar[val] instanceof Power) {
tmpVar[val] = ((Power) tmpVar[val]).variable1;
} else if (tmpVar[val] instanceof Root) {
ok[val] = true;
} else if (tmpVar[val] instanceof RootSquare) {
ok[val] = true;
} else if (tmpVar[val] instanceof Expression) {
ok[0] = true;
ok[1] = true;
} else if (tmpVar[val] instanceof FunctionTwoValuesBase) {
if (val == 0) {
tmpVar[val] = ((FunctionTwoValuesBase) tmpVar[val]).variable2;
} else {
tmpVar[val] = ((FunctionTwoValuesBase) tmpVar[val]).variable1;
}
} else if (tmpVar[val] instanceof AnteriorFunctionBase) {
tmpVar[val] = ((AnteriorFunctionBase) tmpVar[val]).variable;
}
}
}
if (ok[0] == true && ok[1] == true) {
return false;
} else {
return true;
}
}
}

52
src/org/warp/picalculator/Termine.java → src/org/warp/picalculator/Number.java
View File

@ -18,7 +18,7 @@ import org.warp.engine.Display;
import com.rits.cloning.Cloner;
public class Termine extends FunzioneBase {
public class Number extends FunctionBase {
protected NumeroAvanzatoVec term = NumeroAvanzatoVec.ZERO;
protected int width;
@ -26,27 +26,27 @@ public class Termine extends FunzioneBase {
protected int line;
protected boolean small;
public Termine(NumeroAvanzatoVec val) {
public Number(NumeroAvanzatoVec val) {
term = val;
}
public Termine(String s) throws Errore {
public Number(String s) throws Error {
term = new NumeroAvanzatoVec(new NumeroAvanzato(Utils.getRational(s), Rational.ONE));
}
public Termine(Rational r) {
public Number(Rational r) {
term = new NumeroAvanzatoVec(new NumeroAvanzato(r, Rational.ONE));
}
public Termine(BigInteger r) {
public Number(BigInteger r) {
term = new NumeroAvanzatoVec(new NumeroAvanzato(new Rational(r, BigInteger.ONE), Rational.ONE));
}
public Termine(BigDecimal r) {
public Number(BigDecimal r) {
term = new NumeroAvanzatoVec(new NumeroAvanzato(Utils.getRational(r), Rational.ONE));
}
public Termine(NumeroAvanzato numeroAvanzato) {
public Number(NumeroAvanzato numeroAvanzato) {
term = new NumeroAvanzatoVec(numeroAvanzato);
}
@ -59,42 +59,42 @@ public class Termine extends FunzioneBase {
}
@Override
public void calcolaGrafica() {
public void generateGraphics() {
line = calcLine(); //TODO pp
height = calcHeight();
width = calcWidth();
}
@Override
public Termine calcola() {
public Number solve() {
return this;
}
@Override
public String simbolo() {
public String getSymbol() {
return toString();
}
public Termine add(Termine f) throws Errore {
Termine ret = new Termine(getTerm().add(f.getTerm()));
public Number add(Number f) throws Error {
Number ret = new Number(getTerm().add(f.getTerm()));
return ret;
}
public Termine multiply(Termine f) throws Errore {
Termine ret = new Termine(getTerm().multiply(f.getTerm()));
public Number multiply(Number f) throws Error {
Number ret = new Number(getTerm().multiply(f.getTerm()));
return ret;
}
public Termine divide(Termine f) throws Errore {
Termine ret = new Termine(getTerm().divide(f.getTerm()));
public Number divide(Number f) throws Error {
Number ret = new Number(getTerm().divide(f.getTerm()));
return ret;
}
public Termine pow(Termine f) throws Errore {
Termine ret = new Termine(NumeroAvanzatoVec.ONE);
public Number pow(Number f) throws Error {
Number ret = new Number(NumeroAvanzatoVec.ONE);
if (f.getTerm().isBigInteger(true)) {
for (BigInteger i = BigInteger.ZERO; i.compareTo(f.getTerm().toBigInteger(true)) < 0; i = i.add(BigInteger.ONE)) {
ret = ret.multiply(new Termine(getTerm()));
ret = ret.multiply(new Number(getTerm()));
}
} else if (getTerm().isRational(true) && f.getTerm().isRational(false) && f.getTerm().toRational(false).compareTo(Rational.HALF) == 0) {
// Rational originalExponent = f.getTerm().toRational();
@ -102,12 +102,12 @@ public class Termine extends FunzioneBase {
// originalExponent.numer());
Rational numberToRoot = getTerm().toRational(true);
NumeroAvanzato na = new NumeroAvanzato(Rational.ONE, numberToRoot);
na = na.setIncognitex(getTerm().toNumeroAvanzato().getIncognitey().multiply(getTerm().toNumeroAvanzato().getIncognitez()));
na = na.setIncognitey(new Incognite());
na = na.setIncognitez(getTerm().toNumeroAvanzato().getIncognitez());
ret = new Termine(na);
na = na.setVariableX(getTerm().toNumeroAvanzato().getVariableY().multiply(getTerm().toNumeroAvanzato().getVariableZ()));
na = na.setVariableY(new Variables());
na = na.setVariableZ(getTerm().toNumeroAvanzato().getVariableZ());
ret = new Number(na);
} else {
ret = new Termine(BigDecimalMath.pow(getTerm().BigDecimalValue(new MathContext(Utils.scale, Utils.scaleMode2)), f.getTerm().BigDecimalValue(new MathContext(Utils.scale, Utils.scaleMode2))));
ret = new Number(BigDecimalMath.pow(getTerm().BigDecimalValue(new MathContext(Utils.scale, Utils.scaleMode2)), f.getTerm().BigDecimalValue(new MathContext(Utils.scale, Utils.scaleMode2))));
}
return ret;
}
@ -346,7 +346,7 @@ public class Termine extends FunzioneBase {
public boolean soloIncognitaSemplice() {
if (this.getTerm().isBigInteger(true)) {
if (this.getTerm().toBigInteger(true).compareTo(BigInteger.ONE) == 0 && this.getTerm().toNumeroAvanzato().getIncognitey().count() > 0) {
if (this.getTerm().toBigInteger(true).compareTo(BigInteger.ONE) == 0 && this.getTerm().toNumeroAvanzato().getVariableY().count() > 0) {
return true;
}
}
@ -376,7 +376,7 @@ public class Termine extends FunzioneBase {
}
@Override
public Termine clone() {
public Number clone() {
Cloner cloner = new Cloner();
return cloner.deepClone(this);
}

18
src/org/warp/picalculator/Potenza.java → src/org/warp/picalculator/Power.java
View File

@ -1,23 +1,23 @@
package org.warp.picalculator;
public class Potenza extends FunzioneDueValoriBase {
public class Power extends FunctionTwoValuesBase {
public Potenza(FunzioneBase value1, FunzioneBase value2) {
public Power(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.POTENZA;
public String getSymbol() {
return MathematicalSymbols.POWER;
}
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable1.setSmall(small);
variable1.calcolaGrafica();
variable1.generateGraphics();
variable2.setSmall(true);
variable2.calcolaGrafica();
variable2.generateGraphics();
height = variable1.getHeight() + variable2.getHeight() - 4;
line = variable2.getHeight() - 4 + variable1.getLine();
@ -25,8 +25,8 @@ public class Potenza extends FunzioneDueValoriBase {
}
@Override
public Termine calcola() throws NumberFormatException, Errore {
return getVariable1().calcola().pow(getVariable2().calcola());
public Number solve() throws NumberFormatException, Error {
return getVariable1().solve().pow(getVariable2().solve());
}
@Override

23
src/org/warp/picalculator/PrioritaryMultiplication.java Normal file
View File

@ -0,0 +1,23 @@
package org.warp.picalculator;
public class PrioritaryMultiplication extends FunctionTwoValuesBase {
public PrioritaryMultiplication(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String getSymbol() {
return MathematicalSymbols.PRIORITARY_MULTIPLICATION;
}
@Override
public Number solve() throws Error {
return getVariable1().solve().multiply(getVariable2().solve());
}
@Override
public boolean drawSignum() {
return false;
}
}

13
src/org/warp/picalculator/RisultatoEquazione.java
View File

@ -1,13 +0,0 @@
package org.warp.picalculator;
import java.math.BigInteger;
public class RisultatoEquazione {
public boolean isAnEquation = false;
public Termine LR = new Termine(new BigInteger("0"));
public RisultatoEquazione(Termine LR, boolean isAnEquation) {
this.LR = LR;
this.isAnEquation = isAnEquation;
}
}

22
src/org/warp/picalculator/Radice.java → src/org/warp/picalculator/Root.java
View File

@ -4,24 +4,24 @@ import static org.warp.engine.Display.Render.glDrawLine;
import org.nevec.rjm.NumeroAvanzatoVec;
public class Radice extends FunzioneDueValoriBase {
public class Root extends FunctionTwoValuesBase {
public Radice(FunzioneBase value1, FunzioneBase value2) {
public Root(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.NTH_ROOT;
public String getSymbol() {
return MathematicalSymbols.NTH_ROOT;
}
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable1.setSmall(true);
variable1.calcolaGrafica();
variable1.generateGraphics();
variable2.setSmall(small);
variable2.calcolaGrafica();
variable2.generateGraphics();
width = 1 + variable1.getWidth() + 2 + variable2.getWidth() + 2;
height = variable1.getHeight() + variable2.getHeight() - 2;
@ -29,10 +29,10 @@ public class Radice extends FunzioneDueValoriBase {
}
@Override
public Termine calcola() throws NumberFormatException, Errore {
Termine exponent = new Termine(NumeroAvanzatoVec.ONE);
exponent = exponent.divide(getVariable1().calcola());
return getVariable2().calcola().pow(exponent);
public Number solve() throws NumberFormatException, Error {
Number exponent = new Number(NumeroAvanzatoVec.ONE);
exponent = exponent.divide(getVariable1().solve());
return getVariable2().solve().pow(exponent);
}
@Override

24
src/org/warp/picalculator/RadiceQuadrata.java → src/org/warp/picalculator/RootSquare.java
View File

@ -2,21 +2,21 @@ package org.warp.picalculator;
import org.nevec.rjm.Rational;
public class RadiceQuadrata extends FunzioneAnterioreBase {
public class RootSquare extends AnteriorFunctionBase {
public RadiceQuadrata(FunzioneBase value) {
public RootSquare(FunctionBase value) {
super(value);
}
@Override
public String simbolo() {
return Simboli.SQUARE_ROOT;
public String getSymbol() {
return MathematicalSymbols.SQUARE_ROOT;
}
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable.setSmall(small);
variable.calcolaGrafica();
variable.generateGraphics();
height = getVariable().getHeight() + 2;
width = 1 + 4 + getVariable().getWidth() + 1;
@ -24,17 +24,17 @@ public class RadiceQuadrata extends FunzioneAnterioreBase {
}
@Override
public Termine calcola() throws Errore {
public Number solve() throws Error {
try {
Termine result = getVariable().calcola();
result = result.pow(new Termine(new Rational(1, 2)));
Number result = getVariable().solve();
result = result.pow(new Number(new Rational(1, 2)));
return result;
} catch(NullPointerException ex) {
throw new Errore(Errori.ERROR);
throw new Error(Errors.ERROR);
} catch(NumberFormatException ex) {
throw new Errore(Errori.SYNTAX_ERROR);
throw new Error(Errors.SYNTAX_ERROR);
} catch(ArithmeticException ex) {
throw new Errore(Errori.NUMBER_TOO_SMALL);
throw new Error(Errors.NUMBER_TOO_SMALL);
}
}

92
src/org/warp/picalculator/Sistema.java
View File

@ -1,92 +0,0 @@
package org.warp.picalculator;
import static org.warp.engine.Display.Render.glDrawLine;
public class Sistema extends FunzioneMultipla {
static final int spacing = 2;
public Sistema() {
super();
}
public Sistema(Funzione value) {
super(new Funzione[]{value});
}
public Sistema(Funzione[] value) {
super(value);
}
@Override
public String simbolo() {
return null;
}
@Override
public Funzione calcola() throws NumberFormatException, Errore {
// TODO implementare il calcolo dei sistemi
return variables[0].calcola();
}
@Override
public void calcolaGrafica() {
for (Funzione f : variables) {
f.setSmall(false);
f.calcolaGrafica();
}
width = 0;
for (Funzione f : variables) {
if (f.getWidth() > width) {
width = f.getWidth();
}
}
width += 5;
height = 3;
for (Funzione f : variables) {
height += f.getHeight()+spacing;
}
height = height - spacing + 2;
line = height/2;
}
@Override
public void draw(int x, int y) {
final int h = this.getHeight() - 1;
final int paddingTop = 3;
final int spazioSotto = (h - 3 - 2) / 2 + paddingTop;
final int spazioSopra = h - spazioSotto;
int dy = paddingTop;
for (Funzione f : variables) {
f.draw(x + 5, y + dy);
dy+=f.getHeight()+spacing;
}
glDrawLine(x + 2, y + 0, x + 3, y + 0);
glDrawLine(x + 1, y + 1, x + 1, y + spazioSotto / 2);
glDrawLine(x + 2, y + spazioSotto / 2 + 1, x + 2, y + spazioSotto - 1);
glDrawLine(x + 0, y + spazioSotto, x + 1, y + spazioSotto);
glDrawLine(x + 2, y + spazioSotto + 1, x + 2, y + spazioSotto + spazioSopra / 2 - 1);
glDrawLine(x + 1, y + spazioSotto + spazioSopra / 2, x + 1, y + h - 1);
glDrawLine(x + 2, y + h, x + 3, y + h);
}
@Override
public int getWidth() {
return width;
}
@Override
public int getHeight() {
return height;
}
@Override
public int getLine() {
return line;
}
}

9
src/org/warp/picalculator/SolveMethod.java Normal file
View File

@ -0,0 +1,9 @@
package org.warp.picalculator;
import java.util.ArrayList;
public interface SolveMethod {
public static final SolveMethod[] techniques = new SolveMethod[] {};
public abstract ArrayList<Equation> solve(Equation equation);
}

19
src/org/warp/picalculator/Sottrazione.java
View File

@ -1,19 +0,0 @@
package org.warp.picalculator;
public class Sottrazione extends FunzioneDueValoriBase {
public Sottrazione(FunzioneBase value1, FunzioneBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.SUBTRACTION;
}
@Override
public Termine calcola() throws Errore {
return getVariable1().calcola().add(getVariable2().calcola().multiply(new Termine("-1")));
}
}

19
src/org/warp/picalculator/Subtraction.java Normal file
View File

@ -0,0 +1,19 @@
package org.warp.picalculator;
public class Subtraction extends FunctionTwoValuesBase {
public Subtraction(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String getSymbol() {
return MathematicalSymbols.SUBTRACTION;
}
@Override
public Number solve() throws Error {
return getVariable1().solve().add(getVariable2().solve().multiply(new Number("-1")));
}
}

28
src/org/warp/picalculator/Somma.java → src/org/warp/picalculator/Sum.java
View File

@ -6,32 +6,32 @@ import static org.warp.engine.Display.Render.glDrawStringLeft;
import org.warp.device.PIDisplay;
import org.warp.engine.Display;
public class Somma extends FunzioneDueValoriBase {
public class Sum extends FunctionTwoValuesBase {
public Somma(FunzioneBase value1, FunzioneBase value2) {
public Sum(FunctionBase value1, FunctionBase value2) {
super(value1, value2);
}
@Override
public String simbolo() {
return Simboli.SUM;
public String getSymbol() {
return MathematicalSymbols.SUM;
}
@Override
public Termine calcola() throws Errore {
Termine val1 = getVariable1().calcola();
Termine val2 = getVariable2().calcola();
Termine result = val1.add(val2);
public Number solve() throws Error {
Number val1 = getVariable1().solve();
Number val2 = getVariable2().solve();
Number result = val1.add(val2);
return result;
}
@Override
public void calcolaGrafica() {
public void generateGraphics() {
variable1.setSmall(small);
variable1.calcolaGrafica();
variable1.generateGraphics();
variable2.setSmall(small);
variable2.calcolaGrafica();
variable2.generateGraphics();
width = calcWidth();
height = calcHeight();
@ -54,8 +54,8 @@ public class Somma extends FunzioneDueValoriBase {
Display.Render.setFont(PIDisplay.fonts[0]);
}
dx += 1;
glDrawStringLeft(dx + x, ln - Utils.getFontHeight(small) / 2 + y, simbolo());
dx += getStringWidth(simbolo());
glDrawStringLeft(dx + x, ln - Utils.getFontHeight(small) / 2 + y, getSymbol());
dx += getStringWidth(getSymbol());
variable2.draw(dx + x, ln - variable2.getLine() + y);
}
@ -69,7 +69,7 @@ public class Somma extends FunzioneDueValoriBase {
int dx = 0;
dx += variable1.getWidth();
dx += 1;
dx += getStringWidth(simbolo());
dx += getStringWidth(getSymbol());
return dx += variable2.getWidth();
}
}

9
src/org/warp/picalculator/Tecnica.java
View File

@ -1,9 +0,0 @@
package org.warp.picalculator;
import java.util.ArrayList;
public interface Tecnica {
public static final Tecnica[] tecniche = new Tecnica[] {};
public abstract ArrayList<Equazione> risolvi(Equazione equazione);
}

106
src/org/warp/picalculator/Utils.java
View File

@ -80,15 +80,15 @@ public class Utils {
return c;
}
public static boolean ciSonoSoloFunzioniImpostateSommeEquazioniESistemi(ArrayList<Funzione> fl) {
public static boolean areThereOnlySettedUpFunctionsSumsEquationsAndSystems(ArrayList<Function> fl) {
for (int i = 0; i < fl.size(); i++) {
if (!(fl.get(i) instanceof Termine || fl.get(i) instanceof Somma || fl.get(i) instanceof Equazione || fl.get(i) instanceof ParteSistema || fl.get(i) instanceof Espressione)) {
if (fl.get(i) instanceof FunzioneAnterioreBase) {
if (((FunzioneAnterioreBase) fl.get(i)).variable == null) {
if (!(fl.get(i) instanceof Number || fl.get(i) instanceof Sum || fl.get(i) instanceof Equation || fl.get(i) instanceof EquationsSystemPart || fl.get(i) instanceof Expression)) {
if (fl.get(i) instanceof AnteriorFunctionBase) {
if (((AnteriorFunctionBase) fl.get(i)).variable == null) {
return false;
}
} else if (fl.get(i) instanceof FunzioneDueValoriBase) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null || ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
} else if (fl.get(i) instanceof FunctionTwoValuesBase) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null || ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return false;
}
} else {
@ -99,15 +99,15 @@ public class Utils {
return true;
}
public static boolean ciSonoSoloFunzioniImpostateSommeMoltiplicazioniEquazioniESistemi(ArrayList<Funzione> fl) {
public static boolean areThereOnlySettedUpFunctionsSumsMultiplicationsEquationsAndSystems(ArrayList<Function> fl) {
for (int i = 0; i < fl.size(); i++) {
if (!(fl.get(i) instanceof Termine || fl.get(i) instanceof Moltiplicazione || fl.get(i) instanceof MoltiplicazionePrioritaria || fl.get(i) instanceof Somma || fl.get(i) instanceof Equazione || fl.get(i) instanceof ParteSistema || fl.get(i) instanceof Espressione)) {
if (fl.get(i) instanceof FunzioneAnterioreBase) {
if (((FunzioneAnterioreBase) fl.get(i)).variable == null) {
if (!(fl.get(i) instanceof Number || fl.get(i) instanceof Multiplication || fl.get(i) instanceof PrioritaryMultiplication || fl.get(i) instanceof Sum || fl.get(i) instanceof Equation || fl.get(i) instanceof EquationsSystemPart || fl.get(i) instanceof Expression)) {
if (fl.get(i) instanceof AnteriorFunctionBase) {
if (((AnteriorFunctionBase) fl.get(i)).variable == null) {
return false;
}
} else if (fl.get(i) instanceof FunzioneDueValoriBase) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null || ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
} else if (fl.get(i) instanceof FunctionTwoValuesBase) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null || ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return false;
}
} else {
@ -118,15 +118,15 @@ public class Utils {
return true;
}
public static boolean ciSonoSoloFunzioniImpostateEquazioniESistemi(ArrayList<Funzione> fl) {
public static boolean areThereOnlySettedUpFunctionsEquationsAndSystems(ArrayList<Function> fl) {
for (int i = 0; i < fl.size(); i++) {
if (!(fl.get(i) instanceof Termine || fl.get(i) instanceof Equazione || fl.get(i) instanceof ParteSistema || fl.get(i) instanceof Espressione)) {
if (fl.get(i) instanceof FunzioneAnterioreBase) {
if (((FunzioneAnterioreBase) fl.get(i)).variable == null) {
if (!(fl.get(i) instanceof Number || fl.get(i) instanceof Equation || fl.get(i) instanceof EquationsSystemPart || fl.get(i) instanceof Expression)) {
if (fl.get(i) instanceof AnteriorFunctionBase) {
if (((AnteriorFunctionBase) fl.get(i)).variable == null) {
return false;
}
} else if (fl.get(i) instanceof FunzioneDueValoriBase) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null || ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
} else if (fl.get(i) instanceof FunctionTwoValuesBase) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null || ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return false;
}
} else {
@ -137,15 +137,15 @@ public class Utils {
return true;
}
public static boolean ciSonoSoloFunzioniImpostateESistemi(ArrayList<Funzione> fl) {
public static boolean areThereOnlySettedUpFunctionsAndSystems(ArrayList<Function> fl) {
for (int i = 0; i < fl.size(); i++) {
if (!(fl.get(i) instanceof Termine || fl.get(i) instanceof Equazione || fl.get(i) instanceof ParteSistema || fl.get(i) instanceof Espressione)) {
if (fl.get(i) instanceof FunzioneAnterioreBase) {
if (((FunzioneAnterioreBase) fl.get(i)).variable == null) {
if (!(fl.get(i) instanceof Number || fl.get(i) instanceof Equation || fl.get(i) instanceof EquationsSystemPart || fl.get(i) instanceof Expression)) {
if (fl.get(i) instanceof AnteriorFunctionBase) {
if (((AnteriorFunctionBase) fl.get(i)).variable == null) {
return false;
}
} else if (fl.get(i) instanceof FunzioneDueValoriBase) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null || ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
} else if (fl.get(i) instanceof FunctionTwoValuesBase) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null || ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return false;
}
} else {
@ -156,10 +156,10 @@ public class Utils {
return true;
}
public static boolean ciSonoFunzioniSNnonImpostate(ArrayList<FunzioneBase> fl) {
public static boolean areThereOnlyEmptySNFunctions(ArrayList<FunctionBase> fl) {
for (int i = 0; i < fl.size(); i++) {
if (fl.get(i) instanceof FunzioneAnterioreBase) {
if (((FunzioneAnterioreBase) fl.get(i)).variable == null) {
if (fl.get(i) instanceof AnteriorFunctionBase) {
if (((AnteriorFunctionBase) fl.get(i)).variable == null) {
return true;
}
}
@ -167,10 +167,10 @@ public class Utils {
return false;
}
public static boolean ciSonoFunzioniNSNnonImpostate(ArrayList<FunzioneBase> fl) {
public static boolean areThereOnlyEmptyNSNFunctions(ArrayList<FunctionBase> fl) {
for (int i = 0; i < fl.size(); i++) {
if (fl.get(i) instanceof FunzioneDueValoriBase && !(fl.get(i) instanceof Somma) && !(fl.get(i) instanceof Sottrazione) && !(fl.get(i) instanceof Moltiplicazione) && !(fl.get(i) instanceof MoltiplicazionePrioritaria) && !(fl.get(i) instanceof Divisione)) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null && ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
if (fl.get(i) instanceof FunctionTwoValuesBase && !(fl.get(i) instanceof Sum) && !(fl.get(i) instanceof Subtraction) && !(fl.get(i) instanceof Multiplication) && !(fl.get(i) instanceof PrioritaryMultiplication) && !(fl.get(i) instanceof Division)) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null && ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return true;
}
}
@ -179,10 +179,10 @@ public class Utils {
}
public static boolean ciSonoMoltiplicazioniPrioritarieNonImpostate(ArrayList<FunzioneBase> funzioniOLD) {
public static boolean areThereEmptyPrioritaryMultiplications(ArrayList<FunctionBase> funzioniOLD) {
for (int i = 0; i < funzioniOLD.size(); i++) {
if (funzioniOLD.get(i) instanceof MoltiplicazionePrioritaria) {
if (((FunzioneDueValoriBase) funzioniOLD.get(i)).variable1 == null && ((FunzioneDueValoriBase) funzioniOLD.get(i)).variable2 == null) {
if (funzioniOLD.get(i) instanceof PrioritaryMultiplication) {
if (((FunctionTwoValuesBase) funzioniOLD.get(i)).variable1 == null && ((FunctionTwoValuesBase) funzioniOLD.get(i)).variable2 == null) {
return true;
}
}
@ -190,10 +190,10 @@ public class Utils {
return false;
}
public static boolean ciSonoMoltiplicazioniNonImpostate(ArrayList<FunzioneBase> fl) {
public static boolean areThereEmptyMultiplications(ArrayList<FunctionBase> fl) {
for (int i = 0; i < fl.size(); i++) {
if (fl.get(i) instanceof Moltiplicazione || fl.get(i) instanceof Divisione) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null && ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
if (fl.get(i) instanceof Multiplication || fl.get(i) instanceof Division) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null && ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return true;
}
}
@ -201,10 +201,10 @@ public class Utils {
return false;
}
public static boolean ciSonoSommeNonImpostate(ArrayList<FunzioneBase> fl) {
public static boolean areThereEmptySums(ArrayList<FunctionBase> fl) {
for (int i = 0; i < fl.size(); i++) {
if (fl.get(i) instanceof Somma) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null && ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
if (fl.get(i) instanceof Sum) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null && ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return true;
}
}
@ -212,10 +212,10 @@ public class Utils {
return false;
}
public static boolean ciSonoSistemiNonImpostati(ArrayList<Funzione> fl) {
public static boolean areThereEmptySystems(ArrayList<Function> fl) {
for (int i = 0; i < fl.size(); i++) {
if (fl.get(i) instanceof ParteSistema) {
if (((ParteSistema) fl.get(i)).variable == null) {
if (fl.get(i) instanceof EquationsSystemPart) {
if (((EquationsSystemPart) fl.get(i)).variable == null) {
return true;
}
}
@ -223,15 +223,15 @@ public class Utils {
return false;
}
public static boolean ciSonoAltreFunzioniImpostate(ArrayList<Funzione> fl) {
public static boolean areThereOtherSettedUpFunctions(ArrayList<Function> fl) {
for (int i = 0; i < fl.size(); i++) {
if (!(fl.get(i) instanceof Termine || fl.get(i) instanceof Somma || fl.get(i) instanceof Espressione || fl.get(i) instanceof FunzioneAnterioreBase || fl.get(i) instanceof Moltiplicazione || fl.get(i) instanceof MoltiplicazionePrioritaria || fl.get(i) instanceof Divisione)) {
if (fl.get(i) instanceof FunzioneAnterioreBase) {
if (((FunzioneAnterioreBase) fl.get(i)).variable == null) {
if (!(fl.get(i) instanceof Number || fl.get(i) instanceof Sum || fl.get(i) instanceof Expression || fl.get(i) instanceof AnteriorFunctionBase || fl.get(i) instanceof Multiplication || fl.get(i) instanceof PrioritaryMultiplication || fl.get(i) instanceof Division)) {
if (fl.get(i) instanceof AnteriorFunctionBase) {
if (((AnteriorFunctionBase) fl.get(i)).variable == null) {
return true;
}
} else if (fl.get(i) instanceof FunzioneDueValoriBase) {
if (((FunzioneDueValoriBase) fl.get(i)).variable1 == null || ((FunzioneDueValoriBase) fl.get(i)).variable2 == null) {
} else if (fl.get(i) instanceof FunctionTwoValuesBase) {
if (((FunctionTwoValuesBase) fl.get(i)).variable1 == null || ((FunctionTwoValuesBase) fl.get(i)).variable2 == null) {
return true;
}
} else {
@ -245,13 +245,13 @@ public class Utils {
public static Rational getRational(BigDecimal str) {
try {
return getRational(str.toString());
} catch (Errore e) {
} catch (Error e) {
//E' IMPOSSIBILE CHE VENGA THROWATO UN ERRORE
return new Rational("0");
}
}
public static Rational getRational(String str) throws Errore {
public static Rational getRational(String str) throws Error {
try {
return new Rational(str);
} catch (NumberFormatException ex) {
@ -304,11 +304,11 @@ public class Utils {
return BigDecimalMath.divideRound(new BigDecimal(r.numer()).setScale(Utils.scale, Utils.scaleMode), new BigDecimal(r.denom()).setScale(Utils.scale, Utils.scaleMode));
}
public static boolean variabiliUguali(ArrayList<Incognita> variables, ArrayList<Incognita> variables2) {
public static boolean equalsVariables(ArrayList<Variable> variables, ArrayList<Variable> variables2) {
if (variables.size() != variables2.size()) {
return false;
} else {
for (Incognita v : variables) {
for (Variable v : variables) {
if (!variables2.contains(v)) {
return false;
}
@ -317,7 +317,7 @@ public class Utils {
}
}
public static void writeSquareRoot(Funzione var, int x, int y, boolean small) {
public static void writeSquareRoot(Function var, int x, int y, boolean small) {
var.setSmall(small);
int w1 = var.getWidth();
int h1 = var.getHeight();

40
src/org/warp/picalculator/Variable.java Normal file
View File

@ -0,0 +1,40 @@
package org.warp.picalculator;
import org.nevec.rjm.Rational;
public class Variable {
public char symbol = 'X';
public Rational exponent = Rational.ONE;
public Variable(char simbolo, Rational esponente) {
this.symbol = simbolo;
this.exponent = esponente;
}
public Variable(char simbolo, int a, int b) {
this.symbol = simbolo;
this.exponent = new Rational(a, b);
}
public Variable(char simbolo) {
this.symbol = simbolo;
this.exponent = new Rational(1, 1);
}
@Override
public boolean equals(Object o) {
if (o instanceof Variable) {
if (this.symbol == ((Variable) o).symbol) {
if (this.exponent == ((Variable) o).exponent) {
return true;
}
}
}
return false;
}
@Override
public int hashCode() {
return Character.getNumericValue(symbol) * 3 + exponent.hashCode();
}
}

391
src/org/warp/picalculator/Variables.java Normal file
View File

@ -0,0 +1,391 @@
package org.warp.picalculator;
import java.math.BigInteger;
import java.util.Comparator;
import java.util.Vector;
import org.nevec.rjm.BigIntegerMath;
import org.nevec.rjm.Rational;
public class Variables {
Vector<Variable> variables;
public Variables() {
variables = new Vector<Variable>();
}
public Variables(Variable[] value) {
this();
for (Variable i : value) {
variables.add(i);
}
}
public Variables(Vector<Variable> value) {
this();
variables = value;
}
public Variables(Variable value) {
this();
variables.add(value);
}
public int count() {
return variables.size();
}
public boolean containsSymbol(char simbolo) {
for (Variable i : variables) {
if (i.symbol == simbolo) {
return true;
}
}
return false;
}
public Rational getExponentOfSymbol(char simbolo) {
for (Variable i : variables) {
if (i.symbol == simbolo) {
return i.exponent;
}
}
return new Rational(0, 1);
}
public void setExponentOfSymbol(char simbolo, Rational esponente) {
for (Variable i : variables) {
if (i.symbol == simbolo) {
i.exponent = esponente;
}
}
}
@SuppressWarnings("unchecked")
@Override
public Variables clone() {
return new Variables((Vector<Variable>) variables.clone()).normalize();
}
public Variables multiply(Variables val) {
Variables result = new Variables();
// Passaggio 1: test vari
// Se il primo gruppo di incognite à nullo allora ritorna il secondo
// gruppo
if (this.count() == 0) {
result = val.clone();
return result;
}
// Se il secondo gruppo di incognite à nullo allora ritorna il primo
// gruppo
if (val.count() == 0) {
result = this.clone();
return result;
}
// Passaggio 2: le incognite doppie vengono raggruppate.
for (Variable i1 : variables) {
for (Variable i2 : val.variables) {
if (i1.symbol == i2.symbol) {
if (!result.containsSymbol(i1.symbol)) {
Variable ir = new Variable(i1.symbol, i1.exponent.add(i2.exponent));
result.variables.add(ir);
}
}
}
}
// Passaggio 3: le incognite non ancora presenti vengono aggiunte.
for (Variable i : variables) {
if (!result.containsSymbol(i.symbol)) {
result.variables.add(i);
}
}
for (Variable i : val.variables) {
if (!result.containsSymbol(i.symbol)) {
result.variables.add(i);
}
}
return result.normalize();
}
public Variables divide(Variables val) {
Variables result = new Variables();
// Passaggio 2: le incognite doppie vengono raggruppate.
for (Variable i1 : variables) {
for (Variable i2 : val.variables) {
if (i1.symbol == i2.symbol) {
if (!result.containsSymbol(i1.symbol)) {
Variable ir = new Variable(i1.symbol, i1.exponent.add(i2.exponent.multiply(new Rational(-1, 1))));
result.variables.add(ir);
}
}
}
}
// Passaggio 3: le incognite non ancora presenti vengono aggiunte.
for (Variable i : variables) {
if (!result.containsSymbol(i.symbol)) {
result.variables.add(i);
}
}
for (Variable i : val.variables) {
if (!result.containsSymbol(i.symbol)) {
result.variables.add(new Variable(i.symbol, i.exponent.multiply(new Rational(-1, 1))));
}
}
return result.normalize();
}
public Variables sqrt() {
Variables result = new Variables();
for (Variable i1 : variables) {
Variable ir = null;
try {
ir = new Variable(i1.symbol, i1.exponent.divide(new Rational(2, 1)));
} catch (Error e) {
e.printStackTrace();
}
result.variables.add(ir);
}
return result.normalize();
}
public Variables normalize() {
Variables result = new Variables();
for (Variable i1 : variables) {
if (i1.exponent.compareTo(Rational.ZERO) != 0) {
result.variables.add(i1);
}
}
result.variables.sort(new Comparator<Variable>() {
@Override
public int compare(Variable o1, Variable o2) {
int index1 = letterIndex(o1.symbol);
int index2 = letterIndex(o2.symbol);
return index1 - index2;
}
});
return result;
}
public byte letterIndex(char l) {
return letterIndex(l, false);
}
public static byte letterIndex(char l, boolean reverse) {
int total = MathematicalSymbols.variables().length - 1;
for (byte x = 0; x < MathematicalSymbols.variables().length; x++) {
if (MathematicalSymbols.variables()[x].equals("" + l)) {
if (reverse) {
return (byte) (total - x);
} else {
return x;
}
}
}
return -1;
}
public boolean compareTo(Variables val) {
if (this.equals(val))
return true;
return false;
}
@Override
public boolean equals(Object val) {
if (val == null)
return false;
if (val instanceof Variables) {
Variables ii2 = (Variables) val;
for (Variable i1 : variables) {
boolean found = false;
for (Variable i2 : ii2.variables) {
if (i1.symbol == i2.symbol) {
if (i1.exponent.compareTo(i2.exponent) != 0)
return false;
found = true;
}
}
if (!found) {
return false;
}
}
for (Variable i1 : ii2.variables) {
boolean found = false;
for (Variable i2 : variables) {
if (i1.symbol == i2.symbol) {
if (i1.exponent.compareTo(i2.exponent) != 0)
return false;
found = true;
}
}
if (!found) {
return false;
}
}
return true;
}
return false;
}
@Override
public String toString() {
String result = "";
if (variables.size() != 1) {
for (Variable i : variables) {
if (i.exponent.compareTo(Rational.ONE) != 0) {
result += "(" + i.symbol + "^" + i.exponent + ")";
} else {
result += i.symbol;
}
}
} else if (variables.size() == 1) {
Variable i = variables.get(0);
if (i.exponent.compareTo(Rational.ONE) != 0) {
result += "" + i.symbol + "^" + i.exponent + "";
} else if (i.exponent.compareTo(Rational.ONE) == 0) {
result += i.symbol;
}
}
return result;
}
public static Variables lcm(Variables val1, Variables val2) {
Variables result = new Variables();
// Passaggio 1: test vari
// Se il primo gruppo di incognite à nullo allora ritorna il secondo
// gruppo
if (val1.count() == 0) {
result = val2.clone();
return result;
}
// Se il secondo gruppo di incognite à nullo allora ritorna il primo
// gruppo
if (val2.count() == 0) {
result = val1.clone();
return result;
}
// Passaggio 2: le incognite doppie vengono raggruppate.
for (Variable i1 : val1.variables) {
for (Variable i2 : val2.variables) {
if (i1.symbol == i2.symbol) {
if (!result.containsSymbol(i1.symbol)) {
Variable ir = new Variable(i1.symbol);
if (i1.exponent.compareTo(i2.exponent) > 0) {
ir.exponent = i1.exponent;
} else {
ir.exponent = i2.exponent;
}
result.variables.add(ir);
}
}
}
}
// Passaggio 3: le incognite non ancora presenti vengono aggiunte.
for (Variable i : val1.variables) {
if (!result.containsSymbol(i.symbol)) {
result.variables.add(i);
}
}
for (Variable i : val2.variables) {
if (!result.containsSymbol(i.symbol)) {
result.variables.add(i);
}
}
return result.normalize();
}
@SuppressWarnings("unchecked")
public Vector<Variable> getVariablesList() {
return (Vector<Variable>) this.variables.clone();
}
public static Variables[] normalizeBigSurdVariables(Variables[] incognitetemp) throws Error {
Variables incognitex = incognitetemp[0].clone();
Variables incognitey = incognitetemp[1].clone();
Variables incognitez = incognitetemp[2].clone();
Variables newincognitex = new Variables();
for (Variable i : incognitex.variables) {
Vector<BigInteger> divisori = BigIntegerMath.divisors(i.exponent.divide(2).denom());
if (divisori.contains(new BigInteger("2"))) {
newincognitex = newincognitex.multiply(new Variables(i));
} else {
incognitey = incognitey.multiply(new Variables(new Variable(i.symbol, i.exponent.divide(2))));
}
}
incognitex = newincognitex;
for (Variable i : incognitey.variables) {
if (i.exponent.signum() < 0) {
incognitey = incognitey.divide(new Variables(i));
incognitez = incognitez.divide(new Variables(i));
}
}
for (Variable i : incognitez.variables) {
if (i.exponent.signum() < 0) {
incognitey = incognitey.divide(new Variables(i));
incognitez = incognitez.divide(new Variables(i));
}
}
// TODO: SPOSTARE LE Y NEGATIVE SOTTO LA FRAZIONE, DALLA Y ALLA Z
Variables incogniteyresult = new Variables();
Variables incognitezresult = new Variables();
// Le incognite doppie vengono tolte
for (Variable i1 : incognitey.variables) {
for (Variable i2 : incognitez.variables) {
if (i1.symbol == i2.symbol) {
if (i1.exponent.compareTo(i2.exponent) > 0) {
incogniteyresult = incogniteyresult.multiply(new Variables(new Variable(i1.symbol, i1.exponent.subtract(i2.exponent))));
} else if (i2.exponent.compareTo(i1.exponent) > 0) {
incognitezresult = incognitezresult.multiply(new Variables(new Variable(i1.symbol, i2.exponent.subtract(i1.exponent))));
}
}
}
}
// Le altre incognite vengono ri-messe
for (Variable i : incognitey.variables) {
if (!incogniteyresult.containsSymbol(i.symbol)) {
incogniteyresult = incogniteyresult.multiply(new Variables(i));
}
}
for (Variable i : incognitez.variables) {
if (!incognitezresult.containsSymbol(i.symbol)) {
incognitezresult = incognitezresult.multiply(new Variables(i));
}
}
incognitey = incogniteyresult;
incognitez = incognitezresult;
return new Variables[] { incognitex, incognitey, incognitez };
}
public static int priority(Variables ii) {
double priorità = 0;
double letterMax = 0;
for (Variable i : ii.variables) {
int lettIndex = letterIndex(i.symbol, true);
if (lettIndex > letterMax) {
letterMax = lettIndex;
}
}
priorità += letterMax * 100000;
for (Variable i : ii.variables) {
int lettIndex = letterIndex(i.symbol, true);
if (letterMax == lettIndex) {
priorità += i.exponent.doubleValue() * 100000;
}
priorità += +i.exponent.doubleValue();
}
return (int) priorità;
}
}

33
src/org/warp/picalculator/screens/EquationScreen.java
View File

@ -1,8 +1,6 @@
package org.warp.picalculator.screens;
import static org.warp.engine.Display.Render.glClearColor;
import static org.warp.engine.Display.Render.glDrawStringLeft;
import static org.warp.engine.Display.Render.setFont;
import static org.warp.engine.Display.Render.*;
import java.io.PrintWriter;
import java.io.StringWriter;
@ -12,9 +10,9 @@ import org.warp.device.PIDisplay;
import org.warp.engine.Display;
import org.warp.engine.Screen;
import org.warp.picalculator.Calculator;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Errori;
import org.warp.picalculator.Funzione;
import org.warp.picalculator.Error;
import org.warp.picalculator.Errors;
import org.warp.picalculator.Function;
import org.warp.picalculator.Utils;
public class EquationScreen extends Screen {
@ -25,8 +23,8 @@ public class EquationScreen extends Screen {
public volatile int caretPos = 0;
public volatile boolean showCaret = true;
public volatile float showCaretDelta = 0f;
public Funzione f;
public Funzione f2;
public Function f;
public Function f2;
public int ew1;
public int ew2;
public int eh2;
@ -37,8 +35,8 @@ public class EquationScreen extends Screen {
public boolean aftersleep;
public boolean autoscroll;
public int errorLevel = 0; // 0 = nessuno, 1 = risultato, 2 = tutto
public Errore err1;
public Errore err2;
public Error err1;
public Error err2;
boolean mustRefresh = true;
public EquationScreen() {
@ -109,7 +107,7 @@ public class EquationScreen extends Screen {
// System.out.println("Time elapsed: " + (double) timeElapsed /
// 1000000 + " milliseconds\n");
} catch (Errore e) {
} catch (Error e) {
glClearColor(0xFFDC3C32);
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
@ -120,13 +118,13 @@ public class EquationScreen extends Screen {
}
}
public void interpreta(String eqn) throws Errore {
public void interpreta(String eqn) throws Error {
equazioneCorrente = eqn;
f = Calculator.interpreta(equazioneCorrente.replace("sqrt", "Ⓐ").replace("^", "Ⓑ"));
f.calcolaGrafica();
f = Calculator.parseString(equazioneCorrente.replace("sqrt", "Ⓐ").replace("^", "Ⓑ"));
f.generateGraphics();
}
public void solve() throws Errore {
public void solve() throws Error {
Calculator.solve();
}
@ -148,6 +146,7 @@ public class EquationScreen extends Screen {
public void render() {
setFont(PIDisplay.fonts[0]);
glClearColor(0xFFCCE7D4);
glColor3f(0, 0, 0);
glDrawStringLeft(2, 22, nuovaEquazione.substring(0, caretPos)+(showCaret?"|":"")+nuovaEquazione.substring(((showCaret==false||nuovaEquazione.length()<=caretPos)?caretPos:caretPos+1), nuovaEquazione.length()));
if (f != null)
f.draw(2, 22+1+9+1);
@ -185,9 +184,9 @@ public class EquationScreen extends Screen {
interpreta(nuovaEquazione);
solve();
} catch (Exception ex) {
throw new Errore(Errori.ERROR);
throw new Error(Errors.ERROR);
}
} catch (Errore e) {
} catch (Error e) {
glClearColor(0xFFDC3C32);
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);

117
src/org/warp/picalculator/screens/MarioScreen.java
View File

@ -21,8 +21,19 @@ public class MarioScreen extends Screen {
private int[] skin;
private int[] skinSize;
private int[] ground;
private int[] groundSize;
private boolean errored;
public int posX = 0;
public float[] marioPos = new float[]{30,0};
public float[] marioForces = new float[]{0,0};
public float walkAnimation = 0;
public float jumptime = 0;
public boolean walking = false;
public boolean running = false;
public boolean jumping = false;
public boolean flipped = false;
public boolean onGround = true;
public int[] marioSkinPos = new int[]{0,0};
public MarioScreen() {
super();
@ -40,6 +51,14 @@ public class MarioScreen extends Screen {
e.printStackTrace();
errored = true;
}
try {
img = ImageIO.read(Main.instance.getClass().getResource("/marioground.png"));
ground = getMatrixOfImage(img);
groundSize = new int[] { img.getWidth(), img.getHeight() };
} catch (IOException e) {
e.printStackTrace();
errored = true;
}
}
@Override
@ -52,9 +71,69 @@ public class MarioScreen extends Screen {
@Override
public void beforeRender(float dt) {
if (!errored) {
if (Keyboard.isKeyDown(2, 5)) { //RIGHT
posX+=1;
walkAnimation += dt;
boolean rightPressed = Keyboard.isKeyDown(2, 5);
boolean leftPressed = Keyboard.isKeyDown(2, 3);
boolean jumpPressed = Keyboard.isKeyDown(2, 1);
if ((leftPressed | rightPressed) == (leftPressed & rightPressed)) {
walking = false;
walkAnimation = 0;
} else {
if (rightPressed) { //RIGHT
if (marioForces[0] < 500f) {
marioForces[0] += dt*500f;
}
walking = true;
flipped = false;
}
if (leftPressed) { //LEFT
if (marioForces[0] > -500f) {
marioForces[0] -= dt*500f;
}
walking = true;
flipped = true;
}
}
if (jumpPressed) { //JUMP
jumptime+=dt;
if (!jumping && onGround) {
marioForces[1] = dt*(4*1569.6f);
jumping = true;
onGround = false;
} else if (jumptime <= 0.5f) {
marioForces[1] = dt*(4*1569.6f);
}
} else {
jumping = false;
jumptime = 0;
}
if (!walking & !running & !jumping) {
marioSkinPos[0] = 0;
marioSkinPos[1] = 0;
} else if (onGround & walking & !running & !jumping && walkAnimation >= 0.08) {
while(walkAnimation > 0.08) {
walkAnimation -= 0.08;
if (marioSkinPos[0] == 1 & marioSkinPos[1] == 0) {
marioSkinPos[0] += 2;
} else if (marioSkinPos[0] == 3 & marioSkinPos[1] == 0) {
marioSkinPos[0] -= 1;
} else if (marioSkinPos[0] == 2 & marioSkinPos[1] == 0) {
marioSkinPos[0] -= 1;
} else {
marioSkinPos[0] = 1;
marioSkinPos[1] = 0;
}
}
} else if (jumping) {
marioSkinPos[0] = 5;
marioSkinPos[1] = 1;
}
marioForces[1] -= dt*1569.6;
marioPos[0] += dt*marioForces[0];
if (!onGround) {
marioPos[1] -= dt*marioForces[1];
}
marioForces[0] *= 0.75;
}
}
@ -64,8 +143,28 @@ public class MarioScreen extends Screen {
glDrawStringLeft(0, 20, "ERROR");
} else {
setFont(PIDisplay.fonts[0]);
glClearColor(0xFFCCE7D4);
glDrawSkin(skinSize[0], skin, posX, 25, 36, 1, 70, 27, true);
glClearColor(0xff9290ff);
glDrawSkin(groundSize[0], ground, 0, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*2, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*3, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*4, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*5, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*6, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*7, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*8, 25+25, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 0, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*2, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*3, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*4, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*5, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*6, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*7, 25+25+16, 0, 0, 16, 16, false);
glDrawSkin(groundSize[0], ground, 16*8, 25+25+16, 0, 0, 16, 16, false);
//DRAW MARIO
glDrawSkin(skinSize[0], skin, getPosX()-18, 25+getPosY(), 35*(marioSkinPos[0]+(flipped?2:1)), 27*marioSkinPos[1], 35*(marioSkinPos[0]+(flipped?1:2)), 27*(marioSkinPos[1]+1), true);
}
}
@ -83,5 +182,13 @@ public class MarioScreen extends Screen {
public boolean keyPressed(Key k) {
return false;
}
private int getPosX() {
return (int)marioPos[0];
}
private int getPosY() {
return (int)marioPos[1];
}
}

13
src/org/warp/picalculator/screens/SolveEquationScreen.java
View File

@ -1,12 +1,12 @@
package org.warp.picalculator.screens;
import static org.warp.engine.Display.Render.glDrawStringCenter;
import static org.warp.engine.Display.Render.*;
import org.warp.device.Keyboard.Key;
import org.warp.engine.Display;
import org.warp.engine.Screen;
import org.warp.picalculator.Calculator;
import org.warp.picalculator.Errore;
import org.warp.picalculator.Error;
import org.warp.picalculator.Main;
public class SolveEquationScreen extends Screen {
@ -30,7 +30,12 @@ public class SolveEquationScreen extends Screen {
@Override
public void render() {
glDrawStringCenter(Display.getWidth()/2, 29, "ciaoooooooooooooooooooooooooooooo");
glColor4f(0, 0, 0, 64);
glDrawStringCenter(Main.screenSize[0]/2+1, Main.screenSize[1]/4, "WORK IN PROGRESS. THIS SCREEN MUST HAVE A GUI TO SELECT THE VARIABLE TO SOLVE.");
glDrawStringCenter(Main.screenSize[0]/2, Main.screenSize[1]/4+1, "WORK IN PROGRESS. THIS SCREEN MUST HAVE A GUI TO SELECT THE VARIABLE TO SOLVE.");
glDrawStringCenter(Main.screenSize[0]/2+1, Main.screenSize[1]/4+1, "WORK IN PROGRESS. THIS SCREEN MUST HAVE A GUI TO SELECT THE VARIABLE TO SOLVE.");
glColor3f(255, 0, 0);
glDrawStringCenter(Main.screenSize[0]/2, Main.screenSize[1]/4, "WORK IN PROGRESS. THIS SCREEN MUST HAVE A GUI TO SELECT THE VARIABLE TO SOLVE.");
}
@Override
@ -50,7 +55,7 @@ public class SolveEquationScreen extends Screen {
Main.d.goBack();
try {
Calculator.solve('X');
} catch (Errore e) {
} catch (Error e) {
Screen scr = Main.d.getScreen();
if (scr instanceof EquationScreen) {
EquationScreen escr = (EquationScreen) scr;