update plotly plot

topology-gg · Feb 16, 2023 · 82760d4 · 82760d4
1 parent 5e3dba1
commit 82760d4
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 23 deletions.
diff --git a/projectile_path/.gitignore b/projectile_path/.gitignore
@@ -135,3 +135,10 @@ _not_gh_contracts
 # Added by cargo
 
 /target
+
+
+# Added by cargo
+#
+# already existing elements were commented out
+
+#/target
diff --git a/projectile_path/Cargo.lock b/projectile_path/Cargo.lock
diff --git a/projectile_path/Cargo.toml b/projectile_path/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "projectile-path"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/projectile_path/src/main.rs b/projectile_path/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/projectile_path/tests/prototype_projectile_plot_rust.ipynb b/projectile_path/tests/prototype_projectile_plot_rust.ipynb
@@ -10,7 +10,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 6,
    "id": "e760fbb0",
    "metadata": {},
    "outputs": [],
@@ -40,7 +40,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 7,
    "id": "30d127c8",
    "metadata": {},
    "outputs": [],
@@ -89,7 +89,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 8,
    "id": "1da6fbb0",
    "metadata": {},
    "outputs": [],
@@ -171,7 +171,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 9,
    "id": "3c230674",
    "metadata": {},
    "outputs": [],
@@ -248,7 +248,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 10,
    "id": "656a02c6",
    "metadata": {
     "scrolled": true
@@ -260,10 +260,10 @@
      "text": [
       "theta_0 = 1.8325957148333336\n",
       "v_0x = -25.882306286627742\n",
-      "v_0y = 96.59247497235584\n",
       "t_max = 23.969806345067223\n",
       "x_s = [0.0, -32.65230891864121, -65.30461783728242, -97.95692675592362, -130.60923567456484, -163.26154459320605, -195.91385351184724, -228.56616243048848, -261.2184713491297, -293.87078026777084, -326.5230891864121, -359.1753981050533, -391.8277070236945, -424.4800159423357, -457.13232486097695, -489.78463377961816, -522.4369426982594, -555.0892516169006, -587.7415605355417, -620.393869454183]\n",
-      "y_s = [0.0, 114.05942534793961, 212.52160460458768, 295.38653776994425, 362.6542248440092, 414.32466582678273, 450.39786071826467, 470.873809518455, 475.7525122273538, 465.0339688449611, 438.71817937127696, 396.8051438063011, 339.2948621500341, 266.187334402475, 177.48256056362447, 73.18054063348268, -46.718725387950826, -182.2152375006758, -333.3089957046923, -500.00000000000045]\n"
+      "y_s = [0.0, 114.05942534793961, 212.52160460458768, 295.38653776994425, 362.6542248440092, 414.32466582678273, 450.39786071826467, 470.873809518455, 475.7525122273538, 465.0339688449611, 438.71817937127696, 396.8051438063011, 339.2948621500341, 266.187334402475, 177.48256056362447, 73.18054063348268, -46.718725387950826, -182.2152375006758, -333.3089957046923, -500.00000000000045]\n",
+      "v_0y = 96.59247497235584\n"
      ]
     }
    ],
@@ -339,7 +339,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 11,
    "id": "deb3690f",
    "metadata": {},
    "outputs": [],
@@ -351,7 +351,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 12,
    "id": "ab3f029b",
    "metadata": {},
    "outputs": [
@@ -706,7 +706,7 @@
        "</div>"
       ]
      },
-     "execution_count": 8,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -747,14 +747,12 @@
    "metadata": {},
    "source": [
     "## Plot with Plotly \n",
-    "- but Markers error, so cannot get points w/o lines;\n",
-    "    - see https://github.com/igiagkiozis/plotly/issues/137)\n",
-    "- also much slower than Plotters"
+    "- slower than Plotters}"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 13,
    "id": "7a405bcb",
    "metadata": {},
    "outputs": [],
@@ -765,7 +763,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 14,
    "id": "adad9ebe",
    "metadata": {},
    "outputs": [],
@@ -777,15 +775,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 15,
    "id": "8f278682",
    "metadata": {},
    "outputs": [],
    "source": [
     "use ndarray::Array;\n",
     "use plotly::common::{Mode, Title};\n",
     "use plotly::layout::{Axis, GridXSide, Layout, LayoutGrid};\n",
-    "use plotly::{Plot, Scatter};\n",
+    "use plotly::{Plot, Scatter, Trace};\n",
     "use rand_distr::{num_traits::Float, Distribution};\n",
     "\n",
     "// use plotly::{\n",
@@ -802,23 +800,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 16,
    "id": "afc6e693",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/html": [
        "<div>\n",
-       "    <div id=\"rEr7Aaiep7Xcrd4fs3c3\" class=\"plotly-graph-div\" style=\"height:100%; width:100%;\"></div>\n",
+       "    <div id=\"HKZTcIdHp6O7aP8Wwb3A\" class=\"plotly-graph-div\" style=\"height:100%; width:100%;\"></div>\n",
        "    <script type=\"text/javascript\">\n",
        "        require(['https://cdn.plot.ly/plotly-2.12.1.min.js'], function(Plotly) {\n",
        "            Plotly.newPlot(\n",
-       "                \"rEr7Aaiep7Xcrd4fs3c3\",\n",
+       "                \"HKZTcIdHp6O7aP8Wwb3A\",\n",
        "                {\n",
        "  \"data\": [\n",
        "    {\n",
        "      \"type\": \"scatter\",\n",
+       "      \"mode\": \"markers\",\n",
        "      \"x\": [\n",
        "        0.0,\n",
        "        -32.65230891864121,\n",
@@ -892,7 +891,7 @@
        "  \"config\": {}\n",
        "}\n",
        "            ).then(function() {\n",
-       "                var gd = document.getElementById('rEr7Aaiep7Xcrd4fs3c3');\n",
+       "                var gd = document.getElementById('HKZTcIdHp6O7aP8Wwb3A');\n",
        "                var x = new MutationObserver(function (mutations, observer) { {\n",
        "                        var display = window.getComputedStyle(gd).display;\n",
        "                        if (!display || display === 'none') { {\n",
@@ -918,7 +917,7 @@
        "</div>"
       ]
      },
-     "execution_count": 12,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -928,7 +927,7 @@
     "let x_s_vec: Vec<f64> = x_s.to_vec();\n",
     "let y_s_vec: Vec<f64> = y_s.to_vec();\n",
     "\n",
-    "let trace = Scatter::new(x_s_vec, y_s_vec);\n",
+    "let trace = Scatter::new(x_s_vec, y_s_vec).mode(Mode::Markers);\n",
     "let mut plot = Plot::new();\n",
     "plot.add_trace(trace);\n",
     "\n",