fotonmoton/algorithms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix evaluator

Browse source
This commit is contained in:
Gregory 2021-12-15 23:45:29 +02:00
parent 7de370e3f9
commit 323fd70370
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fundamentals/exrecises/math_evaluator/evaluator.go
View file

@ -10,8 +10,8 @@ import (
// Dijkstra's two stack algorithm for equation evaluation
func Evaluate(exression string) int {
operations := stack.NewStack()
values := stack.NewStack()
operations := stack.NewStack[string]()
values := stack.NewStack[int]()
for _, part := range strings.Split(exression, " ") {
isOperation := part == "+" || part == "-" || part == "*" || part == "/" || part == "sqrt"
@ -20,17 +20,17 @@ func Evaluate(exression string) int {
continue
} else if part == ")" {
lastOperation := operations.Pop()
lastValue := values.Pop().(int)
lastValue := values.Pop()
switch lastOperation {
case "+":
lastValue = values.Pop().(int) + lastValue
lastValue = values.Pop() + lastValue
case "-":
lastValue = values.Pop().(int) - lastValue
lastValue = values.Pop() - lastValue
case "*":
lastValue = values.Pop().(int) * lastValue
lastValue = values.Pop() * lastValue
case "/":
lastValue = values.Pop().(int) / lastValue
lastValue = values.Pop() / lastValue
case "sqrt":
lastValue = int(math.Sqrt(float64(lastValue)))
}
@ -43,5 +43,5 @@ func Evaluate(exression string) int {
}
}
return values.Pop().(int)
return values.Pop()
}