Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .idea/modules/oolab.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules/oolab.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules/oolab.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions oolab/src/main/java/agh/ics/oop/AbstractAnimal.java

This file was deleted.

25 changes: 25 additions & 0 deletions oolab/src/main/java/agh/ics/oop/AbstractMap.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,29 @@
package agh.ics.oop;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;

public abstract class AbstractMap {
protected HashMap<Vector2d,Grass> grassOnField = new HashMap<>();
protected HashMap<Vector2d,Animal> animalsOnField = new HashMap<>();
protected int height;
protected int width;
protected HashSet<Vector2d> noGrassSpots = new HashSet<>();

public AbstractMap() {
//Big Bang
}

protected abstract void moveOnMap(Animal animal);

protected ArrayList<Animal> animalsOnSpot(Vector2d spot){
return null;
}
protected boolean isGrassThere(Vector2d spot){
//implementujemy
return false;
}

protected void placeAnimal(Vector2d spot, Animal animal){}
}
32 changes: 32 additions & 0 deletions oolab/src/main/java/agh/ics/oop/Animal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package agh.ics.oop;

public class Animal implements IMapElement{
protected Direction orientation;
protected Vector2d position;
protected int energy;
protected Direction[] genes;
protected int activeGeneIx;
protected int grassEaten;
protected int diedDate;
protected int age;
protected int children;

//konstruktor dla Adama i Ewy
public Animal(IMutationModel mutationModel) {
//tu trzeba wszystko losować
}
//konstruktor dla dzieciów
public Animal(IMutationModel mutationModel, Animal mommy, Animal daddy){
//wpisać konstruktor
mutationModel.mutate(this, mommy, daddy);
}

@Override
public String getImageName() {
return null;
}

public void changePosition(Vector2d newPosition){
this.position=newPosition;
}
}
4 changes: 4 additions & 0 deletions oolab/src/main/java/agh/ics/oop/ForestedEquators.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
package agh.ics.oop;

public class ForestedEquators implements IHolyGardener{
@Override
public void seedGrass() {

}
}
5 changes: 5 additions & 0 deletions oolab/src/main/java/agh/ics/oop/GlobMap.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
package agh.ics.oop;

public class GlobMap extends AbstractMap{

@Override
protected void moveOnMap(Animal animal) {

}
}
5 changes: 5 additions & 0 deletions oolab/src/main/java/agh/ics/oop/Grass.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
package agh.ics.oop;

public class Grass implements IMapElement{
private Vector2d position;
@Override
public String getImageName() {
return null;
}
}
4 changes: 4 additions & 0 deletions oolab/src/main/java/agh/ics/oop/HellMap.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
package agh.ics.oop;

public class HellMap extends AbstractMap{
@Override
protected void moveOnMap(Animal animal) {

}
}
7 changes: 7 additions & 0 deletions oolab/src/main/java/agh/ics/oop/HijinksEngine.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
package agh.ics.oop;

public class HijinksEngine implements ISimulationEngine{
private IMutationModel mutationModel;
private IHolyGardener gardener;

@Override
public void run() {

}
}
1 change: 1 addition & 0 deletions oolab/src/main/java/agh/ics/oop/IHolyGardener.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package agh.ics.oop;

public interface IHolyGardener {
void seedGrass();
}
1 change: 1 addition & 0 deletions oolab/src/main/java/agh/ics/oop/IMapElement.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package agh.ics.oop;

public interface IMapElement {
String getImageName();
}
5 changes: 5 additions & 0 deletions oolab/src/main/java/agh/ics/oop/IMutationModel.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package agh.ics.oop;

public interface IMutationModel {
void mutate(Animal child, Animal mommy, Animal daddy);
}
1 change: 1 addition & 0 deletions oolab/src/main/java/agh/ics/oop/ISimulationEngine.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package agh.ics.oop;

public interface ISimulationEngine {
void run();
}
8 changes: 8 additions & 0 deletions oolab/src/main/java/agh/ics/oop/LittleAdjustment.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package agh.ics.oop;

public class LittleAdjustment implements IMutationModel{
@Override
public void mutate(Animal child, Animal mommy, Animal daddy) {

}
}
7 changes: 7 additions & 0 deletions oolab/src/main/java/agh/ics/oop/PredestinationEngine.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
package agh.ics.oop;

public class PredestinationEngine implements ISimulationEngine{
private IMutationModel mutationModel;
private IHolyGardener gardener;

@Override
public void run() {

}
}
4 changes: 0 additions & 4 deletions oolab/src/main/java/agh/ics/oop/SimulationEngine.java

This file was deleted.

12 changes: 12 additions & 0 deletions oolab/src/main/java/agh/ics/oop/Statistics.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package agh.ics.oop;

import java.util.HashMap;

public class Statistics {
private int amountOfGrass;
private HashMap<Vector2d, Integer> diedAnimals=new HashMap<>();
public int getAmountOfAnimals(){
//oblicz ile było wszystkich zwierzaków w danej symulacji
return 0;
}
}
8 changes: 8 additions & 0 deletions oolab/src/main/java/agh/ics/oop/TotalRandom.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package agh.ics.oop;

public class TotalRandom implements IMutationModel{
@Override
public void mutate(Animal child, Animal mommy, Animal daddy) {

}
}
4 changes: 4 additions & 0 deletions oolab/src/main/java/agh/ics/oop/ToxicCorpses.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
package agh.ics.oop;

public class ToxicCorpses implements IHolyGardener{
@Override
public void seedGrass() {

}
}