diff --git a/irit.gama.feature.switchproject/.project b/irit.gama.feature.switchproject/.project
deleted file mode 100644
index 44455199..00000000
--- a/irit.gama.feature.switchproject/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- irit.gama.feature.switchproject
-
-
-
-
-
- org.eclipse.pde.FeatureBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.FeatureNature
-
-
diff --git a/irit.gama.feature.switchproject/.settings/org.eclipse.core.resources.prefs b/irit.gama.feature.switchproject/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/irit.gama.feature.switchproject/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/irit.gama.feature.switchproject/.settings/org.eclipse.m2e.core.prefs b/irit.gama.feature.switchproject/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1..00000000
--- a/irit.gama.feature.switchproject/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/irit.gama.feature.switchproject/build.properties b/irit.gama.feature.switchproject/build.properties
deleted file mode 100644
index 64f93a9f..00000000
--- a/irit.gama.feature.switchproject/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/irit.gama.feature.switchproject/feature.xml b/irit.gama.feature.switchproject/feature.xml
deleted file mode 100644
index f00eeaa3..00000000
--- a/irit.gama.feature.switchproject/feature.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- [Enter Feature Description here.]
-
-
-
- [Enter Copyright Description here.]
-
-
-
- [Enter License Description here.]
-
-
-
-
-
diff --git a/irit.gama.feature.switchproject/pom.xml b/irit.gama.feature.switchproject/pom.xml
deleted file mode 100644
index 1553d7f0..00000000
--- a/irit.gama.feature.switchproject/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
- 4.0.0
- irit.gama
- irit.gama.feature.switchproject
- eclipse-feature
-
- msi.gama
- msi.gama.experimental.parent
- 1.9.2-SNAPSHOT
- ../msi.gama.experimental.parent/
-
- 1.0.0-SNAPSHOT
-
diff --git a/irit.gama.switchproject/.classpath b/irit.gama.switchproject/.classpath
deleted file mode 100644
index e12039a5..00000000
--- a/irit.gama.switchproject/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irit.gama.switchproject/.factorypath b/irit.gama.switchproject/.factorypath
deleted file mode 100644
index d9cd5ba5..00000000
--- a/irit.gama.switchproject/.factorypath
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/irit.gama.switchproject/.project b/irit.gama.switchproject/.project
deleted file mode 100644
index 2858fe20..00000000
--- a/irit.gama.switchproject/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- irit.gama.switchproject
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/irit.gama.switchproject/.settings/org.eclipse.jdt.apt.core.prefs b/irit.gama.switchproject/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index 5d293658..00000000
--- a/irit.gama.switchproject/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=gaml
-org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests
-org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/irit.gama.switchproject/.settings/org.eclipse.jdt.core.prefs b/irit.gama.switchproject/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 072f301b..00000000
--- a/irit.gama.switchproject/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/irit.gama.switchproject/META-INF/MANIFEST.MF b/irit.gama.switchproject/META-INF/MANIFEST.MF
deleted file mode 100644
index 8b97689e..00000000
--- a/irit.gama.switchproject/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SwITCh Project
-Bundle-SymbolicName: irit.gama.switchproject;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Automatic-Module-Name: irit.gama.switchproject
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: msi.gama.core,
- msi.gama.ext
-Export-Package: irit.gama.common.interfaces,
- irit.gama.util.deque,
- irit.gama.util.event_manager,
- irit.gaml.architecure.event_manager,
- irit.gaml.operators,
- irit.gaml.skills.logging,
- irit.gaml.skills.scheduling,
- irit.gaml.skills.traffic,
- irit.gaml.statements,
- irit.gaml.types
diff --git a/irit.gama.switchproject/build.properties b/irit.gama.switchproject/build.properties
deleted file mode 100644
index f6d617de..00000000
--- a/irit.gama.switchproject/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- models/
diff --git a/irit.gama.switchproject/models/QueueEventManaged/.project b/irit.gama.switchproject/models/QueueEventManaged/.project
deleted file mode 100644
index e7b6003e..00000000
--- a/irit.gama.switchproject/models/QueueEventManaged/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- QueueEventManaged
- switchproject plugin
-
-
-
-
- org.eclipse.xtext.ui.shared.xtextBuilder
-
-
-
-
-
- org.eclipse.xtext.ui.shared.xtextNature
- msi.gama.application.gamaNature
- msi.gama.application.pluginNature
-
-
diff --git a/irit.gama.switchproject/models/QueueEventManaged/models/Road.gaml b/irit.gama.switchproject/models/QueueEventManaged/models/Road.gaml
deleted file mode 100644
index c161af3e..00000000
--- a/irit.gama.switchproject/models/QueueEventManaged/models/Road.gaml
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
-* Name: Queue
-* Queue and event manager demo.
-* Author: Jean-François Erdelyi
-* Tags:
-*/
-model Road
-
-/**
- * Initialisation of the model
- */
-global {
-// Road and cars params
- float road_width <- 3.5 #m const: true;
- float road_height <- 30 #m const: true;
- float car_width <- 1.5 #m const: true;
- float car_height <- 4.0 #m const: true;
-
- // Shape of the world
- geometry shape <- rectangle(road_width, road_height);
-
- // Temporal param
- float step <- 1 #s;
- date starting_date <- date([1970, 1, 1, 0, 0, 0]);
-
- // Cars generator rate (+1 => arithmetic error if value is 0)
- int generate_frequency <- 2 update: rnd(1, 10) + 1;
-
- // Create manager and road
- init {
- create manager;
- create queue_road;
- }
-
- // Generate cars
- reflex generate when: (cycle mod generate_frequency) = 0 {
- ask (queue_road) {
- do add_car();
- }
-
- }
-
-}
-
-/**
- * Event manager species
- */
-species manager control: event_manager {
-
- // Reflex to write the size of event queues
- reflex write_size {
- write "[" + name + "]::[write_size] manager size = " + size + " at " + (starting_date + time);
- }
-
-}
-
-/**
- * The car species with scheduling skill in order to use the action 'later'
- */
-species car skills: [scheduling] {
- // General aspect
- geometry shape <- rectangle(car_width, car_height) at_location point(road_width / 2.0, road_height);
- rgb color <- rnd_color(255);
-
- // The event manager used to schedule cars
- agent event_manager <- manager[0];
-
- // Last word and die
- action die_in_peace (string last_word) {
- write "Peace " + last_word;
- ask queue_road[0] {
- do change_locations;
- }
-
- do later the_action: "die" at: (event_date + 1);
- }
-
- // Default aspect
- aspect default {
- draw shape color: color;
- }
-
-}
-
-/**
- * The queue road species with scheduling skill in order to use the action 'later'
- */
-species queue_road skills: [scheduling] {
- // Capacity
- int nb_car_max <- 5;
-
- // Representation of cars inside the road
- queue cars_queue;
-
- // General aspect
- geometry shape <- rectangle(road_width, road_height) at_location point(road_width / 2.0, road_height / 2.0);
-
- // Free flow travel time (fake)
- int time_to_travel <- 10;
-
- // The event manager used to schedule road
- agent event_manager <- manager[0];
-
- // Pop car
- action pop_car {
- write "Pop car at: " + event_date;
-
- // Pop car
- if (length(cars_queue) > 0) {
- car c <- pop(cars_queue);
-
- // Die
- ask c {
- do later the_action: "die_in_peace" with_arguments: map("last_word"::"OK"); // at is null -> no
- }
-
- }
-
- }
-
- // Change location of each cars
- action change_locations {
- int i <- 0;
- loop c over: car {
- c.location <- {road_width / 2.0, c.location.y - (car_height + (car_height / 2.0))};
- i <- i + 1;
- }
-
- }
-
- // Add new car
- action add_car {
- if (length(cars_queue) < nb_car_max) {
- // Create and get new car
- create car returns: new_cars;
- car new_car <- new_cars[0];
-
- // Set location and time
- new_car.location <- {road_width / 2.0, length(cars_queue) * (car_height + (car_height / 2.0)) + 0.5 + (car_height / 2.0)};
- date t <- starting_date + time + (time_to_travel);
-
- // Push car to queue
- push item: new_car to: cars_queue;
-
- // Schedule pop
- do later the_action: "pop_car" at: t;
- }
-
- }
-
- // Default aspect
- aspect default {
- draw shape color: rgb(255 * (1 - (nb_car_max - length(cars_queue)) / nb_car_max), 0, 0);
- }
-
-}
-
-/**
- * Experiments
- */
-experiment Road type: gui {
- output {
- display main_window type: opengl {
- species queue_road;
- species car;
- }
-
- }
-
-}
diff --git a/irit.gama.switchproject/models/QueueEventManaged/models/Test Simple.gaml b/irit.gama.switchproject/models/QueueEventManaged/models/Test Simple.gaml
deleted file mode 100644
index 9927fafb..00000000
--- a/irit.gama.switchproject/models/QueueEventManaged/models/Test Simple.gaml
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
-* Name: TestSimple
-* Based on the internal empty template.
-* Author: benoitgaudou
-* Tags:
-*/
-
-
-model TestSimple
-
-global {
- // Temporal param
- float step <- 1 #s;
- date starting_date <- date([1970, 1, 1, 0, 0, 0]);
-
- init {
- create manager;
- create people number: 2;
-
- ask people {
- loop t from: 10 to: 100 step: 10 {
- do later the_action: "info" at: starting_date + t#s refer_to: people(0) ;
- }
- }
- }
-}
-
-/**
- * Event manager species
- */
-species manager control: event_manager {
-
- // Reflex to write the size of event queues
- reflex write_size {
- write "[" + name + "]::[write_size] manager size = " + size + " at " + (starting_date + time);
- }
-
-}
-
-/**
- * The car species with scheduling skill in order to use the action 'later'
- */
-species people skills: [scheduling] {
- // The event manager used to schedule cars
- agent event_manager <- manager[0];
-
- action info {
- write sample(self) + " - " + sample(current_date) + ' - ' + sample(cycle);
- }
-}
-
-
-experiment name type: gui {
- output {
-
- }
-}
\ No newline at end of file
diff --git a/irit.gama.switchproject/models/Simple IDM/.project b/irit.gama.switchproject/models/Simple IDM/.project
deleted file mode 100644
index b1a54726..00000000
--- a/irit.gama.switchproject/models/Simple IDM/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- Simple IDM
- switchproject plugin
-
-
-
-
- org.eclipse.xtext.ui.shared.xtextBuilder
-
-
-
-
-
- org.eclipse.xtext.ui.shared.xtextNature
- msi.gama.application.gamaNature
- msi.gama.application.pluginNature
-
-
diff --git a/irit.gama.switchproject/models/Simple IDM/includes/road.cpg b/irit.gama.switchproject/models/Simple IDM/includes/road.cpg
deleted file mode 100644
index 3ad133c0..00000000
--- a/irit.gama.switchproject/models/Simple IDM/includes/road.cpg
+++ /dev/null
@@ -1 +0,0 @@
-UTF-8
\ No newline at end of file
diff --git a/irit.gama.switchproject/models/Simple IDM/includes/road.dbf b/irit.gama.switchproject/models/Simple IDM/includes/road.dbf
deleted file mode 100644
index c3e72bbc..00000000
Binary files a/irit.gama.switchproject/models/Simple IDM/includes/road.dbf and /dev/null differ
diff --git a/irit.gama.switchproject/models/Simple IDM/includes/road.prj b/irit.gama.switchproject/models/Simple IDM/includes/road.prj
deleted file mode 100644
index f45cbadf..00000000
--- a/irit.gama.switchproject/models/Simple IDM/includes/road.prj
+++ /dev/null
@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/irit.gama.switchproject/models/Simple IDM/includes/road.qix b/irit.gama.switchproject/models/Simple IDM/includes/road.qix
deleted file mode 100644
index 760cc37b..00000000
Binary files a/irit.gama.switchproject/models/Simple IDM/includes/road.qix and /dev/null differ
diff --git a/irit.gama.switchproject/models/Simple IDM/includes/road.shp b/irit.gama.switchproject/models/Simple IDM/includes/road.shp
deleted file mode 100644
index df632411..00000000
Binary files a/irit.gama.switchproject/models/Simple IDM/includes/road.shp and /dev/null differ
diff --git a/irit.gama.switchproject/models/Simple IDM/includes/road.shx b/irit.gama.switchproject/models/Simple IDM/includes/road.shx
deleted file mode 100644
index b5efdb5d..00000000
Binary files a/irit.gama.switchproject/models/Simple IDM/includes/road.shx and /dev/null differ
diff --git a/irit.gama.switchproject/models/Simple IDM/models/IDM Skill.gaml b/irit.gama.switchproject/models/Simple IDM/models/IDM Skill.gaml
deleted file mode 100644
index 86feabf2..00000000
--- a/irit.gama.switchproject/models/Simple IDM/models/IDM Skill.gaml
+++ /dev/null
@@ -1,87 +0,0 @@
-model IDM
-
-// Car species using IDM skill
-species car skills: [idm] {
- // Default shape, length is an IDM parameter
- geometry default_shape <- rectangle(length, 1.5);
- // The car target
- point the_target;
- // The next car
- car next_car <- nil;
-
- // Relfex move, using supersedes goto (from moving skill)
- reflex move {
- // Do goto to target, on the graph and follow the next car
- do goto target: the_target on: the_graph follow: next_car;
-
- // If location is reached then kill the car
- if location = the_target {
- do die();
- }
-
- }
-
- // Default aspect, rotate the default shape in the right direction
- aspect default {
- // Rotate default shape
- shape <- default_shape rotated_by heading at_location location;
- draw shape color: #blue;
- }
-
-}
-
-// Simple road species
-species road {
- aspect default {
- draw shape color: #grey;
- }
-
-}
-
-// The world
-global {
- // Generator frequency in cycle
- int generate_frequency <- 20;
- // Time step
- float step <- 0.1;
- // Last created car
- car last_car <- nil;
-
- // Road shapefile
- file road_shapefile <- file("../includes/road.shp");
- // The road graph
- graph the_graph;
- // World shape
- geometry shape <- envelope(road_shapefile);
-
-
- // Init the world
- init {
- // Create roads and the graph
- create road from: road_shapefile;
- the_graph <- as_edge_graph(road);
- }
-
- // Car generator
- reflex generate when: (cycle mod generate_frequency) = 0 {
- // Create car start from the begining of the road and the target is the end of the road
- create car {
- location <- first(road[0].shape.points);
- the_target <- last(road[0].shape.points);
- next_car <- last_car;
- last_car <- self;
- }
- }
-
-}
-
-// Experiment
-experiment "IDM using IDM skill" {
- output {
- display "IDM skill" type: opengl {
- species road;
- species car;
- }
-
- }
-}
diff --git a/irit.gama.switchproject/models/Simple IDM/models/IDM.gaml b/irit.gama.switchproject/models/Simple IDM/models/IDM.gaml
deleted file mode 100644
index 8656f4d9..00000000
--- a/irit.gama.switchproject/models/Simple IDM/models/IDM.gaml
+++ /dev/null
@@ -1,110 +0,0 @@
-model IDM
-
-// Car species using moving skill: implement IDM
-species car skills: [moving] {
- // Default shape, length is an IDM parameter
- geometry default_shape <- rectangle(lenght, 1.5);
- // The car target
- point the_target;
- // The next car
- car next_car <- nil;
-
- // IDM params
- float lenght <- 5.0 #m;
- float desired_speed <- 30.0 #m / #s;
- float spacing <- 1.0 #m;
- float reaction_time <- 1.5 #s;
- float max_acceleration <- 4.0 #m / #s ^ 2;
- float desired_deceleration <- 3.0 #m / #s ^ 2;
-
- // Dynamic params
- float acceleration <- 0.0 min: -desired_deceleration max: max_acceleration #m / #s ^ 2;
- float speed <- 0.0 #m / #s;
-
- // Move reflex
- reflex move {
- // Check if this is the first car or not
- if next_car = nil or dead(next_car) {
- // Compute acceleration
- acceleration <- max_acceleration * (1 - ((speed / desired_speed) ^ 4.0));
- } else {
- // Compute acceleration with the next car
- float delta_speed <- next_car.speed - speed;
- float actual_gap <- (self distance_to next_car using topology(the_graph)) - lenght;
- float desired_minimum_gap <- spacing + (reaction_time * speed) - ((speed * delta_speed) / (2 * sqrt(max_acceleration * desired_deceleration)));
- acceleration <- max_acceleration * (1 - ((speed / desired_speed) ^ 4.0) - ((desired_minimum_gap / actual_gap) ^ 2));
- }
-
- // Compute speed and goto
- speed <- speed + (acceleration * step);
- do goto on: the_graph target: the_target speed: speed;
- if location = the_target {
- do die();
- }
-
- }
-
- // Default aspect, rotate the default shape in the right direction
- aspect default {
- // Rotate default shape
- shape <- default_shape rotated_by heading at_location location;
- draw shape color: #blue;
- }
-
-}
-
-// Simple road species
-species road {
- aspect default {
- draw shape color: #grey;
- }
-
-}
-
-// The world
-global {
- // Generator frequency in cycle
- int generate_frequency <- 20;
- // Time step
- float step <- 0.1;
- // Last created car
- car last_car <- nil;
-
- // Road shapefile
- file road_shapefile <- file("../includes/road.shp");
- // The road graph
- graph the_graph;
- // World shape
- geometry shape <- envelope(road_shapefile);
-
-
- // Init the world
- init {
- // Create roads and the graph
- create road from: road_shapefile;
- the_graph <- as_edge_graph(road);
- }
-
- // Car generator
- reflex generate when: (cycle mod generate_frequency) = 0 {
- // Create car start from the begining of the road and the target is the end of the road
- create car {
- location <- first(road[0].shape.points);
- the_target <- last(road[0].shape.points);
- next_car <- last_car;
- last_car <- self;
- }
- }
-
-}
-
-// Experiment
-experiment "IDM using moving skill" {
- output {
- display "IDM moving skill" type: opengl {
- species road;
- species car;
- }
-
- }
-}
diff --git a/irit.gama.switchproject/plugin.xml b/irit.gama.switchproject/plugin.xml
deleted file mode 100644
index 5779e40e..00000000
--- a/irit.gama.switchproject/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
diff --git a/irit.gama.switchproject/pom.xml b/irit.gama.switchproject/pom.xml
deleted file mode 100644
index dad53e9e..00000000
--- a/irit.gama.switchproject/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
- 4.0.0
- irit.gama
- irit.gama.switchproject
- eclipse-plugin
-
- msi.gama
- msi.gama.experimental.parent
- 1.9.2-SNAPSHOT
- ../msi.gama.experimental.parent/
-
- 1.0.0-SNAPSHOT
-
\ No newline at end of file
diff --git a/irit.gama.switchproject/src/irit/gama/common/interfaces/IKeywordIrit.java b/irit.gama.switchproject/src/irit/gama/common/interfaces/IKeywordIrit.java
deleted file mode 100644
index 6eaee9d0..00000000
--- a/irit.gama.switchproject/src/irit/gama/common/interfaces/IKeywordIrit.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************************************
- *
- * IKeywordIrit.java, in plugin irit.gama.switchproject, is part of the source code of the GAMA modeling and simulation
- * platform (v. 1.8.1)
- *
- * (c) 2007-2020 UMI 209 UMMISCO IRD/SU & Partners
- *
- * Visit https://github.com/gama-platform/gama for license information and contacts.
- *
- ********************************************************************************************************/
-
-package irit.gama.common.interfaces;
-
-/**
- * Keywords of IRIT
- *
- * @author Jean-François Erdelyi
- */
-public interface IKeywordIrit {
-
- public static final String ID = "id";
-
- /**
- * Queue and stack keywords
- */
- public static final String QUEUE = "queue";
- public static final String STACK = "stack";
-
- public static final String QUEUE_OPERATOR = "Queue-related operators";
- public static final String STACK_OPERATOR = "Stack-related operators";
-
- public static final int DEQUE_TYPE = 666;
- public static final int QUEUE_TYPE = 667;
- public static final int STACK_TYPE = 668;
-
- public static final String PUSH = "push";
-
- /**
- * Scheduling keywords
- */
- public static final String EVENT_MANAGER = "event_manager";
-
- public static final String EVENT = "event";
- public static final String EVENTS = "events";
- public static final String EVENT_DATE = "event_date";
-
- public static final String THE_ACTION = "the_action";
- public static final String WITH_ARGUMENTS = "with_arguments";
- public static final String AT = "at";
- public static final String REFER_TO = "refer_to";
- public static final String CALLER = "caller";
-
- public static final String SIZE_BY_AGENT = "size_by_agent";
-
- public static final String SCHEDULING = "scheduling";
-
- /**
- * Logger keywords
- */
- public static final String LOGGING = "logging";
-
- public static final String FLUSH = "flush";
- public static final String LOGBOOK = "logbook";
- public static final String LOG_DATA = "log_data";
- public static final String FILE_NAME = "file_name";
- public static final String SECTION = "section";
- public static final String ENTRY = "entry";
- public static final String VALUE = "value";
- public static final String DATE = "date";
- public static final String X = "x";
- public static final String Y = "y";
-
- /**
- * IDM
- */
- public static final String IDM = "idm";
- public static final String VEHICLE_LENGTH = "length";
- public static final String IDM_DESIRED_SPEED = "desired_speed";
- public static final String IDM_SPACING = "spacing";
- public static final String IDM_REACTION_TIME = "reaction_time";
- public static final String IDM_MAX_ACCELERATION = "max_acceleration";
- public static final String IDM_DESIRED_DECELERATION = "desired_deceleration";
-
- public static final String IDM_ACCELERATION = "acceleration";
- public static final String IDM_DELTA_SPEED = "delta_speed";
- public static final String IDM_ACTUAL_GAP = "actual_gap";
- public static final String IDM_DESIRED_MINIMUM_GAP = "desired_minimum_gap";
-
- /**
- * Event Queue Road
- */
- public static final String EVENT_QUEUE = "event_queue";
- public static final String BPR_ALPHA = "alpha";
- public static final String BPR_BETA = "beta";
- public static final String EVENT_QUEUE_VOLUME = "volume";
- public static final String EVENT_QUEUE_LENGTH = "length";
-
- /**
- * Roads
- */
- public static final String ROAD = "road";
- public static final String ROAD_NODE = "road_node";
- public static final String ROADS_IN = "roads_in";
- public static final String ROADS_OUT = "roads_out";
- public final static String AGENTS = "all_agents";
-
- public final static String ALL_ENTITIES = "all_entities";
- public final static String NODE_IN = "node_in";
- public final static String NODE_OUT = "node_out";
- public final static String MAXSPEED = "maxspeed";
-
-}
diff --git a/irit.gama.switchproject/src/irit/gama/util/deque/GamaDeque.java b/irit.gama.switchproject/src/irit/gama/util/deque/GamaDeque.java
deleted file mode 100644
index 19e657cf..00000000
--- a/irit.gama.switchproject/src/irit/gama/util/deque/GamaDeque.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************************************
- *
- * GamaDeque.java, in plugin irit.gama.switchproject, is part of the source code of the GAMA modeling and simulation
- * platform (v. 1.8.1)
- *
- * (c) 2007-2020 UMI 209 UMMISCO IRD/SU & Partners
- *
- * Visit https://github.com/gama-platform/gama for license information and contacts.
- *
- ********************************************************************************************************/
-
-package irit.gama.util.deque;
-
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import msi.gama.common.util.StringUtils;
-import msi.gama.metamodel.shape.GamaPoint;
-import msi.gama.runtime.IScope;
-import msi.gama.runtime.exceptions.GamaRuntimeException;
-import msi.gama.util.GamaListFactory;
-import msi.gama.util.GamaMapFactory;
-import msi.gama.util.IContainer;
-import msi.gama.util.IList;
-import msi.gama.util.IMap;
-import msi.gama.util.matrix.IMatrix;
-import msi.gaml.types.GamaIntegerType;
-import msi.gaml.types.GamaMatrixType;
-import msi.gaml.types.IContainerType;
-import msi.gaml.types.IType;
-import msi.gaml.types.Types;
-
-/**
- * Deque used for Queue and Stack types
- *
- * @author Jean-François Erdelyi
- */
-@SuppressWarnings({ "rawtypes", "unchecked" })
-public class GamaDeque extends ArrayDeque implements IContainer {
-
- // ############################################
- // Attributs
-
- /**
- * The serializable class does not declare a static final serialVersionUID field
- * of type long
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * GAMA type
- */
- protected IContainerType> type;
-
- // ############################################
- // Constructors
-
- /**
- * Default constructor
- */
- public GamaDeque(IContainerType> contentsType) {
- super();
- type = contentsType;
- }
-
- /**
- * Constructor with values and type (List)
- */
- public GamaDeque(IContainerType> contentsType, List values) {
- super();
- type = contentsType;
- addAll(values);
- }
-
- /**
- * Constructor with values and type (array)
- */
- public GamaDeque(IContainerType> contentsType, T[] values) {
- super();
- type = contentsType;
- addAll(values);
- }
-
- /**
- * Constructor with values and type (Collection)
- */
- public GamaDeque(IContainerType> contentsType, Collection values) {
- super();
- type = contentsType;
- addAll(values);
- }
-
- /**
- * Copy constructor
- */
- public GamaDeque(GamaDeque gq) {
- super(gq.clone());
- type = gq.getGamlType();
- }
-
- // ############################################
- // Methods
-
- /**
- * Add all values (List)
- */
- private void addAll(List values) {
- for (T v : values) {
- add(v);
- }
- }
-
- /**
- * Add all values (array)
- */
- private void addAll(T[] values) {
- for (T v : values) {
- add(v);
- }
- }
-
- /**
- * Build value
- */
- public T buildValue(final IScope scope, final Object object) {
- final IType> ct = getGamlType().getContentType();
- return (T) ct.cast(scope, object, null, false);
- }
-
- /**
- * Build values
- */
- public GamaDeque buildValues(final IScope scope, final IContainer, ?> objects) {
- return (GamaDeque) getGamlType().cast(scope, objects, null, false);
- }
-
- /**
- * Build index
- */
- public Integer buildIndex(final IScope scope, final Object object) {
- return GamaIntegerType.staticCast(scope, object, null, false);
- }
-
- // ############################################
- // Override: methods
-
- /**
- * To string
- */
- @Override
- public String stringValue(IScope scope) throws GamaRuntimeException {
- return serialize(false);
- }
-
- /**
- * Serialization (like a list)
- */
- @Override
- public String serialize(final boolean includingBuiltIn) {
- final StringBuilder sb = new StringBuilder(size() * 10);
- Object[] values = toArray();
-
- sb.append('[');
- for (int i = 0; i < size(); i++) {
- if (i != 0) {
- sb.append(',');
- }
- sb.append(StringUtils.toGaml(values[i], includingBuiltIn));
- }
- sb.append(']');
-
- return sb.toString();
- }
-
- /**
- * Clone data
- */
- @Override
- public GamaDeque copy(IScope scope) throws GamaRuntimeException {
- return new GamaDeque(this);
- }
-
- /**
- * Get GAMA type
- */
- @Override
- public IContainerType> getGamlType() {
- return type;
- }
-
- /**
- * Return true if the value exists in the collection
- */
- @Override
- public boolean contains(IScope scope, Object o) throws GamaRuntimeException {
- return contains(o);
- }
-
- /**
- * Check if the "key" exists (index here)
- */
- @Override
- public boolean containsKey(IScope scope, Object o) throws GamaRuntimeException {
- if (o instanceof Integer) {
- final Integer i = (Integer) o;
- return i >= 0 && i < this.size();
- }
- return false;
- }
-
- /**
- * Get first value
- */
- @Override
- public T firstValue(IScope scope) throws GamaRuntimeException {
- return getFirst();
- }
-
- /**
- * Get last value
- */
- @Override
- public T lastValue(IScope scope) throws GamaRuntimeException {
- return getLast();
- }
-
- /**
- * Get random value
- */
- @Override
- public T anyValue(IScope scope) {
- final int i = scope.getRandom().between(0, 1);
- return i == 0 ? getFirst() : getLast();
- }
-
- /**
- * Get the number of values
- */
- @Override
- public int length(IScope scope) {
- return size();
- }
-
- /**
- * True if the collection is empty
- */
- @Override
- public boolean isEmpty(IScope scope) {
- return isEmpty();
- }
-
- // ############################################
- // Override: methods about values
-
- /**
- * Get the list of values (is "equivalent" to toArray())
- */
- @Override
- public IList