fixed all examples

ThummeTo · Sep 11, 2024 · 409ad8b · 409ad8b
1 parent da93960
commit 409ad8b
Show file tree

Hide file tree

Showing 6 changed files with 320 additions and 71 deletions.
diff --git a/examples/src/inputs.ipynb b/examples/src/inputs.ipynb
diff --git a/examples/src/multiprocessing.ipynb b/examples/src/multiprocessing.ipynb
@@ -14,7 +14,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 1,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:20:18.794000Z",
@@ -112,7 +112,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 3,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:20:27.186000Z",
@@ -202,7 +202,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:21:32.504000Z",
@@ -236,7 +236,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 7,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:21:40.054000Z",
@@ -286,7 +286,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": null,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:22:25.583000Z",
@@ -345,7 +345,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 11,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:24:10.627000Z",

diff --git a/examples/src/multithreading.ipynb b/examples/src/multithreading.ipynb
@@ -14,7 +14,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 21,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:24:22.502000Z",
@@ -82,7 +82,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 22,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:24:22.779000Z",
@@ -97,7 +97,8 @@
     "using FMI\n",
     "using FMIZoo\n",
     "using Folds\n",
-    "using BenchmarkTools"
+    "using BenchmarkTools\n",
+    "using DifferentialEquations"
    ]
   },
   {
@@ -337,15 +338,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.8.2",
+   "display_name": "Julia 1.10.5",
    "language": "julia",
-   "name": "julia-1.8"
+   "name": "julia-1.10"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.8.2"
+   "version": "1.10.5"
   }
  },
  "nbformat": 4,

diff --git a/examples/src/parameter_optimization.ipynb b/examples/src/parameter_optimization.ipynb
@@ -13,7 +13,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 19,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:26:47.623000Z",
@@ -65,7 +65,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 20,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:26:47.908000Z",
@@ -81,7 +81,8 @@
     "using FMI\n",
     "using FMIZoo\n",
     "using Optim\n",
-    "using Plots"
+    "using Plots\n",
+    "using DifferentialEquations"
    ]
   },
   {
@@ -306,6 +307,15 @@
     "Actually a pretty fit! If you have higher requirements, check out the *Optim.jl* library."
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 28,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "unloadFMU(fmu)"
+   ]
+  },
   {
    "attachments": {},
    "cell_type": "markdown",
@@ -327,15 +337,15 @@
    "notebook_metadata_filter": "-all"
   },
   "kernelspec": {
-   "display_name": "Julia 1.8.5",
+   "display_name": "Julia 1.10.5",
    "language": "julia",
-   "name": "julia-1.8"
+   "name": "julia-1.10"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.8.5"
+   "version": "1.10.5"
   },
   "nteract": {
    "version": "0.28.0"

diff --git a/examples/src/parameterize.ipynb b/examples/src/parameterize.ipynb
@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 47,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:26:47.623000Z",
@@ -55,7 +55,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 48,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:26:47.908000Z",
@@ -111,7 +111,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:27:25.403000Z",
@@ -174,7 +174,7 @@
    },
    "outputs": [],
    "source": [
-    "fmi2Instantiate!(fmu; loggingOn=true)"
+    "c = fmi2Instantiate!(fmu; loggingOn=true)"
    ]
   },
   {
@@ -197,7 +197,7 @@
    },
    "outputs": [],
    "source": [
-    "fmi2SetupExperiment(fmu, tStart, tStop)"
+    "fmi2SetupExperiment(c, tStart, tStop)"
    ]
   },
   {
@@ -246,7 +246,7 @@
    },
    "outputs": [],
    "source": [
-    "fmi2EnterInitializationMode(fmu)"
+    "fmi2EnterInitializationMode(c)"
    ]
   },
   {
@@ -269,7 +269,7 @@
    },
    "outputs": [],
    "source": [
-    "getValue(fmu, params)"
+    "getValue(c, params)"
    ]
   },
   {
@@ -292,7 +292,7 @@
    },
    "outputs": [],
    "source": [
-    "fmi2ExitInitializationMode(fmu)"
+    "fmi2ExitInitializationMode(c)"
    ]
   },
   {
@@ -370,9 +370,9 @@
    },
    "outputs": [],
    "source": [
-    "fmi2Terminate(fmu)\n",
-    "fmi2Reset(fmu)\n",
-    "fmi2SetupExperiment(fmu, tStart, tStop)"
+    "fmi2Terminate(c)\n",
+    "fmi2Reset(c)\n",
+    "fmi2SetupExperiment(c, tStart, tStop)"
    ]
   },
   {
@@ -395,7 +395,7 @@
    },
    "outputs": [],
    "source": [
-    "setValue(fmu, params, collect(paramsVal))"
+    "setValue(c, params, collect(paramsVal))"
    ]
   },
   {
@@ -418,9 +418,9 @@
    },
    "outputs": [],
    "source": [
-    "fmiEnterInitializationMode(fmu)\n",
-    "# getValue(fmu, params)\n",
-    "fmiExitInitializationMode(fmu)"
+    "fmi2EnterInitializationMode(c)\n",
+    "# getValue(c, params)\n",
+    "fmi2ExitInitializationMode(c)"
    ]
   },
   {
@@ -443,7 +443,7 @@
    },
    "outputs": [],
    "source": [
-    "simData = simulate(fmu, (tStart, tStop); recordValues=params[1:3], saveat=tSave, \n",
+    "simData = simulate(c, (tStart, tStop); recordValues=params[1:3], saveat=tSave, \n",
     "                        instantiate=false, setup=false, freeInstance=false, terminate=false, reset=false)"
    ]
   },
@@ -469,9 +469,9 @@
    },
    "outputs": [],
    "source": [
-    "fmi2Terminate(fmu)\n",
-    "fmi2Reset(fmu)\n",
-    "fmi2SetupExperiment(fmu, tStart, tStop)"
+    "fmi2Terminate(c)\n",
+    "fmi2Reset(c)\n",
+    "fmi2SetupExperiment(c, tStart, tStop)"
    ]
   },
   {
@@ -517,10 +517,10 @@
    },
    "outputs": [],
    "source": [
-    "fmi2SetReal(fmu, \"p_real\", rndReal)\n",
-    "fmi2SetBoolean(fmu, \"p_boolean\", rndBoolean)\n",
-    "fmi2SetInteger(fmu, \"p_integer\", rndInteger)\n",
-    "fmi2SetString(fmu, \"p_string\", rndString)"
+    "fmi2SetReal(c, \"p_real\", rndReal)\n",
+    "fmi2SetBoolean(c, \"p_boolean\", rndBoolean)\n",
+    "fmi2SetInteger(c, \"p_integer\", rndInteger)\n",
+    "fmi2SetString(c, \"p_string\", rndString)"
    ]
   },
   {
@@ -549,12 +549,12 @@
    },
    "outputs": [],
    "source": [
-    "fmi2EnterInitializationMode(fmu)\n",
-    "# fmi2GetReal(fmu, \"u_real\")\n",
-    "# fmi2GetBoolean(fmu, \"u_boolean\")\n",
-    "# fmi2GetInteger(fmu, \"u_integer\")\n",
-    "# fmi2GetString(fmu, \"p_string\")\n",
-    "fmi2ExitInitializationMode(fmu)"
+    "fmi2EnterInitializationMode(c)\n",
+    "# fmi2GetReal(c, \"u_real\")\n",
+    "# fmi2GetBoolean(c, \"u_boolean\")\n",
+    "# fmi2GetInteger(c, \"u_integer\")\n",
+    "# fmi2GetString(c, \"p_string\")\n",
+    "fmi2ExitInitializationMode(c)"
    ]
   },
   {
@@ -577,7 +577,7 @@
    },
    "outputs": [],
    "source": [
-    "simData = simulate(fmu, (tStart, tStop); recordValues=params[1:3], saveat=tSave, \n",
+    "simData = simulate(c, (tStart, tStop); recordValues=params[1:3], saveat=tSave, \n",
     "                        instantiate=false, setup=false)"
    ]
   },
@@ -592,7 +592,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 69,
    "metadata": {
     "execution": {
      "iopub.execute_input": "2022-10-22T13:27:52.293000Z",
@@ -628,15 +628,15 @@
    "notebook_metadata_filter": "-all"
   },
   "kernelspec": {
-   "display_name": "Julia 1.9.1",
+   "display_name": "Julia 1.10.5",
    "language": "julia",
-   "name": "julia-1.9"
+   "name": "julia-1.10"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.9.1"
+   "version": "1.10.5"
   },
   "nteract": {
    "version": "0.28.0"