Skip to content

derp changes #6

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

derp changes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0795f7b
derp changes
laboon Nov 10, 2015
2c3cf0a
Merge branch 'master' into wjl_derp
asavage8 Oct 16, 2017
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
21 changes: 11 additions & 10 deletions com/laboon/Cell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,17 @@ public State iterate(int numNeighbors) {
* @return Character representation of the cell's state
*/

public char getStateRep() {
char toReturn = ' ';
if (_state == State.DEAD) {
toReturn = '.';
} else if (_state == State.ALIVE) {
toReturn = '*';
} else {
toReturn = ' ';
}
return toReturn;

public char getStateRep() {
char toReturn = ' ';
if (_state == State.DEAD) {
toReturn = ' ';
} else if (_state == State.ALIVE) {
toReturn = '*';
} else {
toReturn = ' ';
}
return toReturn;
}

/**
Expand Down
32 changes: 16 additions & 16 deletions com/laboon/JavaLife.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

public class JavaLife {

/**
* This is the main part.
*
* @param size Size of world
* @param seed Random number seed
* @param percent Percent of cells alive at beginning
* @param maxIterations Maximum number of iterations
*/

/**
*
* @param size Size of a world
* @param seed Random number seed for RNG
* @param percent Percent of cells alive at beginning
* @param maxIterations Maximum number of iterations
*/

public JavaLife(int size, int seed, int percent, int maxIterations) {
World w = new World(size, seed, percent);
System.out.println("Initial Configuration:");
System.out.println(w.toString());
for (int j=0; j < maxIterations; j++) {
w = w.iterate();
System.out.println("Iteration " + (j + 1) + ":");
System.out.println(w.toString());
public JavaLife(int size, int seed, int percent, int maxIterations) {
World w = new World(size, seed, percent);
System.out.println("Initial Configuration:");
System.out.println( w.toString() );
for (int j=0; j < maxIterations; j++) {
w = w.iterate();
System.out.println("Iteration " + (j + 1) + ":");
System.out.println(w.toString());
}

}
Expand Down