Merge remote-tracking branch 'origin/dev' into feature/2502-placeholders-docs

src/primaite/notebooks/Using-Episode-Schedules.ipynb

@@ -6,6 +6,8 @@
    "source": [
     "# Using Episode Schedules\n",
     "\n",
+    "© Crown-owned copyright 2024, Defence Science and Technology Laboratory UK\n",
+    "\n",
     "PrimAITE supports the ability to use different variations on a scenario at different episodes. This can be used to increase \n",
     "domain randomisation to prevent overfitting, or to set up curriculum learning to train agents to perform more complicated tasks.\n",
     "\n",
@@ -13,50 +15,6 @@
     "directory with several config files that work together."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Defining variations in the config file.\n",
-    "\n",
-    "### Base scenario\n",
-    "The base scenario is essentially the same as a fixed YAML configuration, but it can contain placeholders that are \n",
-    "populated with episode-specific data at runtime. The base scenario contains any network, agent, or settings that\n",
-    "remain fixed for the entire training/evaluation session.\n",
-    "\n",
-    "The placeholders are defined as YAML Aliases and they are denoted by an asterisk (`*placeholder`).\n",
-    "\n",
-    "### Variations\n",
-    "For each variation that could be used in a placeholder, there is a separate yaml file that contains the data that should populate the placeholder.\n",
-    "\n",
-    "The data that fills the placeholder is defined as a YAML Anchor in a separate file, denoted by an ampersand (`&anchor`).\n",
-    "\n",
-    "[Learn more about YAML Aliases and Anchors here.](https://www.educative.io/blog/advanced-yaml-syntax-cheatsheet#:~:text=YAML%20Anchors%20and%20Alias)\n",
-    "\n",
-    "### Schedule\n",
-    "Users must define which combination of scenario variations should be loaded in each episode. This takes the form of a\n",
-    "YAML file with a relative path to the base scenario and a list of paths to be loaded in during each episode.\n",
-    "\n",
-    "It takes the following format:\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "```yaml\n",
-    "base_scenario: base.yaml\n",
-    "schedule:\n",
-    "  0: # list of variations to load in at episode 0 (before the first call to env.reset() happens)\n",
-    "    - laydown_1.yaml\n",
-    "    - attack_1.yaml\n",
-    "  1: # list of variations to load in at episode 1 (after the first env.reset() call)\n",
-    "    - laydown_2.yaml\n",
-    "    - attack_2.yaml\n",
-    "```\n"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -298,8 +256,8 @@
     "table = PrettyTable()\n",
     "table.field_names = [\"step\", \"Green Action\", \"Red Action\"]\n",
     "for i in range(21):\n",
-    "    green_action = env.game.agents['green_A'].action_history[i].action\n",
-    "    red_action = env.game.agents['red_A'].action_history[i].action\n",
+    "    green_action = env.game.agents['green_A'].history[i].action\n",
+    "    red_action = env.game.agents['red_A'].history[i].action\n",
     "    table.add_row([i, green_action, red_action])\n",
     "print(table)"
    ]
@@ -329,8 +287,8 @@
     "table = PrettyTable()\n",
     "table.field_names = [\"step\", \"Green Action\", \"Red Action\"]\n",
     "for i in range(21):\n",
-    "    green_action = env.game.agents['green_B'].action_history[i].action\n",
-    "    red_action = env.game.agents['red_B'].action_history[i].action\n",
+    "    green_action = env.game.agents['green_B'].history[i].action\n",
+    "    red_action = env.game.agents['red_B'].history[i].action\n",
     "    table.add_row([i, green_action, red_action])\n",
     "print(table)"
    ]