Updates

blegat · Feb 27, 2020 · 905ebc6 · 905ebc6
1 parent 28e62d6
commit 905ebc6
Show file tree

Hide file tree

Showing 9 changed files with 458 additions and 177 deletions.
diff --git a/CITATION.bib b/CITATION.bib
@@ -39,9 +39,9 @@ @Article{legat2019entropy
 }
 @Misc{SwitchOnSafety,
   author = {Legat, Beno{\^\i}t and Gomes, Cl{\'a}udio},
-  title  = {blegat/{S}witch{O}n{S}afety.jl: v0.0.1},
-  month  = may,
+  title  = {blegat/{S}witch{O}n{S}afety.jl: v0.0.4},
+  month  = oct,
   year   = {2019},
-  doi    = {10.5281/zenodo.1246104},
-  url    = {https://doi.org/10.5281/zenodo.1246104},
+  doi    = {10.5281/zenodo.3234046},
+  url    = {https://doi.org/10.5281/zenodo.3234046}
 }
diff --git a/examples/AP12e21.ipynb b/examples/AP12e21.ipynb
@@ -148,15 +148,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.0.1",
+   "display_name": "Julia 1.0.3",
    "language": "julia",
    "name": "julia-1.0"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.0.1"
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,

diff --git a/examples/Finiteness_conjecture_counterexample.ipynb b/examples/Finiteness_conjecture_counterexample.ipynb
@@ -113,6 +113,14 @@
    "execution_count": 3,
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "┌ Info: Recompiling stale cache file /home/blegat/.julia/compiled/v1.1/SwitchOnSafety/EUPLd.ji for SwitchOnSafety [ceb7f16a-07bf-5f4a-9354-b68f01b1610f]\n",
+      "└ @ Base loading.jl:1184\n"
+     ]
+    },
     {
      "data": {
       "text/plain": [
@@ -562,7 +570,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -580,7 +588,7 @@
        "Hybrid System with automaton OneStateAutomaton(2)"
       ]
      },
-     "execution_count": 4,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -606,7 +614,9 @@
   {
    "cell_type": "code",
    "execution_count": 5,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "using MosekTools\n",
@@ -1905,14 +1915,14 @@
     }
    ],
    "source": [
-    "@time smp, ub = gripenberg(s∞, δ=52e-5, max_eval=10_000_000, max_length=1000)\n",
+    "@time smp, ub = gripenberg(s∞, δ=52e-5, max_eval=10_000_000, max_length=100)\n",
     "@show ub\n",
     "show_smp(smp)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -1921,8 +1931,8 @@
      "text": [
       "ρ evaluations   : 866588 < 10000000 = max_ρ_eval.\n",
       "norm evaluations: 866588 < 10000000 = max_norm_eval.\n",
-      "switch length   : 94 < 1000 = max_length.\n",
-      "  5.389752 seconds (40.26 M allocations: 3.041 GiB, 19.56% gc time)\n",
+      "switch length   : 94 < 100 = max_length.\n",
+      "  6.508251 seconds (40.26 M allocations: 3.041 GiB, 19.55% gc time)\n",
       "ub = 1.4097572220583487\n",
       "   SMP: 001001010010010100101\n",
       "Length: 21\n",
@@ -1931,7 +1941,189 @@
     }
    ],
    "source": [
-    "@time smp, ub = gripenberg(s∞, δ=51e-5, max_eval=10_000_000, max_length=1000)\n",
+    "@time smp, ub = gripenberg(s∞, δ=51e-5, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 11,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : 920582 < 10000000 = max_ρ_eval.\n",
+      "norm evaluations: 920582 < 10000000 = max_norm_eval.\n",
+      "switch length   : 94 < 100 = max_length.\n",
+      "  7.008577 seconds (42.78 M allocations: 3.232 GiB, 20.75% gc time)\n",
+      "ub = 1.4097522220583487\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=50.5e-5, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 12,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : 944544 < 10000000 = max_ρ_eval.\n",
+      "norm evaluations: 944544 < 10000000 = max_norm_eval.\n",
+      "switch length   : 95 < 100 = max_length.\n",
+      "  6.932779 seconds (43.89 M allocations: 3.317 GiB, 20.64% gc time)\n",
+      "ub = 1.4097512220583488\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=50.4e-5, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 13,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : 958702 < 10000000 = max_ρ_eval.\n",
+      "norm evaluations: 958702 < 10000000 = max_norm_eval.\n",
+      "switch length   : 95 < 100 = max_length.\n",
+      "  6.813786 seconds (44.55 M allocations: 3.368 GiB, 19.13% gc time)\n",
+      "ub = 1.4097502220583487\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=50.3e-5, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : 978438 < 10000000 = max_ρ_eval.\n",
+      "norm evaluations: 978438 < 10000000 = max_norm_eval.\n",
+      "switch length   : 95 < 100 = max_length.\n",
+      "  7.154747 seconds (45.47 M allocations: 3.438 GiB, 20.01% gc time)\n",
+      "ub = 1.4097492220583487\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=50.2e-5, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 15,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : 1011488 < 10000000 = max_ρ_eval.\n",
+      "norm evaluations: 1011488 < 10000000 = max_norm_eval.\n",
+      "switch length   : 95 < 100 = max_length.\n",
+      "  7.392645 seconds (47.00 M allocations: 3.556 GiB, 19.76% gc time)\n",
+      "ub = 1.4097472220583487\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=5e-4, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 16,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : 8929584 < 10000000 = max_ρ_eval.\n",
+      "norm evaluations: 8929584 < 10000000 = max_norm_eval.\n",
+      "switch length   : \u001b[31m\u001b[1m100 ≥ 100\u001b[22m\u001b[39m = max_length.\n",
+      " 72.191537 seconds (415.26 M allocations: 32.366 GiB, 25.06% gc time)\n",
+      "ub = 1.4097109895117423\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=4e-4, max_eval=10_000_000, max_length=100)\n",
+    "@show ub\n",
+    "show_smp(smp)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ρ evaluations   : \u001b[31m\u001b[1m10670356 ≥ 10000000\u001b[22m\u001b[39m = max_ρ_eval.\n",
+      "norm evaluations: \u001b[31m\u001b[1m10670356 ≥ 10000000\u001b[22m\u001b[39m = max_norm_eval.\n",
+      "switch length   : 69 < 1000 = max_length.\n",
+      "111.142191 seconds (497.84 M allocations: 37.358 GiB, 35.30% gc time)\n",
+      "ub = 1.4099648749947737\n",
+      "   SMP: 001001010010010100101\n",
+      "Length: 21\n",
+      "Growth: 1.4092472220583487\n"
+     ]
+    }
+   ],
+   "source": [
+    "@time smp, ub = gripenberg(s∞, δ=5e-5, max_eval=10_000_000, max_length=1000)\n",
     "@show ub\n",
     "show_smp(smp)"
    ]

diff --git a/examples/LPJ17.ipynb b/examples/LPJ17.ipynb
@@ -2802,7 +2802,7 @@
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.1.0"
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,

diff --git a/examples/LPJ17e43.ipynb b/examples/LPJ17e43.ipynb
@@ -330,7 +330,7 @@
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.1.0"
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,