Compare commits

...

2 commits

Author SHA1 Message Date
4b692894f2
Removing old and unused bits for previously planned new parser, that would have remained unused.
Some checks failed
continuous-integration/drone/push Build is failing
Some bits (like the tokenizer and the reference) are still used for the syntax highlighting and autocomplete though.
2023-10-09 23:27:30 +02:00
062fde6b16
Updating build script for newest pyinstaller version. 2023-10-09 22:26:50 +02:00
4 changed files with 5 additions and 713 deletions

View file

@ -1,663 +0,0 @@
/**
* LogarithmPlotter - 2D plotter software to make BODE plots, sequences and distribution functions.
* Copyright (C) 2023 Ad5001
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import "reference.js" as Reference
const DERIVATION_PRECISION = 0.01
const OPERATION_PRIORITY = {
"+": 10, "-": 10,
"*": 20, "/": 20
}
enum ASEType {
UNKNOWN,
VARIABLE,
NUMBER,
STRING,
FUNCTION,
CONSTANT,
OPERATION,
NEGATION // Example: -x.
}
class AbstractSyntaxElement {
type = ASEType.UNKNOWN;
execute(variables) {
return null;
}
simplify() {
return this;
}
derivate(variable) {
return this;
}
integrate(variable) {
return this;
}
toEditableString() {
return "";
}
toLatex() {
return "";
}
isConstant() {
return true;
}
}
class Variable extends AbstractSyntaxElement {
type = ASEType.VARIABLE;
constructor(variableName) {
this.varName = variableName;
}
execute(variables) {
if(variables.includes(this.varName)) {
return variables[this.varName];
} else {
throw new EvalError("Unknown variable " + this.varName + ".");
}
}
derivate(variable) {
if(variable == this.varName)
return new NumberElement(1);
return this;
}
integrate(variable) {
if(variable == this.varName)
// <var>^2/2
return new Operation(new Operation(this, '^', new NumberElement(2)), '/', new NumberElement(2));
return this;
}
toEditableString() {
return this.varName;
}
toLatex() {
return this.varName;
}
isConstant() {
return false;
}
}
class ArrayVariable extends Variable {
constructor(arrayName, astIndex) {
super(arrayName + "[" + astIndex.toEditableString() + "]")
this.arrayName = arrayName;
this.astIndex = astIndex;
}
execute(variables) {
if(variables.includes(this.arrayName)) {
let index = this.astIndex.execute(variables)
if(index % 1 != 0 || index < 0) { // Float index.
throw new EvalError("Non-integer array index " + index + " used as array index for " + this.varName + ".");
} else if(variables[this.arrayName].length <= index) {
throw new EvalError("Out-of-range index " + index + " used as array index for " + this.varName + ".");
} else {
return variables[this.arrayName][index];
}
} else {
throw new EvalError("Unknown variable " + this.varName + ".");
}
toLatex() {
return this.varName;
}
}
simplify() {
return new ArrayVariable(this.arrayName, this.astIndex.simplify());
}
toLatex() {
return this.arrayName + '\\left[' + this.astIndex.toLatex() + '\\right]';
}
isConstant() {
return false;
}
}
class Constant extends Variable {
type = ASEType.CONSTANT;
constructor(constant) {
super(constant)
}
execute(variables) {
if(Reference.CONSTANTS_LIST.includes(this.varName)) {
return Reference.CONSTANTS[this.varName];
} else {
throw new EvalError("Unknown constant " + this.varName + ".");
}
}
derivate(variable) {
if(variable == this.varName)
return new NumberElement(0);
return this;
}
integrate(variable) {
return new Operation(new Variable(variable), '^', this);
}
toEditableString() {
return this.varName;
}
toLatex() {
return this.varName;
}
isConstant() {
return true;
}
}
class NumberElement extends AbstractSyntaxElement {
type = ASEType.NUMBER;
constructor(number) {
this.value = parseFloat(number);
}
derivate(variable) {
return new NumberElement(0);
}
integrate(variable) {
return new Variable(variable);
}
toEditableString() {
return this.value.toString();
}
toLatex() {
return this.value.toString();
}
isConstant() {
return true;
}
}
class StringElement extends AbstractSyntaxElement {
type = ASEType.STRING;
constructor(str) {
this.str = str;
}
execute(variables) {
return this.str
}
derivate(variable) {
return this;
}
integrate(variable) {
return this;
}
toEditableString() {
return '"' + this.str + '"';
}
toLatex() {
return this.str;
}
isConstant() {
return true;
}
}
class FunctionElement extends AbstractSyntaxElement {
type = ASEType.FUNCTION;
constructor(functionName, astArguments) {
this.function = functionName;
this.args = astArguments;
}
execute(variables) {
if(this.function == "derivate") {
return executeDerivative(variables)
} else if(this.function == "integrate") {
return executeIntegral(variables)
} else if(Reference.FUNCTIONS_LIST.includes(this.function)) {
let args = this.args.map(arg => arg.execute(variables));
return Reference.FUNCTIONS[this.function](...args);
} else {
throw new EvalError("Unknown function " + this.function + ".");
}
}
executeDerivative(variables) {
// Calculate derivation.
if(this.args.length == 2)
if(this.args[1] instanceof Variable) {
let d = this.args[1].varName; // derivative variable name.
if(Object.keys(variables).includes(d)) {
let plus = this.args[0].execute(Object.assign({}, variables, {d: variables[d]+DERIVATION_PRECISION/2}));
let min = this.args[0].execute(Object.assign({}, variables, {d: variables[d]-DERIVATION_PRECISION/2}));
return (plus-min)/DERIVATION_PRECISION
} else
throw new EvalError("Undefined variable " + d + ".");
} else
throw new EvalError(`Argument 1 of function derivate must be a variable.`)
else
throw new EvalError(`Function 'derivate' can only have 2 arguments. ${this.args.length} provided.`)
}
executeIntegral(variables) {
// Calculate integral.
// Using simons rule
// https://en.wikipedia.org/wiki/Simpson%27s_rule
let d, f, a, b;
if(this.args.length == 2)
// Integral(f,var) integral of f by var.
if(this.args[1] instanceof Variable)
if(Object.keys(variables).includes(d)) {
d = this.args[1].varName; // derivative variable name.
if(!Object.keys(variables).includes(d))
throw new EvalError("Undefined variable " + d + ".")
a = 0;
b = variables[d];
f = this.args[0].execute;
} else
else
throw new EvalError(`Argument 2 of function derivate must be a variable.`)
else if(this.args.length == 4)
// Integral(a,b,f,var) integral from a to b of f by var.
if(this.args[3] instanceof Variable)
if(Object.keys(variables).includes(d)) {
a = this.args[0].execute(variables);
b = this.args[1].execute(variables);
f = this.args[2].execute;
d = this.args[3].varName; // derivative variable name.
if(!Object.keys(variables).includes(d))
throw new EvalError("Undefined variable " + d + ".");
}
else
throw new EvalError(`Argument 4 of function derivate must be a variable.`)
else
throw new EvalError(`Function 'derivate' can only have 2 or 4 arguments. ${this.args.length} provided.`)
// (b-a)/6*(f(a)+4*f((a+b)/2)+f(b))
let f_a = f(Object.assign({}, variables, {d: a})), f_b = f(Object.assign({}, variables, {d: b}));
let f_m = f(Object.assign({}, variables, {d: (a+b)/2}))
return (b-a)/6*(f_a+4*f_m+f_b);
}
simplify() {
let args = this.args.map(arg => arg.simplify(variables));
let newFunc = new FunctionElement(this.function, args);
let result;
if(newFunc.isConstant() && (result = newFunc.execute({})) % 1 == 0) { // Simplification (e.g. cos(0), sin(π/2)...)
return new NumberElement(result);
} else {
return newFunc;
}
}
derivate(variable) {
//TODO: Use DERIVATIVES elements in reference.
return new FunctionElement("derivate", this, variable);
}
integrate(variable) {
//TODO: Use INTEGRALS elements in reference.
return new FunctionElement("integrate", this, variable);
}
toEditableString() {
return this.function + '(' + this.args.map(arg => arg.toEditableString()).join(', ') + ')';
}
toLatex() {
switch(this.function) {
case "sqrt":
return '\\sqrt{' + this.args.map(arg => arg.toLatex()).join(', ') + '}';
case "abs":
return '\\left|' + this.args.map(arg => arg.toLatex()).join(', ') + '\\right|';
case "floor":
return '\\left\\lfloor' + this.args.map(arg => arg.toLatex()).join(', ') + '\\right\\rfloor';
case "ceil":
return '\\left\\lceil' + this.args.map(arg => arg.toLatex()).join(', ') + '\\right\\rceil';
default:
return '\\mathrm{' + this.function + '}\\left(' + this.args.map(arg => arg.toLatex()).join(', ') + '\\right)';
}
}
isConstant() {
if(this.function == "derivate")
return this.args[0].isConstant();
else if(this.function == "integrate")
return this.args.length == 4 && this.args[0].isConstant() && this.args[1].isConstant() && this.args[2].isConstant();
else
return this.args.every(x => x.isConstant());
}
}
class Operation extends AbstractSyntaxElement {
type = ASEType.OPERATION;
constructor(leftHand, operation, rightHand) {
this.leftHand = leftHand;
this.ope = operation;
this.rightHand = rightHand;
}
evaluate(variables) {
switch(this.ope) {
case '+':
return this.leftHand.evaluate(variables) + this.rightHand.evaluate(variables);
case '-':
return this.leftHand.evaluate(variables) - this.rightHand.evaluate(variables);
case '*':
return this.leftHand.evaluate(variables) * this.rightHand.evaluate(variables);
case '/':
return this.leftHand.evaluate(variables) / this.rightHand.evaluate(variables);
case '%':
return this.leftHand.evaluate(variables) % this.rightHand.evaluate(variables);
case '^':
return Math.pow(this.leftHand.evaluate(variables), this.rightHand.evaluate(variables));
default:
throw new EvalError("Unknown operator " + ope + ".");
}
}
simplify() {
let leftHand = this.leftHand.simplify();
let rightHand = this.rightHand.simplify();
let newOpe = new Operation(leftHand, this.ope, rightHand);
if(leftHand.isConstant() && rightHand.isConstant() && Math.abs(newOpe.execute({})) < 1000000) {
// Do not simplify to too big numbers
switch(this.ope) {
case '+':
case '-':
case '*':
case '^':
case '%':
return new NumberElement(newOpe.execute({}));
case '/':
if(result % 1 == 0)
return new NumberElement(newOpe.execute({}));
else {
let simplified = simplifyFraction(leftHand.number, rightHand.number)
return new Operation(new NumberElement(simplified[0]), '/', new NumberElement(simplified[1]))
}
return this.leftHand.evaluate(variables) / this.rightHand.evaluate(variables);
return Math.pow(this.leftHand.evaluate(variables), this.rightHand.evaluate(variables));
default:
throw new EvalError("Unknown operator " + ope + ".");
}
} else {
// Simplifications of +- 0 or *1
switch(this.ope) {
case '+':
case '-':
if(leftHand.type == ASEType.NUMBER && leftHand.value == 0)
return rightHand;
else if(rightHand.type == ASEType.NUMBER && rightHand.value == 0) {
if(ope == '-') leftHand.value = -leftHand.value;
return leftHand;
} else
return newOpe
case '*':
if((leftHand.type == ASEType.NUMBER && leftHand.value == 0) || (rightHand.type == ASEType.NUMBER && rightHand.value == 0))
return new NumberElement(0);
else if(leftHand.type == ASEType.NUMBER && leftHand.value == 1)
return rightHand;
else if(rightHand.type == ASEType.NUMBER && rightHand.value == 1)
return leftHand;
else
return newOpe
case '^':
if(rightHand.type == ASEType.NUMBER && rightHand.value == 0)
return new NumberElement(1);
else if(rightHand.type == ASEType.NUMBER && rightHand.value == 1)
return new NumberElement(leftHand.value);
else
return newOpe;
case '/':
if(rightHand.type == ASEType.NUMBER && rightHand.value == 1)
return new NumberElement(leftHand.value);
else
return newOpe;
case '%':
return newOpe;
default:
throw new EvalError("Unknown operator " + ope + ".");
}
}
}
derivate(variable) {
switch(this.ope) {
case '-':
case '+':
return new Operation(this.leftHand.derivate(variable), this.ope, this.rightHand.derivate(variable));
case '*':
return new Operation(
new Operation(this.leftHand, '*', this.rightHand.derivate(variable)),
'+',
new Operation(this.leftHand.derivate(variable), '*', this.rightHand),
);
case '/':
return new Operation(
new Operation(
new Operation(this.leftHand, '*', this.rightHand.derivate(variable)),
'-',
new Operation(this.leftHand.derivate(variable), '*', this.rightHand),
),
'/',
new Operation(this.rightHand, '^', new NumberElement(2))
);
case '^':
case '%':
return new FunctionElement("derivate", this.toEditableString());
default:
throw new EvalError("Unknown operator " + ope + ".");
}
}
integrate(variable) {
switch(this.ope) {
case '-':
case '+':
return new Operation(this.leftHand.integrate(variable), this.ope, this.rightHand.integrate(variable));
case '*':
return new Operation(
new Operation(this.leftHand.derivate(variable), '*', this.rightHand),
'+',
new Operation(this.leftHand, '*', this.rightHand.derivate(variable))
);
case '/':
return new Operation(
new Operation(this.leftHand.derivate(variable), '*', this.rightHand),
'+',
new Operation(this.leftHand, '*', this.rightHand.derivate(variable))
);
case '^':
case '%':
return new FunctionElement("integrate", this.toEditableString());
default:
throw new EvalError("Unknown operator " + ope + ".");
}
}
toEditableString() {
let leftString = this.leftHand.toEditableString();
let rightString = this.rightHand.toEditableString();
if(this.leftHand.type == ASEType.OPERATION && OPERATION_PRIORITY[this.ope] > OPERATION_PRIORITY[this.leftHand.ope])
leftString = "(" + leftString + ")"
if(this.rightHand.type == ASEType.OPERATION && OPERATION_PRIORITY[this.ope] > OPERATION_PRIORITY[this.rightHand.ope])
rightString = "(" + rightString + ")"
return leftString + " " + this.ope + " " + rightString;
}
toLatex() {
switch(this.ope) {
case '-':
case '+':
return this.leftHand.toLatex() + this.ope + this.rightHand.toLatex();
case '*':
return this.leftHand.toLatex() + " \\times " + this.rightHand.toLatex();
case '%':
return this.leftHand.toLatex() + " \\mathrm{mod} " + this.rightHand.toLatex();
case '/':
return "\\frac{" + this.leftHand.toLatex() + "}{" + this.rightHand.toLatex() + "}"
case '^':
return this.leftHand.toLatex() + "^{" + this.rightHand.toLatex() + "}";
default:
throw new EvalError("Unknown operator " + ope + ".");
}
return this.leftHand.toLatex() + ope + this.rightHand.toLatex();
}
isConstant() {
return this.leftHand.isConstant() && this.rightHand.isConstant();
}
}
function simplifyFraction(num,den) {
// More than gcd because it allows decimals fractions.
let mult = 1;
if(num%1 != 0)
mult = Math.max(mult,Math.pow(10,num.toString().split('.')[1].length))
else if(den%1 != 0)
mult = Math.max(mult,Math.pow(10,den.toString().split('.')[1].length))
let a = Math.abs(num*mult);
let b = Math.abs(den*mult);
let gcd = 0
if (b > a) {let temp = a; a = b; b = temp;}
while (gcd == 0) {
if (b == 0) gcd = a;
a %= b;
if (a == 0) gcd = b;
b %= a;
}
return [num*mult/gcd, den*mult/gcd]
}
class Negation extends AbstractSyntaxElement {
type = ASEType.NEGATION;
constructor(variableName) {
this.varName = variableName;
}
execute(variables) {
if(variables.includes(this.varName)) {
return variables[this.varName];
} else {
throw new EvalError("Unknown variable " + this.varName + ".");
}
}
derivate(variable) {
if(variable == this.varName)
return new NumberElement(1);
return this;
}
integrate(variable) {
if(variable == this.varName)
// <var>^2/2
return new Operation(new Operation(this, '^', new NumberElement(2)), '/', new NumberElement(2));
return this;
}
toEditableString() {
return this.varName;
}
toLatex() {
return this.varName;
}
isConstant() {
return false;
}
}
class Negation extends AbstractSyntaxElement {
type = ASEType.NEGATION;
constructor(expression) {
this.expression = expression;
}
execute(variables) {
if(variables.includes(this.arrayName)) {
let index = this.astIndex.execute(variables)
if(index % 1 != 0 || index < 0) { // Float index.
throw new EvalError("Non-integer array index " + index + " used as array index for " + this.varName + ".");
} else if(variables[this.arrayName].length <= index) {
throw new EvalError("Out-of-range index " + index + " used as array index for " + this.varName + ".");
} else {
return variables[this.arrayName][index];
}
} else {
throw new EvalError("Unknown variable " + this.varName + ".");
}
toLatex() {
return this.varName;
}
}
simplify() {
return new Negation(this.expression.simplify());
}
derivate(variable) {
return new Negation(this.expression.derivate(variable));
}
integrate(variable) {
return new Negation(this.expression.integrate(variable));
}
toLatex() {
return '-' + this.expression.toLatex();
}
isConstant() {
return this.expression.isConstant();
}
}

View file

@ -1,47 +0,0 @@
/**
* LogarithmPlotter - 2D plotter software to make BODE plots, sequences and distribution functions.
* Copyright (C) 2023 Ad5001
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import "ast.js" as AST
.import "tokenizer.js" as TK
class ExpressionBuilder {
constructor(tokenizer) {
this.tokenizer = tokenizer;
}
parseExpression(delimitors = '') {
// Parse a sequence of operations, and orders them based on OPERATION_PRIORITY.
let elements = []
let operators = []
let firstToken = this.tokenizer.peek();
if(firstToken.type == TK.TokenType.OPERATOR) // First operations.
if(firstToken.value == "-") {
// TODO: Set initial argument.
this.tokenizer.skip(TK.TokenType.OPERATOR)
} else
tokenizer.input.raise(`Invalid operator ${firstToken.value} at begining of statement.`)
else {
}
}
parseOperation()`
}

View file

@ -28,4 +28,6 @@ var Token = TK.Token
var Tokenizer = TK.ExpressionTokenizer
var FUNCTIONS_LIST = Reference.FUNCTIONS_LIST
var FUNCTIONS = Reference.FUNCTIONS
var CONSTANTS_LIST = Reference.CONSTANTS_LIST
var CONSTANTS = Reference.CONSTANTS

View file

@ -21,10 +21,10 @@ DRIVEC="${WINEPREFIX:-$HOME/.wine}/drive_c"
PYSIDE6PATH="${PYSIDE6PATH%$'\r'}"
PYSIDE6PATH="${PYSIDE6PATH//\\/\/}"
PYSIDE6PATH="${PYSIDE6PATH//C:/$DRIVEC}"
cp "$PYSIDE6PATH/Qt6ShaderTools.dll" dist/logarithmplotter/PySide6/
cp "$PYSIDE6PATH/Qt6ShaderTools.dll" dist/logarithmplotter/_internal/PySide6/
# Remove QtWebEngine
rm dist/logarithmplotter/PySide6/Qt6WebEngineCore.dll
rm dist/logarithmplotter/_internal/PySide6/Qt6WebEngineCore.dll
# Remove the QtQuick styles that are unused
rm -rf dist/logarithmplotter/PySide6/qml/QtQuick/Controls/{Imagine,Material,designer}
rm -rf dist/logarithmplotter/_internal/PySide6/qml/QtQuick/Controls/{Imagine,Material,designer}