Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Circular switches #47

Merged
merged 16 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions doc_source/notebooks/Matisse/Matisse_ECT.ipynb

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions doc_source/notebooks/Tutorial-ECT_for_CW_Complexes.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -28,7 +28,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 2,
"metadata": {},
"outputs": [
{
Expand All @@ -37,7 +37,7 @@
"<Axes: >"
]
},
"execution_count": 9,
"execution_count": 2,
"metadata": {},
"output_type": "execute_result"
},
Expand All @@ -64,7 +64,7 @@
"\n",
"K.add_face(['A', 'B', 'C', 'D'])\n",
"\n",
"K.set_centered_coordinates(type = 'min_max')\n",
"K.set_centered_coordinates()\n",
"K.plot()"
]
},
Expand All @@ -77,7 +77,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 3,
"metadata": {},
"outputs": [
{
Expand All @@ -86,7 +86,7 @@
"<Axes: >"
]
},
"execution_count": 10,
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
},
Expand All @@ -102,7 +102,7 @@
}
],
"source": [
"K = create_example_cw()\n",
"K = create_example_cw(centered = True)\n",
"K.plot(bounding_circle=True)"
]
},
Expand All @@ -115,7 +115,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 4,
"metadata": {},
"outputs": [
{
Expand All @@ -124,7 +124,7 @@
"<Axes: >"
]
},
"execution_count": 11,
"execution_count": 4,
"metadata": {},
"output_type": "execute_result"
},
Expand Down Expand Up @@ -153,7 +153,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 5,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -194,7 +194,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 6,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -210,7 +210,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 7,
"metadata": {},
"outputs": [
{
Expand All @@ -223,7 +223,7 @@
" -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1])"
]
},
"execution_count": 14,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -242,7 +242,7 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 8,
"metadata": {},
"outputs": [
{
Expand All @@ -269,7 +269,7 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 9,
"metadata": {},
"outputs": [
{
Expand All @@ -284,7 +284,7 @@
" [ 0., 0., 0., ..., -1., -1., -1.]])"
]
},
"execution_count": 16,
"execution_count": 9,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -303,7 +303,7 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": 10,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -338,7 +338,7 @@
},
{
"cell_type": "code",
"execution_count": 18,
"execution_count": 11,
"metadata": {},
"outputs": [
{
Expand Down
82 changes: 41 additions & 41 deletions doc_source/notebooks/Tutorial-ECT_for_embedded_graphs.ipynb

Large diffs are not rendered by default.

273 changes: 273 additions & 0 deletions doc_source/notebooks/Tutorial-ExactECT.ipynb

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc_source/tutorials.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ Tutorials
notebooks/Tutorial-ECT_for_embedded_graphs
notebooks/Tutorial-ECT_for_CW_Complexes
notebooks/Matisse/Matisse_ECT
notebooks/Tutorial-ExactECT

2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 4c70edba7e98f7e5928cfc5e553a567b
config: 4fa06ba1eba33764a2433ecca7acac59
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/_images/notebooks_Matisse_Matisse_ECT_15_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_Matisse_Matisse_ECT_18_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_Matisse_Matisse_ECT_5_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_Matisse_Matisse_ECT_7_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_Matisse_Matisse_ECT_9_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_Tutorial-ECT_for_embedded_graphs_23_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_Tutorial-ECT_for_embedded_graphs_9_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/notebooks_Tutorial-ExactECT_3_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/notebooks_Tutorial-ExactECT_4_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 13 additions & 10 deletions docs/_modules/ect/ect_graph.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@


<!DOCTYPE html>
<html class="writer-html5" lang="en" data-content_root="../../">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ect.ect_graph &mdash; ect 0.1.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=92fd9be5" />
<link rel="stylesheet" type="text/css" href="../../_static/css/theme.css?v=e59714d7" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="../../_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="../../_static/plot_directive.css" />


<link rel="shortcut icon" href="../../_static/ECT_Logo_128x128.png"/>
<script src="../../_static/jquery.js?v=5d32c60e"></script>
<script src="../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="../../_static/documentation_options.js?v=59fadc99"></script>
<script src="../../_static/doctools.js?v=9a2dae69"></script>
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
<script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
<!--[if lt IE 9]>
<script src="../../_static/js/html5shiv.min.js"></script>
<![endif]-->

<script src="../../_static/jquery.js?v=5d32c60e"></script>
<script src="../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="../../_static/documentation_options.js?v=59fadc99"></script>
<script src="../../_static/doctools.js?v=9a2dae69"></script>
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
<script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
<script src="../../_static/js/theme.js"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
Expand Down Expand Up @@ -80,6 +82,7 @@
<li class="toctree-l3"><a class="reference internal" href="../../notebooks/Matisse/Matisse_ECT.html#Acknowledgements">3.3.1. Acknowledgements</a></li>
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="../../notebooks/Tutorial-ExactECT.html">3.4. Tutorial for exact ECT computation</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../../contributing.html">4. Contributing</a><ul>
Expand Down
31 changes: 17 additions & 14 deletions docs/_modules/ect/embed_cw.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@


<!DOCTYPE html>
<html class="writer-html5" lang="en" data-content_root="../../">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ect.embed_cw &mdash; ect 0.1.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=92fd9be5" />
<link rel="stylesheet" type="text/css" href="../../_static/css/theme.css?v=e59714d7" />
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=80d5e7a1" />
<link rel="stylesheet" type="text/css" href="../../_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="../../_static/plot_directive.css" />


<link rel="shortcut icon" href="../../_static/ECT_Logo_128x128.png"/>
<script src="../../_static/jquery.js?v=5d32c60e"></script>
<script src="../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="../../_static/documentation_options.js?v=59fadc99"></script>
<script src="../../_static/doctools.js?v=9a2dae69"></script>
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
<script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
<!--[if lt IE 9]>
<script src="../../_static/js/html5shiv.min.js"></script>
<![endif]-->

<script src="../../_static/jquery.js?v=5d32c60e"></script>
<script src="../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="../../_static/documentation_options.js?v=59fadc99"></script>
<script src="../../_static/doctools.js?v=9a2dae69"></script>
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
<script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
<script src="../../_static/js/theme.js"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
Expand Down Expand Up @@ -80,6 +82,7 @@
<li class="toctree-l3"><a class="reference internal" href="../../notebooks/Matisse/Matisse_ECT.html#Acknowledgements">3.3.1. Acknowledgements</a></li>
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="../../notebooks/Tutorial-ExactECT.html">3.4. Tutorial for exact ECT computation</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../../contributing.html">4. Contributing</a><ul>
Expand Down Expand Up @@ -246,13 +249,13 @@ <h1>Source code for ect.embed_cw</h1><div class="highlight"><pre>

<span class="sd"> .. math ::</span>

<span class="sd"> g_\omega(\sigma) = \max \{ g_\omega(v) \mid v \in \sigma \}</span>
<span class="sd"> g_\\omega(\\sigma) = \\max \\{ g_\\omega(v) \\mid v \\in \\sigma \\}</span>

<span class="sd"> in the direction of :math:`\\theta \in [0,2\pi]` .</span>
<span class="sd"> in the direction of :math:`\\theta \\in [0,2\\pi]` .</span>

<span class="sd"> Parameters:</span>
<span class="sd"> theta (float):</span>
<span class="sd"> The angle in :math:`[0,2\pi]` for the direction to sort the edges.</span>
<span class="sd"> The angle in :math:`[0,2\\pi]` for the direction to sort the edges.</span>
<span class="sd"> return_g (bool):</span>
<span class="sd"> Whether to return the :math:`g(v)` values along with the sorted edges.</span>

Expand Down Expand Up @@ -280,7 +283,7 @@ <h1>Source code for ect.embed_cw</h1><div class="highlight"><pre>

<span class="sd"> Parameters:</span>
<span class="sd"> theta (float):</span>
<span class="sd"> The angle in :math:`[0,2\pi]` for the direction to sort the edges.</span>
<span class="sd"> The angle in :math:`[0,2\\pi]` for the direction to sort the edges.</span>
<span class="sd"> ax (matplotlib.axes.Axes):</span>
<span class="sd"> The axes to plot the graph on. If None, a new figure is created.</span>
<span class="sd"> **kwargs:</span>
Expand Down
Loading
Loading