3010330
/
PR1-Spreadsheet
forked from hummel/PR1-Spreadsheet
1
0
Fork 0
Code Pull Requests Activity

Prod u. 10. Reihe wirklich benutzbar

main
Dr.Janson 2024-01-06 22:16:47 +01:00
parent 203a833bc6
commit aba1d8bf54
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java
View File

@ -41,7 +41,6 @@ public class Axel {
form+=command.charAt(i);
}
}
spr.put(cell, form);
}while(true);

51
Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
View File

@ -74,10 +74,9 @@ public class Spreadsheet {
return cellName.charAt(1) - '1';
}else {
int Row = 0;
Row +=((cellName.charAt(1)-48)*10);
Row +=(cellName.charAt(2)-49);
System.out.println(Row);
return Row;
Row +=((cellName.charAt(1)-'0')*10);
Row +=(cellName.charAt(2)-'0');
return Row-1;
}
}
// -----
@ -128,11 +127,23 @@ public class Spreadsheet {
private void evaluateCell(int row, int col) {
String formula = cells[row][col].getFormula();
String result = "";
int offset = 0;
int offsetEnd = 0;
int diff=0;
for(int i = 0; i<formula.length();i++) {
if(formula.charAt(i)=='(') {
offset=i+1;
}else if(formula.charAt(i)==')') {
offsetEnd=i;
}
else if(formula.charAt(i)==':') {
diff=i;
}
}
if (formula.startsWith("SUMME(")) { // e.g. SUMME(A3:A8)
result += sum(formula.substring(6, 8), formula.substring(9, 11));
result += sum(formula.substring(offset, diff), formula.substring(diff+1,offsetEnd));
}else if (formula.startsWith("PRODUKT(")) { // e.g. PRODUKT(A3:B9)
result = "TODO"; // TODO
result += prod(formula.substring(offset, diff), formula.substring(diff+1, offsetEnd));; // TODO
}else if (formula.startsWith("MITTELWERT(")) { // e.g. MITTELWERT(A3:A5)
result = "TODO"; // TODO
}else if (formula.startsWith("STABW(")) { // e.g. STABW(C6:D8) -> Standardabweichung
@ -162,12 +173,35 @@ public class Spreadsheet {
long res = 0;
for(int j = getRow(startCellName); j< (getRow(endCellName)+1);j++){
for(int i = getCol(startCellName); i< (getCol(endCellName)+1);i++) {
if(!cells[j][i].getValue().isBlank())
if(!cells[j][i].getValue().isBlank()) {
res += Long.parseLong(cells[j][i].getValue());
}
}
}
return res;
}
/**
* Method for calculating the product of a rectangular block of cells, such as from A1 to B3.
* @param startCellName The name of the cell in the upper left corner of the rectangle.
* @param endCellName The name of the cell in the lower right corner of the rectangle.
* @return The product calculated.
*/
private long prod(String startCellName, String endCellName) {
long res = 1;
boolean anyNumbers= false;
for(int j = getRow(startCellName); j< (getRow(endCellName)+1);j++){
for(int i = getCol(startCellName); i< (getCol(endCellName)+1);i++) {
if(!cells[j][i].getValue().isBlank()) {
res*= Long.parseLong(cells[j][i].getValue());
anyNumbers = true;
}
}
}
if(anyNumbers)
return res;
else
return 0;
}
/**
* This method calculates the result of a "normal" algebraic expression. It only needs to support
@ -197,7 +231,6 @@ public class Spreadsheet {
}
for(int i = 2; i<args.size();) {
System.out.println(args.get(i));
String val = "";
switch(args.get(i-1)) {
case "+":