diff --git a/README.md b/README.md
deleted file mode 100644
index a7705a58ab40939f4570fbef2fb66cd88efc9dc9..0000000000000000000000000000000000000000
--- a/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# core
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.irit.fr/smac/amak/java/core.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.irit.fr/smac/amak/java/core/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
diff --git a/aabc/Bee.java b/aabc/Bee.java
new file mode 100644
index 0000000000000000000000000000000000000000..b70dab1e18871b15a6e9f10cd58d9d8a7f184b8e
--- /dev/null
+++ b/aabc/Bee.java
@@ -0,0 +1,141 @@
+package aabc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import baseOptiAgent.BaseAgent;
+import eval.Eval;
+
+public class Bee extends BaseAgent{
+
+ Env env;
+
+ int maxCount;
+
+ Phase phase;
+ int stuckCount;
+
+ // EMPLOYED
+ List<List<Double>> randomAgents;
+ double group; // 0.1..0.5
+
+ // ONLOOKERS
+ double bestFitness;
+ //List<List<Double>> randomAgents;
+ //double group;
+
+ public Bee(int _id, Eval _eval, Env _env, int _maxCount) {
+ id = _id;
+ eval = _eval;
+ env = _env;
+
+ maxCount = _maxCount;
+
+ phase = Phase.EMPLOYED;
+ stuckCount = 0;
+
+ vector = generateRandomVector();
+ evaluate = this.evaluate(vector);
+ fitness = this.fitness(evaluate);
+ }
+
+ private void nextPhase() {
+ if (phase == Phase.EMPLOYED) {
+ phase = Phase.ONLOOKERS;
+ }
+ else if (phase == Phase.ONLOOKERS) {
+ phase = Phase.SCOUTS;
+ }
+ else if (phase == Phase.SCOUTS) {
+ phase = Phase.EMPLOYED;
+ }
+ }
+
+ @Override
+ public void perceive() {
+
+ if (phase == Phase.EMPLOYED) {
+ randomAgents = env.getRandomAgents(id);
+ group = env.getGroup(fitness);
+ }
+ else if (phase == Phase.ONLOOKERS) {
+ randomAgents = env.getRandomAgents(id);
+ bestFitness = env.bestFitness();
+ group = env.getGroup(fitness);
+ }
+ else if (phase == Phase.SCOUTS) {
+ }
+
+ }
+
+ private boolean randomlyUpdate() {
+
+ List<Double> newVector = new ArrayList<Double>(vector);
+
+ for (int i = 0; i < vector.size(); i++) {
+ if(Math.random() <= group) {
+ newVector.set(i, vector.get(i) + 2 * (Math.random() - 0.5) * (vector.get(i) - randomAgents.get(i).get(i)));
+ }
+ }
+ this.boundValue(newVector);
+
+ double newEval = evaluate(newVector);
+ double newFit = fitness(newEval);
+ if (fitness < newFit) {
+ //System.out.println("Update from : "+evaluate+" to "+newEval);
+ vector = newVector;
+ evaluate = newEval;
+ fitness = newFit;
+ return true;
+ }
+ return false;
+ }
+
+ private void employedPhase() {
+ boolean res = randomlyUpdate();
+ if (!res) {
+ stuckCount ++;
+ }
+ }
+
+ private void onlookerPhase() {
+
+ // change p to this ? https://www.hindawi.com/journals/jam/2014/402616/
+ double p = (0.9 * fitness / bestFitness) + 0.1;
+
+ if (Math.random() > p) {
+ randomlyUpdate();
+ }
+ }
+
+ private void scoutPhase() {
+ if (stuckCount >= maxCount) {
+ stuckCount = 0;
+
+
+ vector = generateRandomVector();
+ evaluate = this.evaluate(vector);
+ fitness = this.fitness(evaluate);
+ }
+ }
+
+ @Override
+ public void act() {
+
+ if (phase == Phase.EMPLOYED) {
+ employedPhase();
+ }
+ else if (phase == Phase.ONLOOKERS) {
+ onlookerPhase();
+ }
+ else if (phase == Phase.SCOUTS) {
+ scoutPhase();
+ }
+ nextPhase();
+ }
+
+ public Phase getPhase() {
+ return phase;
+ }
+
+}
diff --git a/aabc/Env.java b/aabc/Env.java
new file mode 100644
index 0000000000000000000000000000000000000000..403bea660922848160fb6f2441e654dbb51565e7
--- /dev/null
+++ b/aabc/Env.java
@@ -0,0 +1,74 @@
+package aabc;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import eval.Eval;
+
+public class Env {
+
+ private List<Bee> agents;
+
+ private Eval eval;
+
+ public Env(Eval _eval) {
+ eval = _eval;
+ }
+
+ public void initAgent(List<Bee> _agents) {
+ agents = new ArrayList<Bee>(_agents);
+ }
+
+ private List<Double> getRandomAgent(int id) {
+ if (agents.size() == 1) {
+ throw new java.lang.Error("Cannot return random agent because the environment only know 1 agent.");
+ }
+
+ Random rand = new Random();
+ Bee randomagent = agents.get(rand.nextInt(agents.size()));
+ while (randomagent.getId() == id) {
+ randomagent = agents.get(rand.nextInt(agents.size()));
+ }
+ return randomagent.getVector();
+ }
+
+ public List<List<Double>> getRandomAgents(int id) {
+ List<List<Double>> res = new ArrayList<List<Double>>();
+ for(int i = 0; i < eval.getDim(); i++) {
+ res.add(this.getRandomAgent(id));
+ }
+ return res;
+ }
+
+ public double getGroup(double fitness) {
+ int count = 0;
+ for(Bee bee: agents) {
+ if(bee.getFitness() > fitness) {
+ count ++;
+ }
+ }
+ return Math.ceil((double)count * (double)5 / (double) agents.size())/10;
+ }
+
+ public double bestFitness() {
+ double res = agents.get(0).getFitness();
+ for(Bee agent: agents) {
+ if (res < agent.getFitness()) {
+ res = agent.getFitness();
+ }
+ }
+ return res;
+ }
+
+ public double bestEval() {
+ Bee res = agents.get(0);
+ for(Bee agent: agents) {
+ if (res.getFitness() < agent.getFitness()) {
+ res = agent;
+ }
+ }
+ return res.getEvaluate();
+ }
+
+}
diff --git a/aabc/MainBee.java b/aabc/MainBee.java
new file mode 100644
index 0000000000000000000000000000000000000000..dfa47d2bcdfb47a7c4f4fb29daa8bdc03388603b
--- /dev/null
+++ b/aabc/MainBee.java
@@ -0,0 +1,105 @@
+package aabc;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import eval.Eval;
+import eval.fun.Rastrigin;
+import eval.fun.SchwefelFunction1_2;
+import eval.fun.StepFunction;
+
+public class MainBee {
+ public static void main(String[] args) {
+ // [PARAM]
+
+ int nbrAgent = 100;
+ int maxTry = 200;
+
+ int res = 0;
+ int nbrTry = 1;
+
+ long startTime = System.currentTimeMillis();
+ for (int i = 0; i < nbrTry; i++) {
+ // [INIT]
+
+ //Eval eval = new StepFunction();
+ //Eval eval = new SchwefelFunction1_2();
+ //Eval eval = new SchwefelFunction();
+ Eval eval = new Rastrigin();
+
+
+ Env env = new Env(eval);
+
+ List<Bee> agents = new ArrayList<Bee>();
+ for (int i_agent = 0; i_agent < nbrAgent; i_agent++) {
+ agents.add(new Bee(i_agent, eval, env, maxTry));
+ }
+
+ env.initAgent(agents);
+
+ res += findSolution(nbrAgent, env, eval, agents);
+ System.out.println("run : "+i);
+ System.out.println("Nbr eval :"+eval.getCount());
+ }
+ long estimatedTime = System.currentTimeMillis() - startTime;
+
+ System.out.println("Time : "+estimatedTime/1000+ "s "+estimatedTime%1000+"ms");
+ System.out.println(res);
+ System.out.println("Average cycle : "+(double)res/(double)nbrTry);
+
+ }
+
+ private static int findSolution(
+ int nbrAgent,
+ Env env,
+ Eval eval,
+ List<Bee> agents
+ ) {
+
+ // [RUN]
+
+ int cycle = 0;
+ double bestSol = 0;
+
+ do {
+ do {
+ for (Bee agent : agents) {
+ agent.perceive();
+ }
+ for (Bee agent : agents) {
+ agent.decide();
+ agent.act();
+
+ }
+ }while (agents.get(0).getPhase() != Phase.EMPLOYED);
+
+ if(cycle == 0) {
+ bestSol = env.bestEval();
+ }
+ else if (env.bestEval() < bestSol) {
+ bestSol = env.bestEval();
+ System.out.println("Improve : "+bestSol+" at :"+cycle);
+ }
+
+ cycle ++;
+ //System.out.println("Cycle : "+cycle+" Value : "+env.bestEval());
+
+ /*
+ // Pas à Pas
+ try {
+ System.in.read();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ */
+
+
+
+ } while(Math.abs(env.bestEval()-eval.getObjective())>eval.getErrorDelta());
+
+ return cycle;
+
+ }
+}
diff --git a/aabc/Phase.java b/aabc/Phase.java
new file mode 100644
index 0000000000000000000000000000000000000000..14b6a1e3fb6342f316835068dc663e4e6bf9f20f
--- /dev/null
+++ b/aabc/Phase.java
@@ -0,0 +1,7 @@
+package aabc;
+
+public enum Phase {
+ EMPLOYED,
+ ONLOOKERS,
+ SCOUTS
+}
diff --git a/amakaque/MainAmakaque.java b/amakaque/MainAmakaque.java
index f8ac79aa1a38265e8843ae890a64013a0d319987..e23ac649fded73ab97bf4617b0e7896b5643e452 100644
--- a/amakaque/MainAmakaque.java
+++ b/amakaque/MainAmakaque.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import eval.Eval;
-import eval.fun.Levy_function_1;
import eval.fun.Rastrigin;
import eval.fun.SchwefelFunction;
import eval.fun.SchwefelFunction1_2;
diff --git a/bacteria/Bacteria.java b/bacteria/Bacteria.java
new file mode 100644
index 0000000000000000000000000000000000000000..8cea99d4092976940878228c417b7b4309a1f79a
--- /dev/null
+++ b/bacteria/Bacteria.java
@@ -0,0 +1,7 @@
+package bacteria;
+
+import baseOptiAgent.BaseAgent;
+
+public class Bacteria extends BaseAgent{
+
+}
diff --git a/baseOptiAgent/BaseAgent.java b/baseOptiAgent/BaseAgent.java
index b02310b4f7a451cf7f149196058f609bcbb5e252..173cc3d8fdcc1f98e8a58b4a3ddaa4407fa0f088 100644
--- a/baseOptiAgent/BaseAgent.java
+++ b/baseOptiAgent/BaseAgent.java
@@ -8,15 +8,15 @@ import mas.core.Agent;
public abstract class BaseAgent extends Agent{
- private List<Double> vector;
- private double fitness;
- private double evaluate;
+ protected List<Double> vector;
+ protected double fitness;
+ protected double evaluate;
- private Eval eval;
+ protected Eval eval;
- private int id;
+ protected int id;
- private void boundValue(List<Double> vector) {
+ protected void boundValue(List<Double> vector) {
for(int i = 0; i < vector.size(); i++) {
if (vector.get(i) > eval.getMax(i)) {
vector.set(i, eval.getMax(i));
@@ -27,7 +27,7 @@ public abstract class BaseAgent extends Agent{
}
}
- private List<Double> generateRandomVector(){
+ protected List<Double> generateRandomVector(){
List<Double> result = new ArrayList<Double>();
for (int i = 0; i < eval.getDim(); i++) {
@@ -37,11 +37,11 @@ public abstract class BaseAgent extends Agent{
return result;
}
- private double evaluate(List<Double> vector) {
+ protected double evaluate(List<Double> vector) {
return eval.evaluate(vector);
}
- private double fitness(double value) {
+ protected double fitness(double value) {
if (value >= 0) {
return 1/(1 + value);
}
@@ -50,4 +50,20 @@ public abstract class BaseAgent extends Agent{
}
}
+ public int getId() {
+ return id;
+ }
+
+ public List<Double> getVector() {
+ return vector;
+ }
+
+ public double getEvaluate() {
+ return evaluate;
+ }
+
+ public double getFitness() {
+ return fitness;
+ }
+
}
diff --git a/baseOptiAgent/Env.java b/baseOptiAgent/Env.java
new file mode 100644
index 0000000000000000000000000000000000000000..12c8fd9ba95273a983f7255a1b369ff4a8e87c30
--- /dev/null
+++ b/baseOptiAgent/Env.java
@@ -0,0 +1,14 @@
+package baseOptiAgent;
+
+import eval.Eval;
+
+public abstract class Env {
+
+ Eval eval;
+
+
+
+ public abstract double getBestFitness();
+
+ public abstract double getBestEval();
+}
diff --git a/baseOptiAgent/Solver.java b/baseOptiAgent/Solver.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b9859d7dcde918237f248e99a1c61dcca8a4201
--- /dev/null
+++ b/baseOptiAgent/Solver.java
@@ -0,0 +1,78 @@
+package baseOptiAgent;
+
+import java.util.List;
+
+import eval.Eval;
+import ihm.Result;
+
+public abstract class Solver {
+
+ protected String name;
+
+ protected Eval eval;
+
+ int maxCycle;
+ int maxEval;
+
+ public Solver(Eval _eval, int _maxCycle, int _maxEval) {
+ eval = _eval;
+ maxCycle = _maxCycle;
+ maxEval = _maxEval;
+ }
+
+ public abstract Result solve();
+ // Define name, init env and agents, call findSolution
+
+ protected <A extends BaseAgent, E extends Env> Result findSolution(List<A> agents, E env, int cycleModulo) {
+ Result res = new Result(name);
+
+
+ int cycle = 0;
+
+ res.cycle.put(0, env.getBestEval());
+ double bestEval = env.getBestEval();
+
+ do {
+ for(int i = 0; i < cycleModulo; i++) {
+ for (BaseAgent agent : agents) {
+ agent.perceive();
+ }
+ for (BaseAgent agent : agents) {
+ agent.decide();
+ agent.act();
+ }
+ }
+
+ double nextEval = env.getBestEval();
+ if (nextEval < bestEval) {
+ res.cycle.put(cycle, env.getBestEval());
+ bestEval = nextEval;
+ }
+
+ cycle ++;
+
+ /*
+ // Pas à Pas
+ try {
+ System.in.read();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ */
+
+
+ } while(
+ Math.abs(env.getBestEval()-eval.getObjective())>eval.getErrorDelta()
+ && cycle < maxCycle
+ && eval.getCount() < maxEval
+ );
+
+ res.totalCycle = cycle;
+ res.totalEval = eval.getCount();
+ res.optiFound = Math.abs(env.getBestEval()-eval.getObjective())<=eval.getErrorDelta();
+
+ return res;
+ }
+
+}
diff --git a/bee/Bee.java b/bee/Bee.java
new file mode 100644
index 0000000000000000000000000000000000000000..8bd81cf147a23e0eb399970eb4dc7968317ed8f5
--- /dev/null
+++ b/bee/Bee.java
@@ -0,0 +1,137 @@
+package bee;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import baseOptiAgent.BaseAgent;
+import eval.Eval;
+
+public class Bee extends BaseAgent{
+
+ BeeEnv env;
+
+ int maxCount;
+
+ Phase phase;
+ int stuckCount;
+
+ // EMPLOYED
+ List<Double> randomAgent;
+
+ // ONLOOKERS
+ double bestFitness;
+ //List<Double> randomAgent;
+
+ public Bee(int _id, Eval _eval, BeeEnv _env, int _maxCount) {
+ id = _id;
+ eval = _eval;
+ env = _env;
+
+ maxCount = _maxCount;
+
+ phase = Phase.EMPLOYED;
+ stuckCount = 0;
+
+ vector = generateRandomVector();
+ evaluate = this.evaluate(vector);
+ fitness = this.fitness(evaluate);
+ }
+
+ private void nextPhase() {
+ if (phase == Phase.EMPLOYED) {
+ phase = Phase.ONLOOKERS;
+ }
+ else if (phase == Phase.ONLOOKERS) {
+ phase = Phase.SCOUTS;
+ }
+ else if (phase == Phase.SCOUTS) {
+ phase = Phase.EMPLOYED;
+ }
+ }
+
+ @Override
+ public void perceive() {
+
+ if (phase == Phase.EMPLOYED) {
+ randomAgent = env.getRandomAgent(id);
+ }
+ else if (phase == Phase.ONLOOKERS) {
+ randomAgent = env.getRandomAgent(id);
+ bestFitness = env.getBestFitness();
+ }
+ else if (phase == Phase.SCOUTS) {
+ }
+
+ }
+
+ private boolean randomlyUpdate() {
+ int dim = (int)(Math.random() * vector.size());
+
+ List<Double> newVector = new ArrayList<Double>(vector);
+
+ newVector.set(dim, vector.get(dim) + 2 * (Math.random() - 0.5) * (vector.get(dim) - randomAgent.get(dim)));
+
+ this.boundValue(newVector);
+
+ double newEval = evaluate(newVector);
+ double newFit = fitness(newEval);
+ if (fitness < newFit) {
+ //System.out.println("Update from : "+evaluate+" to "+newEval);
+ vector = newVector;
+ evaluate = newEval;
+ fitness = newFit;
+ return true;
+ }
+ return false;
+ }
+
+ private void employedPhase() {
+ boolean res = randomlyUpdate();
+ if (!res) {
+ stuckCount ++;
+ }
+ }
+
+ private void onlookerPhase() {
+
+ // change p to this ? https://www.hindawi.com/journals/jam/2014/402616/
+ double p = (0.9 * fitness / bestFitness) + 0.1;
+
+ if (Math.random() > p) {
+ randomlyUpdate();
+ }
+ }
+
+ private void scoutPhase() {
+ if (stuckCount >= maxCount) {
+ stuckCount = 0;
+
+
+ double oldEval = evaluate;
+ vector = generateRandomVector();
+ evaluate = this.evaluate(vector);
+ fitness = this.fitness(evaluate);
+ //System.out.println("Reseted : "+oldEval+" to "+evaluate);
+ }
+ }
+
+ @Override
+ public void act() {
+
+ if (phase == Phase.EMPLOYED) {
+ employedPhase();
+ }
+ else if (phase == Phase.ONLOOKERS) {
+ onlookerPhase();
+ }
+ else if (phase == Phase.SCOUTS) {
+ scoutPhase();
+ }
+ nextPhase();
+ }
+
+ public Phase getPhase() {
+ return phase;
+ }
+
+}
diff --git a/bee/BeeEnv.java b/bee/BeeEnv.java
new file mode 100644
index 0000000000000000000000000000000000000000..ca64a0237d3a2a632f4e404699a3fd84f4de7155
--- /dev/null
+++ b/bee/BeeEnv.java
@@ -0,0 +1,52 @@
+package bee;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import baseOptiAgent.Env;
+
+public class BeeEnv extends Env{
+
+ private List<Bee> agents;
+
+ public void initAgent(List<Bee> _agents) {
+ agents = new ArrayList<Bee>(_agents);
+ }
+
+ public List<Double> getRandomAgent(int id) {
+ if (agents.size() == 1) {
+ throw new java.lang.Error("Cannot return random agent because the environment only know 1 agent.");
+ }
+
+ Random rand = new Random();
+ Bee randomagent = agents.get(rand.nextInt(agents.size()));
+ while (randomagent.getId() == id) {
+ randomagent = agents.get(rand.nextInt(agents.size()));
+ }
+ return randomagent.getVector();
+ }
+
+ @Override
+ public double getBestFitness() {
+ double res = agents.get(0).getFitness();
+ for(Bee agent: agents) {
+ if (res < agent.getFitness()) {
+ res = agent.getFitness();
+ }
+ }
+ return res;
+ }
+
+ @Override
+ public double getBestEval() {
+ Bee res = agents.get(0);
+ for(Bee agent: agents) {
+ if (res.getFitness() < agent.getFitness()) {
+ res = agent;
+ }
+ }
+ return res.getEvaluate();
+ }
+
+}
diff --git a/bee/BeeSolver.java b/bee/BeeSolver.java
new file mode 100644
index 0000000000000000000000000000000000000000..63ef6cf30fdc1a4434b73e3a7ee6a5a42f55a686
--- /dev/null
+++ b/bee/BeeSolver.java
@@ -0,0 +1,39 @@
+package bee;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import baseOptiAgent.BaseAgent;
+import baseOptiAgent.Env;
+import baseOptiAgent.Solver;
+import eval.Eval;
+import ihm.Result;
+
+public class BeeSolver extends Solver{
+
+ public BeeSolver(Eval _eval, int _maxCycle, int _maxEval) {
+ super(_eval, _maxCycle, _maxEval);
+ name = "Bee";
+ }
+
+ @Override
+ public Result solve() {
+
+ // [PARAM]
+ int nbrAgent = 100;
+ int maxTry = 200;
+
+ // [INIT]
+ BeeEnv env = new BeeEnv();
+
+ List<Bee> agents = new ArrayList<Bee>();
+ for (int i_agent = 0; i_agent < nbrAgent; i_agent++) {
+ agents.add(new Bee(i_agent, eval, env, maxTry));
+ }
+
+ env.initAgent(agents);
+
+ return findSolution(agents, env, 3);
+ }
+
+}
diff --git a/bee/MainBee.java b/bee/MainBee.java
new file mode 100644
index 0000000000000000000000000000000000000000..907e7271bc6a466064584ca6f28d32aecae8a9c0
--- /dev/null
+++ b/bee/MainBee.java
@@ -0,0 +1,105 @@
+package bee;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import eval.Eval;
+import eval.fun.Rastrigin;
+import eval.fun.SchwefelFunction1_2;
+import eval.fun.StepFunction;
+
+public class MainBee {
+ public static void main(String[] args) {
+ // [PARAM]
+
+ int nbrAgent = 100;
+ int maxTry = 200;
+
+ int res = 0;
+ int nbrTry = 1;
+
+ long startTime = System.currentTimeMillis();
+ for (int i = 0; i < nbrTry; i++) {
+ // [INIT]
+
+ //Eval eval = new StepFunction();
+ //Eval eval = new SchwefelFunction1_2();
+ //Eval eval = new SchwefelFunction();
+ Eval eval = new Rastrigin();
+
+
+ BeeEnv env = new BeeEnv();
+
+ List<Bee> agents = new ArrayList<Bee>();
+ for (int i_agent = 0; i_agent < nbrAgent; i_agent++) {
+ agents.add(new Bee(i_agent, eval, env, maxTry));
+ }
+
+ env.initAgent(agents);
+
+ res += findSolution(nbrAgent, env, eval, agents);
+ System.out.println("run : "+i);
+ System.out.println("Nbr eval :"+eval.getCount());
+ }
+ long estimatedTime = System.currentTimeMillis() - startTime;
+
+ System.out.println("Time : "+estimatedTime/1000+ "s "+estimatedTime%1000+"ms");
+ System.out.println(res);
+ System.out.println("Average cycle : "+(double)res/(double)nbrTry);
+
+ }
+
+ private static int findSolution(
+ int nbrAgent,
+ BeeEnv env,
+ Eval eval,
+ List<Bee> agents
+ ) {
+
+ // [RUN]
+
+ int cycle = 0;
+ double bestSol = 0;
+
+ do {
+ do {
+ for (Bee agent : agents) {
+ agent.perceive();
+ }
+ for (Bee agent : agents) {
+ agent.decide();
+ agent.act();
+
+ }
+ }while (agents.get(0).getPhase() != Phase.EMPLOYED);
+
+ if(cycle == 0) {
+ bestSol = env.getBestEval();
+ }
+ else if (env.getBestEval() < bestSol) {
+ bestSol = env.getBestEval();
+ System.out.println("Improve : "+bestSol+" at :"+cycle);
+ }
+
+ cycle ++;
+ //System.out.println("Cycle : "+cycle+" Value : "+env.bestEval());
+
+ /*
+ // Pas à Pas
+ try {
+ System.in.read();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ */
+
+
+
+ } while(Math.abs(env.getBestEval()-eval.getObjective())>eval.getErrorDelta());
+
+ return cycle;
+
+ }
+}
diff --git a/bee/Phase.java b/bee/Phase.java
new file mode 100644
index 0000000000000000000000000000000000000000..95a926eb2eb97a83626f703ba36e1ed91539d7b6
--- /dev/null
+++ b/bee/Phase.java
@@ -0,0 +1,7 @@
+package bee;
+
+public enum Phase {
+ EMPLOYED,
+ ONLOOKERS,
+ SCOUTS
+}
diff --git a/eval/fun/Levy_function_1.java b/eval/fun/Levy_function_1.java
deleted file mode 100644
index 948e294f81c707995dfbbecb6a779b55c00b572c..0000000000000000000000000000000000000000
--- a/eval/fun/Levy_function_1.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eval.fun;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import eval.Eval;
-
-public class Levy_function_1 extends Eval{
-
- public Levy_function_1() {
- count = new AtomicInteger(0);
-
- dim = 30;
- objective = (double) 0;
- errorDelta = 0.001;
-
- min = new ArrayList<Double>();
- max = new ArrayList<Double>();
- for (int i = 0; i < dim; i++) {
- min.add((double) -50);
- max.add((double) 50);
- }
- }
-
- @Override
- public double evaluate(List<Double> value) {
- count.getAndIncrement();
- double result = 0;
-
- //TODO
-
- return result;
- }
-
-}
diff --git a/ihm/Ihm.java b/ihm/Ihm.java
new file mode 100644
index 0000000000000000000000000000000000000000..f86b58646bc1b3bc9332e0d799872f540bd5b721
--- /dev/null
+++ b/ihm/Ihm.java
@@ -0,0 +1,30 @@
+package ihm;
+
+import baseOptiAgent.Solver;
+import bee.BeeSolver;
+import eval.Eval;
+import eval.fun.Rastrigin;
+
+public class Ihm {
+ public static void main(String[] args) {
+ //Eval eval = new StepFunction();
+ //Eval eval = new SchwefelFunction1_2();
+ //Eval eval = new SchwefelFunction();
+ Eval eval = new Rastrigin();
+
+ int maxCycle = 200000;
+ int maxEval = 1000000;
+
+ Solver solver = new BeeSolver(eval, maxCycle, maxEval);
+ Result res = solver.solve();
+
+ System.out.println("Cycle : "+res.totalCycle+" Out of "+maxCycle);
+ System.out.println("Eval : "+res.totalEval+" Out of "+maxEval);
+ System.out.println("Solution found "+res.optiFound);
+
+ System.out.println("Solution : ");
+ for (Integer name: res.cycle.keySet()) {
+ System.out.println(name + " " + res.cycle.get(name));
+ }
+ }
+}
diff --git a/ihm/Result.java b/ihm/Result.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6dd96db994e498f236339e43261f15b8063e0f8
--- /dev/null
+++ b/ihm/Result.java
@@ -0,0 +1,24 @@
+package ihm;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class Result {
+
+ public String name;
+
+ public int totalEval;
+ public int totalCycle;
+
+ public boolean optiFound;
+
+ public Map<Integer, Double> cycle;
+
+ public Result(String _name) {
+ name = _name;
+ optiFound = false;
+ cycle = new TreeMap<Integer, Double>();
+ }
+
+}