fazo96/AIrium
1
0
Fork 0
mirror of https://github.com/fazo96/AIrium.git synced 2025-01-10 09:34:20 +01:00
Code Issues Releases Wiki Activity

some improvements

Browse Source
This commit is contained in:
Enrico Fasoli 2015-07-01 16:03:12 +02:00
parent 18abf1cfd2
commit d5cff69151
8 changed files with 143 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.nb-gradle/profiles/private/aux-config
View File

@ -3,10 +3,6 @@
<!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
<auxiliary>
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/>
</open-files>
<editor-bookmarks lastBookmarkId="0" xmlns="http://www.netbeans.org/ns/editor-bookmarks/2"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/home/fazo/Documents/Git/AIrium/core/src/logic/neural/NeuralConnection.java</file>
@ -17,5 +13,9 @@
<file>file:/home/fazo/Documents/Git/AIrium/core/src/logic/World.java</file>
</group>
</open-files>
<editor-bookmarks lastBookmarkId="0" xmlns="http://www.netbeans.org/ns/editor-bookmarks/2"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/>
</open-files>
</auxiliary>
</gradle-project-properties>

2
core/src/com/mygdx/game/Game.java
View File

@ -32,7 +32,7 @@ public class Game extends ApplicationAdapter {
public void render() {
// Input
if(Gdx.input.isKeyJustPressed(Input.Keys.SPACE)){
world.getElements().clear();
world.newGen();
}
// Update
world.update();

32
core/src/logic/Creature.java
View File

@ -25,16 +25,16 @@ public class Creature extends Element {
hp = 100;
speed = 0;//(float) Math.random() * 3;
rotSpeed = 0;//(float) Math.random() - 0.5f;
sightRange = 40;
fov = (float) Math.PI / 2;
sightRange = 60;
fov = (float) Math.PI / 1.5f;
fitness = 100;
brain = new Brain(3, 2, 1, 4);
brain = new Brain(3, 2, 2, 8);
}
@Override
public void update() {
// apply hunger
hp -= 0.1f;
hp -= 0.5f;
if (hp < 0) {
Game.get().getWorld().getGraveyard().add(this);
}
@ -47,6 +47,12 @@ public class Creature extends Element {
// apply speed
float xMul = (float) Math.cos(dir), yMul = (float) Math.sin(dir);
move(xMul * speed, yMul * speed);
if(getX() < 0) setX(0);
if(getY() < 0) setX(0);
if(getX() > Game.get().getWorld().getWidth())
setX(Game.get().getWorld().getWidth());
if(getY() > Game.get().getWorld().getHeight())
setY(Game.get().getWorld().getHeight());
dir += rotSpeed;
// try eating
eat();
@ -81,7 +87,11 @@ public class Creature extends Element {
float[] actions = brain.compute();
System.out.println("Accel: " + actions[0] + " Rot: " + actions[1]);
speed = actions[0]*max_speed;
rotSpeed = actions[1] - 1f;
rotSpeed = actions[1]/10;
}
public void setHp(float hp) {
this.hp = hp;
}
@Override
@ -92,7 +102,7 @@ public class Creature extends Element {
// Eye
double relX = Math.cos(dir) * getSize(), relY = Math.sin(dir) * getSize();
if (sight != null) {
float c = sight.getDistance() / sightRange;
float c = sight.getDistance() / sightRange*2 + sightRange;
if (sight.getElement() instanceof Creature) {
s.setColor(c, 0, 0, 1);
} else if (sight.getElement() instanceof Vegetable) {
@ -145,7 +155,7 @@ public class Creature extends Element {
for (Element e : Game.get().getWorld().getElements()) {
if (e instanceof Vegetable && overlaps(e)) {
e.setSize(e.getSize() - 0.1f);
hp ++;
hp++;
fitness++;
if (hp > 100) {
hp = 100;
@ -154,8 +164,16 @@ public class Creature extends Element {
}
}
public Brain getBrain() {
return brain;
}
public void setDirection(float dir) {
this.dir = dir;
}
public float getFitness() {
return fitness;
}
}

5
core/src/logic/Vegetable.java
View File

@ -6,6 +6,7 @@
package logic;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.mygdx.game.Game;
/**
*
@ -22,7 +23,9 @@ public class Vegetable extends Element {
@Override
public void update() {
if(getSize() < 0){
Game.get().getWorld().getDeadPlants().add(this);
}
}
@Override

100
core/src/logic/World.java
View File

@ -6,6 +6,8 @@
package logic;
import java.util.ArrayList;
import java.util.Comparator;
import logic.neural.Brain;
/**
*
@ -13,34 +15,80 @@ import java.util.ArrayList;
*/
public class World {
public static final int creatPerGen = 10;
private int width, height;
public ArrayList<Element> elements;
public ArrayList<Element> graveyard;
public ArrayList<Creature> creatures;
public ArrayList<Creature> graveyard;
public ArrayList<Vegetable> plants;
public ArrayList<Vegetable> deadPlants;
public World(int width, int height) {
this.width = width;
this.height = height;
elements = new ArrayList();
creatures = new ArrayList();
plants = new ArrayList();
deadPlants = new ArrayList();
graveyard = new ArrayList();
newGen();
}
public void update() {
while (elements.size() < 40) {
if (Math.random() < 0.4) {
spawnCreature();
} else {
spawnVegetable();
}
/*Creature c = new Creature(300,400);
elements.add(c);
elements.add(new Vegetable(300,450));*/
}
elements.removeAll(graveyard);
graveyard.clear();
for(Element e: elements) e.update();
elements.removeAll(deadPlants);
plants.removeAll(deadPlants);
creatures.removeAll(graveyard);
deadPlants.clear();
if (creatures.isEmpty()) {
// All dead, next gen
newGen();
}
while (plants.size() < 50) {
spawnVegetable();
}
for (Creature e : creatures) {
e.update();
}
}
private void spawn(boolean isCreature) {
public void newGen() {
elements.removeAll(creatures);
creatures.clear();
Comparator creatureComp = new Comparator<Creature>() {
@Override
public int compare(Creature t, Creature t1) {
if (t.getFitness() < t1.getFitness()) {
return -1;
} else if (t.getFitness() > t1.getFitness()) {
return 1;
}
return 0;
}
};
if (graveyard.size() == 0) { // First gen
for (int i = 0; i < creatPerGen; i++) {
spawnCreature();
}
} else { // Mutate previous gen
//graveyard.sort(creatureComp);
int x = 0;
for (Creature c : graveyard) {
c.getBrain().mutate(5f);
if (x < creatPerGen) {
c.setHp(100);
creatures.add(c);
elements.add(c);
} else {
break;
}
}
graveyard.clear();
}
}
private void spawn(boolean isCreature, Brain brain) {
int x, y, r;
boolean overlaps = false;
if (isCreature) {
@ -60,19 +108,27 @@ public class World {
} while (overlaps);
if (isCreature) {
System.out.println("New Creat: " + x + " " + y);
elements.add(new Creature(x, y));
Creature c = new Creature(x, y);
elements.add(c);
creatures.add(c);
} else {
System.out.println("New Veg: " + x + " " + y);
elements.add(new Vegetable(x, y));
Vegetable v = new Vegetable(x, y);
elements.add(v);
plants.add(v);
}
}
private void spawnVegetable() {
spawn(false);
spawn(false, null);
}
private void spawnCreature() {
spawn(true);
spawn(true, null);
}
private void spawnCreature(Brain b) {
spawn(true, b);
}
public int getWidth() {
@ -87,8 +143,12 @@ public class World {
return elements;
}
public ArrayList<Element> getGraveyard() {
public ArrayList<Creature> getGraveyard() {
return graveyard;
}
public ArrayList<Vegetable> getDeadPlants() {
return deadPlants;
}
}

27
core/src/logic/neural/Brain.java
View File

@ -8,33 +8,38 @@ import java.util.ArrayList;
*/
public class Brain {
public static final float bias = 0.5f;
private ArrayList<Neuron> inputs, outputs, hidden;
public Brain(int nInputs, int nOutputs, int hiddenLayers, int neuronsPerHiddenLayer) {
inputs = new ArrayList<Neuron>(nInputs);
outputs = new ArrayList<Neuron>(nOutputs);
hidden = new ArrayList<Neuron>(hiddenLayers * neuronsPerHiddenLayer);
populate(nInputs, nOutputs, hiddenLayers, neuronsPerHiddenLayer);
}
private void populate(int nInputs, int nOutputs, int hiddenLayers, int neuronsPerHiddenLayer) {
// Create input neurons
for (int i = 0; i < nInputs; i++) {
inputs.add(new Neuron(0));
inputs.add(new Neuron(0,bias));
}
// popiulate hidden layers
for (int i = 0; i < hiddenLayers; i++) {
for (int j = 0; j < neuronsPerHiddenLayer; j++) {
// create neuron
Neuron n = new Neuron(i + 1);
Neuron n = new Neuron(i + 1,bias);
// add connections
for (Neuron s : inputs) {
n.getInputs().add(new NeuralConnection(randWeight(), s));
}
hidden.add(n);
System.out.println("Adding Hidden Layer "+(i+1)+" Neuron "+j+" with "+inputs.size()+" inputs");
System.out.println("Adding Hidden Layer " + (i + 1) + " Neuron " + j + " with " + inputs.size() + " inputs");
}
}
// populate output layer
for (int i = 0; i < nOutputs; i++) {
// add neuron
Neuron n = new Neuron(hiddenLayers + 1);
Neuron n = new Neuron(hiddenLayers + 1,bias);
int conn = 0;
for (Neuron s : hidden) {
// add connections where applicable
@ -43,13 +48,13 @@ public class Brain {
n.getInputs().add(new NeuralConnection(randWeight(), s));
}
}
System.out.println("Adding Output Layer Neuron "+i+" with "+conn+" inputs");
System.out.println("Adding Output Layer Neuron " + i + " with " + conn + " inputs");
outputs.add(n);
}
}
private float randWeight(){
return (float) Math.random()*2-1f;
private float randWeight() {
return (float) Math.random()*5 - 2.5f;
}
public void input(float[] values) {
@ -63,7 +68,7 @@ public class Brain {
n.clearCachedValue();
}
float[] res = new float[outputs.size()];
for (int i=0;i<outputs.size();i++) {
for (int i = 0; i < outputs.size(); i++) {
Neuron n = outputs.get(i);
n.clearCachedValue();
res[i] = n.compute();
@ -71,4 +76,8 @@ public class Brain {
return res;
}
public void mutate(float mutationFactor) {
for(Neuron n : hidden) n.mutate(mutationFactor);
}
}

6
core/src/logic/neural/NeuralConnection.java
View File

@ -19,6 +19,7 @@ public class NeuralConnection {
public NeuralConnection(float weight, Neuron source) {
this.source = source;
this.weight = weight;
}
public float compute() {
@ -30,6 +31,11 @@ public class NeuralConnection {
return cachedValue = source.compute() * getWeight();
}
public void mutate(float mutationFactor) {
float mutation = (float) (Math.random() * mutationFactor - mutationFactor/2);
weight += mutation;
}
public void clearCachedValue() {
cachedValueValid = false;
}

6
core/src/logic/neural/Neuron.java
View File

@ -20,7 +20,7 @@ public class Neuron {
private float cachedValue;
private boolean cachedValueValid = false;
public Neuron(int layer) {
public Neuron(int layer, float bias) {
this.layer = layer;
inputs = new ArrayList<NeuralConnection>();
}
@ -44,6 +44,10 @@ public class Neuron {
return cachedValue;
}
public void mutate(float mutationFactor){
for(NeuralConnection n : inputs) n.mutate(mutationFactor);
}
public void setOutput(float output) {
isInputNeuron = true;
this.output = output;