Skip to content

Update Project_2A.java #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Scallaway3927 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Project_2A.java #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions Project_2A.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ else if(tokenArray[i] == '(') {
//check for closing parenthesis
else if(tokenArray[i] == ')') {

while(operators.peek() != ")") {
while(operators.peek() != "(") {
/**Performsoperation in the parenthesis in order
* until it reaches the open parenthesis
* pushes the outcome into the numbers stack after each operation
Expand All @@ -62,21 +62,21 @@ else if(tokenArray[i] == ')') {
nums.push(equation(left, right, operators.pop()));
}//end while
}//end branch for closing parenthesis
else if(isOperator(tokenArray[i])) {
/**while loop to find multipart operators
* and convert them to a string
*/
string newOp = "";
while(isOperator(tokenArray[i])) {
else {
String newOp = "";
while(!isNumber(tokenArray[i])&& tokenArray[i]!=' ') {
newOp = newOp + tokenArray[i];
i++;

i++;
}//end while loop for op building
/** i has to be decrimented, since it is incremented in the while loop
* that way the main for loop doesnt skip any tokens in the equation
*/
i--;

if(isOperator(newOp)) {
/**while loop to find multipart operators
* and convert them to a string
*/

//while loop until you reach open parenthesis
/**use while loop to check if current operator
* has the same or higher precendence to one
Expand All @@ -85,29 +85,32 @@ else if(isOperator(tokenArray[i])) {
*
* added !.operators.isEmpty(), as empty stack causes error for comparison
*/
while(!operators.isEmpty() && (precedence(operators.peek()) > precedence(tokenArray[i]))) {
while(!operators.isEmpty() && (precedence(operators.peek()) > precedence(newOp))) {
Integer right = nums.pop();
Integer left = nums.pop();
nums.push(equation(left, right, operators.pop()));
}//end while loop

//once token is either first token or highest precedence adds to stack
operators.push(tokenArray[i]);
}//end else if branch for operator
}//end for
operators.push(newOp);
}//end nested if branch
}//end else

/** once the while expression is either added to stacks or is
* put through needed operations solves remaining operations in
* the operators stack, until empty
*/
while (!operators.isEmpty()) {
Integer right = nums.pop();
Integer left = nums.pop();
nums.push(equation(left, right, operators.pop()));
while (!operators.isEmpty()) {
Integer right = nums.pop();
Integer left = nums.pop();
nums.push(equation(left, right, operators.pop()));


}//end while

return nums.pop();
}
}//end evaluate method
}//end for
return nums.pop();
}//end method

/*
*Precedence method. This returns a value based on the operator
Expand All @@ -124,18 +127,18 @@ public int precedence(String operator) {
if (operator.equals("==") || operator.equals("!=")) { return 3; }
if (operator.equals("&&")) { return 2; }
if (operator.equals("||")) { return 1; }
throw new IllegalArgumentException(String.format("Operator %s is not supported.", operator)) } // Time complexity: O(n)
throw new IllegalArgumentException(String.format("Operator %s is not supported.", operator)); // Time complexity: O(n)
}//End Precedence method

public int equation(Integer left, Integer right, String s) {
int equation(Integer left, Integer right, String s) {
/**
* FIX ME
*/
}

//method to check if character is a number
//simple method to see if char is between 1-9 and thus a number
public boolean isNumber(char c) {
boolean isNumber(char c) {
if(c >= '0' && c <='9')
return true;
else
Expand All @@ -145,8 +148,10 @@ public boolean isNumber(char c) {
*Method to check if String s is equal to any of the allowed operators for this project.
*Returns: True if String s is equal to one of the operators, otherwise returns false bvecause String s isnt an operator
*/
public boolean isOperator(String s) {
if (s.equals("^" || "*" || "/" || "+" || "-" || ">" || ">=" || "<" || "<=" || "==" || "!=" || "&&" || "||"){
boolean isOperator(String s) {
if (s.equals("^") || s.equals("*") || s.equals("/") || s.equals("+") ||
s.equals("-") || s.equals(">") || s.equals(">=") || s.equals("<") ||
s.equals("<=") || s.equals("==") || s.equals("!=") || s.equals("&&") || s.equals("||")){
return true;
}else {return false;}
}
Expand Down