diff --git a/demos/clogging/task.txt b/demos/clogging/task.txt
deleted file mode 100644
index ed8523689b1f5fe32082b800c9cdf47b91e89a19..0000000000000000000000000000000000000000
--- a/demos/clogging/task.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-1. There is a new version of jpscore, please pull it to local and compile it.
-
-2. There is a new geometry file for simulation, you need to create new geometry files with different width of the exit according to it.
-
-3. Some parameters in inifile are reset, please using the new one.
-The shape of pedestrian is circle, and the radius is 0.2.
-
-
-
-
-
-
-
-
-
-The waiting time before deleting pedestrian in clogging( Tw ) is 2 seconds.
-
-The parameters used in direction part and speed part are reset.
-
-Max simulation time is 500 seconds.
- 500
-Each source generate 50 pedestrians.
-
-
-4. There are five models need to be researched, not four.
-M0: simplest (direction=0,speed=0,GCVM=0)
-M1: simplest+direction (direction=1,speed=0,GCVM=0)
-M2: simplest+velocity (direction=0,speed=1,GCVM=0)
-M3: simplest+direction+velocity (direction=1,speed=1,GCVM=0)
-M4: GCVM (direcction=1,speed=1,GCVM=1)
-you have to study the influence of width of exit, size of the simulation step, update methods, inflow rate of pedestrians for every model, then compare them.
-
-5. The width of exit are
-[0.8, 1.0, 1.2, 1.6, 2.0, 2.5]
-when research the influence of other factors, using width=0.8 and width=1.0.
-We have to compare which result is better.
-
-6. The size of the simulation step and the corresponding fps are [size:fps]
-[0.01:25, 0.02:25, 0.05:20, 0.1:10, 0.2:5]
-when research the influence of other factors, using timestep=0.05,fps=20
-
-7. Update methods are [parallel update, sequential update]
-when research the influence of other factors, using parallel update.
-
-8. Inflow rate of pedestrians are [number of source:the number of pedestrians generated per source] (There may be some problems that require further discussion.)
-[2:200,4:100,8:50,16:25] pedestrians/second, but the total number of generated pedestrians should be 400.
-when research the influence of other factors, using 8:50.
-
-9. Make the figures obtained looks better, at least can show the full title.
-
-10. Need one more figure to compare the value: (last_clogging_time-first_clogging_time)/(clogging times) for every part mentioned above.
\ No newline at end of file
diff --git a/demos/scenario_21_GCVM/GCVM_geo.xml b/demos/scenario_21_GCVM/GCVM_geo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba3b21a6c951540b94384febaa7ecdc9ab920eb1
--- /dev/null
+++ b/demos/scenario_21_GCVM/GCVM_geo.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/scenario_21_GCVM/GCVM_ini.xml b/demos/scenario_21_GCVM/GCVM_ini.xml
new file mode 100644
index 0000000000000000000000000000000000000000..714064b9d18fccaa96f9044ffa0ffea4b170e2fb
--- /dev/null
+++ b/demos/scenario_21_GCVM/GCVM_ini.xml
@@ -0,0 +1,68 @@
+
+ 1.0
+ 8
+ 100
+ GCVM_geo.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ euler
+ 0.05
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demos/clogging/geometry.xml b/demos/scenario_22_clogging/clogging_geo.xml
similarity index 100%
rename from demos/clogging/geometry.xml
rename to demos/scenario_22_clogging/clogging_geo.xml
diff --git a/demos/clogging/inifile_clogging.xml b/demos/scenario_22_clogging/clogging_ini.xml
similarity index 91%
rename from demos/clogging/inifile_clogging.xml
rename to demos/scenario_22_clogging/clogging_ini.xml
index 9457261f49bcca98fed3b811ffe257497ddaa67a..d00b494b2359c96eb81cdec59e16db27e37bfa8b 100644
--- a/demos/clogging/inifile_clogging.xml
+++ b/demos/scenario_22_clogging/clogging_ini.xml
@@ -4,10 +4,10 @@
8
500
log.txt
- geometry.xml
+ clogging_geo.xml
-
+
false
@@ -43,7 +43,8 @@
-
+
+
diff --git a/demos/scenario_23_AGCVM/AGCVM_geo.xml b/demos/scenario_23_AGCVM/AGCVM_geo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba3b21a6c951540b94384febaa7ecdc9ab920eb1
--- /dev/null
+++ b/demos/scenario_23_AGCVM/AGCVM_geo.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/scenario_23_AGCVM/AGCVM_ini.xml b/demos/scenario_23_AGCVM/AGCVM_ini.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d183a95bf65a59c32fcb9d39b22fad177bce29da
--- /dev/null
+++ b/demos/scenario_23_AGCVM/AGCVM_ini.xml
@@ -0,0 +1,68 @@
+
+ 1.0
+ 8
+ 100
+ AGCVM_geo.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ euler
+ 0.05
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demos/scenario_24_bidirection/bidirection_geo.xml b/demos/scenario_24_bidirection/bidirection_geo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3bf275fd2c4475992e2e48dee3eb5d45e0ed5958
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_geo.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/scenario_24_bidirection/bidirection_geo_seperate.xml b/demos/scenario_24_bidirection/bidirection_geo_seperate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..56c62550002ae94d5dbd8cce0f69a1c79b4f73b7
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_geo_seperate.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/scenario_24_bidirection/bidirection_geo_source.xml b/demos/scenario_24_bidirection/bidirection_geo_source.xml
new file mode 100644
index 0000000000000000000000000000000000000000..831f8ba176bf576bf34300d228f60d17abf7d0ce
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_geo_source.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/scenario_24_bidirection/bidirection_geo_wider.xml b/demos/scenario_24_bidirection/bidirection_geo_wider.xml
new file mode 100644
index 0000000000000000000000000000000000000000..56c62550002ae94d5dbd8cce0f69a1c79b4f73b7
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_geo_wider.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/scenario_24_bidirection/bidirection_ini.xml b/demos/scenario_24_bidirection/bidirection_ini.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec9a0718f9237ad890a149ebd212e6cefd5759ad
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_ini.xml
@@ -0,0 +1,92 @@
+
+ 1000.0
+
+ 8
+ 500
+ log.txt
+ bidirection_geo.xml
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ euler
+ 0.05
+ 1
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demos/scenario_24_bidirection/bidirection_ini_seperate.xml b/demos/scenario_24_bidirection/bidirection_ini_seperate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc3b70fbf4dceaa3f22a30e0aae53ba16c413c3f
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_ini_seperate.xml
@@ -0,0 +1,92 @@
+
+ 10000.0
+
+ 8
+ 200
+ log.txt
+ bidirection_geo_seperate.xml
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ euler
+ 0.05
+ 1
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demos/scenario_24_bidirection/bidirection_ini_source.xml b/demos/scenario_24_bidirection/bidirection_ini_source.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fd64a9b4fd87f032159cde066f5f11aade7a53a7
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_ini_source.xml
@@ -0,0 +1,98 @@
+
+ 1000.0
+
+ 8
+ 500
+ log.txt
+ bidirection_geo_source.xml
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ euler
+ 0.05
+ 1
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demos/scenario_24_bidirection/bidirection_ini_wider.xml b/demos/scenario_24_bidirection/bidirection_ini_wider.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e503c1607ea0d7e04bb26fe1d52efbbd27a06880
--- /dev/null
+++ b/demos/scenario_24_bidirection/bidirection_ini_wider.xml
@@ -0,0 +1,92 @@
+
+ 1.0
+
+ 8
+ 200
+ log.txt
+ bidirection_geo_wider.xml
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ euler
+ 0.05
+ 1
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file