From c4eef923799376e99b2e57c042682e81d34e91f7 Mon Sep 17 00:00:00 2001
From: David Huss <dh@atoav.com>
Date: Thu, 16 Nov 2023 11:12:16 +0100
Subject: [PATCH] Add base for InterpolatingLookup
---
.gitignore | 1 +
.../default-37a8.jupyterlab-workspace | 1 -
circuitsim/lookup-tables.ipynb | 21 ++++++++++---------
3 files changed, 12 insertions(+), 11 deletions(-)
delete mode 100644 circuitsim/.jupyter/desktop-workspaces/default-37a8.jupyterlab-workspace
diff --git a/.gitignore b/.gitignore
index bebd94a..4b35e7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
*.private.*
*.~lock*
*.ipynb_checkpoints*
+*.jupyter*
diff --git a/circuitsim/.jupyter/desktop-workspaces/default-37a8.jupyterlab-workspace b/circuitsim/.jupyter/desktop-workspaces/default-37a8.jupyterlab-workspace
deleted file mode 100644
index 79abff0..0000000
--- a/circuitsim/.jupyter/desktop-workspaces/default-37a8.jupyterlab-workspace
+++ /dev/null
@@ -1 +0,0 @@
-{"data":{"layout-restorer:data":{"main":{"dock":{"type":"tab-area","currentIndex":1,"widgets":["notebook:circuit_sim.ipynb","notebook:lookup-tables.ipynb","notebook:envelope.ipynb"]},"current":"notebook:lookup-tables.ipynb"},"down":{"size":0,"widgets":[]},"left":{"collapsed":false,"current":"filebrowser","widgets":["filebrowser","running-sessions","@jupyterlab/toc:plugin","extensionmanager.main-view"]},"right":{"collapsed":true,"widgets":["jp-property-inspector","debugger-sidebar"]},"relativeSizes":[0.13545601726929304,0.864543982730707,0]},"notebook:circuit_sim.ipynb":{"data":{"path":"circuit_sim.ipynb","factory":"Notebook"}},"notebook:lookup-tables.ipynb":{"data":{"path":"lookup-tables.ipynb","factory":"Notebook"}},"notebook:envelope.ipynb":{"data":{"path":"envelope.ipynb","factory":"Notebook"}}},"metadata":{"id":"default"}}
\ No newline at end of file
diff --git a/circuitsim/lookup-tables.ipynb b/circuitsim/lookup-tables.ipynb
index 9ee9b2c..eab000b 100644
--- a/circuitsim/lookup-tables.ipynb
+++ b/circuitsim/lookup-tables.ipynb
@@ -487,7 +487,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "2d8b20f88a544803acc5d6a6c39e7193",
+ "model_id": "e9fff586d6da4132a47d3bb55ba0a36f",
"version_major": 2,
"version_minor": 0
},
@@ -636,19 +636,19 @@
},
{
"cell_type": "code",
- "execution_count": 10,
+ "execution_count": 13,
"id": "f35f1609-3a10-4dce-b7dd-201d79f2c39c",
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "099c8c33c29e44bc836e6d216dc8f852",
+ "model_id": "348306ab65c840f2bc70034b706e0fde",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
- "interactive(children=(FloatSlider(value=0.2, description='f', max=1.0, step=0.001), Output()), _dom_classes=('…"
+ "interactive(children=(FloatSlider(value=0.2, description='f', max=1.5, min=-1.5, step=0.001), Output()), _dom_…"
]
},
"metadata": {},
@@ -660,20 +660,21 @@
"<function __main__.draw(f)>"
]
},
- "execution_count": 10,
+ "execution_count": 13,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
+ "# Saturation curve\n",
"\n",
"# X / Y / Curvature\n",
"lines_orig = [\n",
- " [0.0, 0.0, 1.0],\n",
- " [0.45, 0.5, 1.0],\n",
- " [0.55, 0.7, 1.0],\n",
- " [0.551, 0.5, 1.0],\n",
- " [1.0, 1.0, 0.0],\n",
+ " [-1.5, -1.0, 1.0],\n",
+ " [-0.7, -0.7, 0.0],\n",
+ " [0.0, 0.0, 0.0],\n",
+ " [0.7, 0.7, -1.4],\n",
+ " [1.5, 1.0, 0.0],\n",
"]\n",
"\n",
"lines = []\n",
--
GitLab