mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update calc

Browse Source
This commit is contained in:
kwaroran
2024-05-01 08:11:11 +09:00
parent 899c633c26
commit d3c2e5575e
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ts/process/infunctions.ts
View File

@@ -12,17 +12,46 @@ function toRPN(expression:string) {
'%': {precedence: 3, associativity: 'Left'}, '%': {precedence: 3, associativity: 'Left'},
'<': {precedence: 1, associativity: 'Left'}, '<': {precedence: 1, associativity: 'Left'},
'>': {precedence: 1, associativity: 'Left'}, '>': {precedence: 1, associativity: 'Left'},
'|': {precedence: 0, associativity: 'Left'}, '|': {precedence: 1, associativity: 'Left'},
'&': {precedence: 0, associativity: 'Left'}, '&': {precedence: 1, associativity: 'Left'},
'≤': {precedence: 1, associativity: 'Left'},
'≥': {precedence: 1, associativity: 'Left'},
'=': {precedence: 1, associativity: 'Left'}
}; };
const operatorsKeys = Object.keys(operators);
expression = expression.replace(/\s+/g, ''); expression = expression.replace(/\s+/g, '');
let expression2 = expression.split(/([\+\-\*\/\^\%\>\<\|\&])/).filter(token => token); let expression2 = []
let lastToken = ''
for(let i = 0; i < expression.length; i++) {
if(operatorsKeys.includes(expression[i])) {
if(lastToken !== '') {
expression2.push(lastToken)
}
else{
expression2.push('0')
}
lastToken = ''
expression2.push(expression[i])
}
else{
lastToken += expression[i]
}
}
if(lastToken !== '') {
expression2.push(lastToken)
}
else{
expression2.push('0')
}
expression2.forEach(token => { expression2.forEach(token => {
if (parseFloat(token) || token === '0') { if (parseFloat(token) || token === '0') {
outputQueue += token + ' '; outputQueue += token + ' ';
} else if ('+-*/^%><|&'.includes(token)) { } else if (operatorsKeys.includes(token)) {
while (operatorStack.length > 0 && while (operatorStack.length > 0 &&
((operators[token].associativity === 'Left' && ((operators[token].associativity === 'Left' &&
operators[token].precedence <= operators[operatorStack[operatorStack.length - 1]].precedence) || operators[token].precedence <= operators[operatorStack[operatorStack.length - 1]].precedence) ||
@@ -61,6 +90,9 @@ function calculateRPN(expression:string) {
case '>': stack.push(a > b ? 1 : 0); break; case '>': stack.push(a > b ? 1 : 0); break;
case '|': stack.push(a || b); break; case '|': stack.push(a || b); break;
case '&': stack.push(a && b); break; case '&': stack.push(a && b); break;
case '≤': stack.push(a <= b ? 1 : 0); break;
case '≥': stack.push(a >= b ? 1 : 0); break;
case '=': stack.push(a === b ? 1 : 0); break;
} }
} }
}); });
@@ -80,7 +112,7 @@ function executeRPNCalculation(text:string) {
return "0" return "0"
} }
return parsed.toString() return parsed.toString()
}) }).replace(/&&/g, '&').replace(/\|\|/g, '|').replace(/<=/g, '≤').replace(/>=/g, '≥').replace(/==/g, '=')
const expression = toRPN(text); const expression = toRPN(text);
const evaluated = calculateRPN(expression); const evaluated = calculateRPN(expression);
return evaluated return evaluated