WIP

examples/complete.yml

@@ -1,27 +1,38 @@
 ---
-name: simple
-group: tests
-dir_path: "/tmp/"
-num_trials: 3
-max_time: 100
-interval: 1
-seed: "CompleteSeed!"
-network_params:
-  generator: complete_graph
-  n: 10
-network_agents:
-  - agent_type: CounterModel
-    weight: 1
+general:
+  name: simple
+  group: tests
+  dir_path: "/tmp/"
+  num_trials: 3
+  max_time: 100
+  interval: 1
+  seed: "CompleteSeed!"
+network:
+  group:
+    network
+  params:
+    generator: complete_graph
+    n: 10
+environment:
+  environment_class: Environment
+  params:
+    am_i_complete: true
+agents:
+  default:
+    agent_class: CounterModel
     state:
-      state_id: 0
-  - agent_type: AggregatedCounter
-    weight: 0.2
-environment_agents: []
-environment_class: Environment
-environment_params:
-  am_i_complete: true
-default_state:
-  incidents: 0
-states:
-  - name: 'The first node'
-  - name: 'The second node'
+      times: 1
+  environment:
+    fixed:
+      - agent_id: 'Environment Agent 1'
+        agent_class: CounterModel
+        state:
+          times: 10
+  network:
+    distribution:
+      - agent_class: CounterModel
+        weight: 1
+        state:
+          state_id: 0
+      - agent_class: AggregatedCounter
+        weight: 0.2

examples/newsspread/NewsSpread.yml

@@ -1,6 +1,5 @@
 ---
 default_state: {}
-load_module: newsspread
 environment_agents: []
 environment_params:
   prob_neighbor_spread: 0.0
@@ -9,11 +8,11 @@ interval: 1
 max_time: 300
 name: Sim_all_dumb
 network_agents:
-- agent_type: DumbViewer
+- agent_type: newsspread.DumbViewer
   state:
     has_tv: false
   weight: 1
-- agent_type: DumbViewer
+- agent_type: newsspread.DumbViewer
   state:
     has_tv: true
   weight: 1
@@ -24,7 +23,6 @@ network_params:
 num_trials: 50
 ---
 default_state: {}
-load_module: newsspread
 environment_agents: []
 environment_params:
   prob_neighbor_spread: 0.0
@@ -33,19 +31,19 @@ interval: 1
 max_time: 300
 name: Sim_half_herd
 network_agents:
-- agent_type: DumbViewer
+- agent_type: newsspread.DumbViewer
   state:
     has_tv: false
   weight: 1
-- agent_type: DumbViewer
+- agent_type: newsspread.DumbViewer
   state:
     has_tv: true
   weight: 1
-- agent_type: HerdViewer
+- agent_type: newsspread.HerdViewer
   state:
     has_tv: false
   weight: 1
-- agent_type: HerdViewer
+- agent_type: newsspread.HerdViewer
   state:
     has_tv: true
   weight: 1
@@ -56,7 +54,6 @@ network_params:
 num_trials: 50
 ---
 default_state: {}
-load_module: newsspread
 environment_agents: []
 environment_params:
   prob_neighbor_spread: 0.0
@@ -65,12 +62,12 @@ interval: 1
 max_time: 300
 name: Sim_all_herd
 network_agents:
-- agent_type: HerdViewer
+- agent_type: newsspread.HerdViewer
   state:
     has_tv: true
     state_id: neutral
   weight: 1
-- agent_type: HerdViewer
+- agent_type: newsspread.HerdViewer
   state:
     has_tv: true
     state_id: neutral
@@ -82,7 +79,6 @@ network_params:
 num_trials: 50
 ---
 default_state: {}
-load_module: newsspread
 environment_agents: []
 environment_params:
   prob_neighbor_spread: 0.0
@@ -92,12 +88,12 @@ interval: 1
 max_time: 300
 name: Sim_wise_herd
 network_agents:
-- agent_type: HerdViewer
+- agent_type: newsspread.HerdViewer
   state:
     has_tv: true
     state_id: neutral
   weight: 1
-- agent_type: WiseViewer
+- agent_type: newsspread.WiseViewer
   state:
     has_tv: true
   weight: 1
@@ -108,7 +104,6 @@ network_params:
 num_trials: 50
 ---
 default_state: {}
-load_module: newsspread
 environment_agents: []
 environment_params:
   prob_neighbor_spread: 0.0
@@ -118,12 +113,12 @@ interval: 1
 max_time: 300
 name: Sim_all_wise
 network_agents:
-- agent_type: WiseViewer
+- agent_type: newsspread.WiseViewer
   state:
     has_tv: true
     state_id: neutral
   weight: 1
-- agent_type: WiseViewer
+- agent_type: newsspread.WiseViewer
   state:
     has_tv: true
   weight: 1

examples/rabbits/rabbits.yml

@@ -1,5 +1,4 @@
 ---
-load_module: rabbit_agents
 name: rabbits_example
 max_time: 100
 interval: 1

examples/terrorism/TerroristNetworkModel.yml

@@ -1,5 +1,4 @@
 name: TerroristNetworkModel_sim
-load_module: TerroristNetworkModel
 max_time: 150 
 num_trials: 1
 network_params:
@@ -9,19 +8,19 @@ network_params:
   # theta: 20
   n: 100
 network_agents:
-  - agent_type: TerroristNetworkModel
+  - agent_type: TerroristNetworkModel.TerroristNetworkModel
     weight: 0.8
     state:
       id: civilian  # Civilians
-  - agent_type: TerroristNetworkModel
+  - agent_type: TerroristNetworkModel.TerroristNetworkModel
     weight: 0.1
     state:
       id: leader    # Leaders
-  - agent_type: TrainingAreaModel
+  - agent_type: TerroristNetworkModel.TrainingAreaModel
     weight: 0.05
     state:
       id: terrorist # Terrorism
-  - agent_type: HavenModel
+  - agent_type: TerroristNetworkModel.HavenModel
     weight: 0.05
     state:
       id: civilian  # Civilian