update notebooks

kirchhoff/init_crystal.py

@@ -3,7 +3,7 @@
 # @Email:  kramer@mpi-cbg.de
 # @Project: go-with-the-flow
 # @Last modified by:    Felix Kramer
-# @Last modified time: 2021-05-23T15:14:10+02:00
+# @Last modified time: 2021-08-29T23:29:37+02:00
 # @License: MIT
 import networkx as nx
 import numpy as np
@@ -103,7 +103,7 @@ class networkx_simple(networkx_crystal,object):
         self.translation_length=1.
         self.simple_cubic_lattice(num_periods)
 
-    #construct full triangulated hex grid as skeleton
+    #construct full cubic grid as skeleton
     def simple_unit_cell(self):
 
         D=nx.Graph()

notebook/test_init_graphs.ipynb

@@ -48,7 +48,7 @@
     {
      "data": {
       "text/plain": [
-       "<kirchhoff.circuit_flow.flow_circuit at 0x1480007a0c8>"
+       "<kirchhoff.circuit_flow.flow_circuit at 0x2d780f97708>"
       ]
      },
      "execution_count": 3,
@@ -80,7 +80,7 @@
     {
      "data": {
       "text/plain": [
-       "<kirchhoff.circuit_flow.flow_circuit at 0x14803149788>"
+       "<kirchhoff.circuit_flux.flux_circuit at 0x2d78407cf88>"
       ]
      },
      "execution_count": 4,
@@ -89,15 +89,15 @@
     }
    ],
    "source": [
-    "import kirchhoff.circuit_flux as kfc\n",
-    "kfc.initialize_circuit_from_networkx(G)\n",
-    "kfc.initialize_flow_circuit_from_crystal('simple',3)\n",
-    "kfc.initialize_flow_circuit_from_random(random_type='voronoi_volume')"
+    "import kirchhoff.circuit_flux as kfx\n",
+    "kfx.initialize_circuit_from_networkx(G)\n",
+    "kfx.initialize_flux_circuit_from_crystal('simple',3)\n",
+    "kfx.initialize_flux_circuit_from_random(random_type='voronoi_volume')"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -111,10 +111,10 @@
     {
      "data": {
       "text/plain": [
-       "<kirchhoff.circuit_dual.dual_circuit at 0x14803186548>"
+       "<kirchhoff.circuit_dual.dual_circuit at 0x2d7840cdb88>"
       ]
      },
-     "execution_count": 7,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -148,7 +148,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,