Skip to content

Ilkka Hietaniemi #11 #32

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
ihietani wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Ilkka Hietaniemi #11 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3755df
besouro automatic message
Oct 7, 2016
cecd693
besouro automatic message
Oct 7, 2016
13fa8b0
besouro automatic message
Oct 7, 2016
0a28fe1
besouro automatic message
Oct 7, 2016
0556aa6
besouro automatic message
Oct 7, 2016
517ef7b
besouro automatic message
Oct 7, 2016
c92e3b9
besouro automatic message
Oct 7, 2016
90be9b1
besouro automatic message
Oct 7, 2016
16e5b88
besouro automatic message
Oct 7, 2016
93b8224
besouro automatic message
Oct 7, 2016
0dd5d0f
Finishing later
Oct 14, 2016
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
36 changes: 36 additions & 0 deletions .besouro/20161007164022502/actions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
FileOpenedAction 1475847622795 SpreadsheetTest.java 452 2 7 2
UnitTestCaseAction 1475847638127 SpreadsheetTest.java OK
UnitTestSessionAction 1475847638127 SpreadsheetTest.java OK
EditAction 1475847712375 SpreadsheetTest.java 441 2 3 1
CompilationAction 1475847712519 SpreadsheetTest.java
CompilationAction 1475847713842 SpreadsheetTest.java
UnitTestCaseAction 1475847717539 SpreadsheetTest.java FAIL
UnitTestSessionAction 1475847717539 SpreadsheetTest.java FAIL
EditAction 1475847741840 Spreadsheet.java 432 4 4 0
UnitTestCaseAction 1475847745278 SpreadsheetTest.java OK
UnitTestSessionAction 1475847745278 SpreadsheetTest.java OK
RefactoringAction 1475847752473 SpreadsheetTest.java ADD void test_NumberHandlingNegative()/2 METHOD
RefactoringAction 1475847758984 SpreadsheetTest.java RENAME test_NumberHandlingNegative()/2=>void test_NumberHandlingPositive() METHOD
EditAction 1475847765757 SpreadsheetTest.java 623 3 9 3
UnitTestCaseAction 1475847769128 SpreadsheetTest.java FAIL
UnitTestSessionAction 1475847769128 SpreadsheetTest.java FAIL
EditAction 1475847827739 Spreadsheet.java 446 4 4 0
RefactoringAction 1475847835528 SpreadsheetTest.java ADD void test_NumberHandlingPositive()/2 METHOD
RefactoringAction 1475847842539 SpreadsheetTest.java RENAME test_NumberHandlingPositive()/2=>void test_NumberHandlingSigned() METHOD
EditAction 1475847842969 SpreadsheetTest.java 804 4 12 4
EditAction 1475847850100 SpreadsheetTest.java 807 4 12 4
UnitTestCaseAction 1475848217412 SpreadsheetTest.java OK
UnitTestSessionAction 1475848217413 SpreadsheetTest.java OK
RefactoringAction 1475848312589 SpreadsheetTest.java ADD void test_NumberHandlingSigned()/2 METHOD
RefactoringAction 1475848317103 SpreadsheetTest.java RENAME test_NumberHandlingSigned()/2=>void test_NumberHandling() METHOD
RefactoringAction 1475848321116 SpreadsheetTest.java RENAME test_NumberHandling()=>void test_NumberHandlingTwoCells() METHOD
RefactoringAction 1475848331127 SpreadsheetTest.java REMOVE test_NumberHandlingTwoCells() METHOD
RefactoringAction 1475848348140 SpreadsheetTest.java ADD void test_NumberHandlingSigned()/2 METHOD
RefactoringAction 1475848355159 SpreadsheetTest.java RENAME test_NumberHandlingSigned()/2=>void test_Incorrect() METHOD
RefactoringAction 1475848357175 SpreadsheetTest.java RENAME test_Incorrect()=>void test_IncorrectInteger() METHOD
EditAction 1475848357363 SpreadsheetTest.java 989 5 15 5
EditAction 1475848375863 SpreadsheetTest.java 990 5 15 5
EditAction 1475848394837 SpreadsheetTest.java 995 5 15 5
UnitTestCaseAction 1475848398079 SpreadsheetTest.java FAIL
UnitTestSessionAction 1475848398080 SpreadsheetTest.java FAIL
EditAction 1475848492364 Spreadsheet.java 449 4 4 0
6 changes: 6 additions & 0 deletions .besouro/20161007164022502/besouroEpisodes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
1475847638127 regression 1 15 true
1475847745278 refactoring 1A 32 true
1475848217413 test-first 3 464 true
1475848217414 test-first 3 464 true
1475848217415 test-last 1 464 false
1475848217416 test-last 1 464 false
Empty file added .besouro/20161007164022502/disagreements.txt
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions .besouro/20161007164022502/randomHeuristicEpisodes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1475847638127 regression 1 15 true
1475847745278 refactoring 1A 32 true
1475848217413 test-first 3 464 true
Empty file added .besouro/20161007164022502/userComments.txt
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions .besouro/20161007164022502/zorroEpisodes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1475847638127 regression 1 15 true
1475847745278 refactoring 1A 107 true
1475848217413 test-first 3 472 true
2 changes: 2 additions & 0 deletions bin/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/Spreadsheet.class
/SpreadsheetTest.class
Binary file modified bin/Spreadsheet.class
View file
Open in desktop
Binary file not shown.
Binary file modified bin/SpreadsheetTest.class
View file
Open in desktop
Binary file not shown.
68 changes: 66 additions & 2 deletions src/Spreadsheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,82 @@
import java.util.*;

public class Spreadsheet {

private HashMap<String, String> cells;

public Spreadsheet(){
cells = new HashMap<String, String>();
}

public String get(String cell) {
// to be implemented
return null;
return cells.get(cell);
}

public void set(String cell, String value) {

// to be implemented
cells.put(cell, value);
}

public String evaluate(String cell) {
// to be implemented
return null;
String ev = cells.get(cell);
if(checkEquation(ev)){
ev = ev.substring(1);
if(ev.charAt(0) != '\''){
if(isCircular(cell, cells.get(ev))){
return "#Circular";
}
ev = evaluate(ev);
}
}
if(checkFormat(ev)){
if(ev.charAt(0) == '\''){
ev = ev.substring(1, ev.length() - 1);
return ev;
}
return ev;
}
return "#Error";
}
public boolean checkFormat(String cell){
for(int i = 0; i < cell.length(); i++){
if(cell.charAt(0) == '-'){
continue;
}
else if(cell.charAt(0) == '\'' &&
cell.charAt(cell.length() - 1) == '\''){
return true;
}
else if(cell.charAt(i) >= '0' && cell.charAt(i) <= '9'){
continue;
}
else{
return false;
}
}
return true;
}
public boolean checkEquation(String cell){
if(cell.charAt(0) == '='){
return true;
}
return false;
}
public boolean isCircular(String current, String next){
boolean circular = false;
if(checkEquation(next)){
next = next.substring(1);
}
if(current.equals(next)){
return true;
}


return circular;


}

}
108 changes: 106 additions & 2 deletions tests/SpreadsheetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,113 @@
public class SpreadsheetTest {

@Test
public void test() {
fail("Not yet implemented");
public void test_SetAndGet() {
Spreadsheet n = new Spreadsheet();
n.set("A1", "2");

assertEquals("Should return 2", "2", n.get("A1"));

}
@Test
public void test_NumberHandlingNegative() {
Spreadsheet n = new Spreadsheet();
n.set("A1", "-1");

assertEquals("Evaluation is not correct", "-1", n.evaluate("A1"));
}
@Test
public void test_NumberHandlingPositive() {
Spreadsheet n = new Spreadsheet();
n.set("A1", "1");

assertEquals("Evaluation is not correct", "1", n.evaluate("A1"));
}
@Test
public void test_NumberHandlingSigned() {
Spreadsheet n = new Spreadsheet();

n.set("A1", "1");

assertEquals("Evaluation is not correct", "1", n.evaluate("A1"));
}
@Test
public void test_IncorrectInteger() {
Spreadsheet n = new Spreadsheet();

n.set("A1", "5A");

assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1"));
}
@Test
public void test_String() {
Spreadsheet n = new Spreadsheet();

n.set("A1", "'This is correct'");

assertEquals("Evaluation is not correct", "This is correct", n.evaluate("A1"));
}
@Test
public void test_StringUnquated() {
Spreadsheet n = new Spreadsheet();

n.set("A1", "'This is incorrect");

assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1"));
}
@Test
public void test_SimpleFormulas() {
Spreadsheet n = new Spreadsheet();

n.set("A1", "='a string'");

assertEquals("Evaluation is not correct", "a string", n.evaluate("A1"));
}
@Test
public void test_SimpleFormulasError() {
Spreadsheet n = new Spreadsheet();

n.set("A1", "='a string");

assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1"));
}
@Test
public void test_CellReference() {
Spreadsheet n = new Spreadsheet();

n.set("A2", "5");
n.set("A1", "=A2");

assertEquals("Evaluation is not correct", "5", n.evaluate("A1"));
}
@Test
public void test_CellReferenceError() {
Spreadsheet n = new Spreadsheet();

n.set("A2", "k5");
n.set("A1", "=A2");

assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1"));
}
@Test
public void test_CircularReference() {
Spreadsheet n = new Spreadsheet();

n.set("A2", "=A1");
n.set("A1", "=A2");

assertEquals("Evaluation is not correct", "#Circular", n.evaluate("A1"));
}
@Test
public void test_IntegerOperations() {
Spreadsheet n = new Spreadsheet();

n.set("A2", "=A1");
n.set("A1", "=A2");

assertEquals("Evaluation is not correct", "#Circular", n.evaluate("A1"));
}




}