Mercurial > repos > non-riemannian-opt / changeset

--- a/src/main.rs	Fri Dec 06 13:27:48 2024 -0500
+++ b/src/main.rs	Fri Dec 06 13:44:34 2024 -0500
@@ -195,9 +195,9 @@
          }
     };
 
-    run_and_save(dir, "x1", &f, &g, cyl.on_top(0.0, 0.0), τ, logmap)?;
-    run_and_save(dir, "x2", &f, &g, cyl.on_side(-π*2.0/5.0, 0.0), τ, logmap)?;
-    run_and_save(dir, "x3", &f, &g,  cyl.on_bottom(-π*0.5, 0.8), τ, logmap)
+    run_and_save(dir, "x1", &f, &g, cyl.on_top(π*0.7, 0.8), τ, logmap)?;
+    run_and_save(dir, "x2", &f, &g, cyl.on_side(-π*0.42, -0.38), τ, logmap)?;
+    run_and_save(dir, "x3", &f, &g,  cyl.on_bottom(-π*0.3, 0.9), τ, logmap)
 
 }
 

--- a/visualisation/cube.tex	Fri Dec 06 13:27:48 2024 -0500
+++ b/visualisation/cube.tex	Fri Dec 06 13:44:34 2024 -0500
@@ -73,9 +73,6 @@
         \addplot3[data,onlyfront] table[x=x,y=y,z=z] {\datapath/data.csv};
         \addlegendentry{Data}
 
-        \addplot3[origin,onlyfront] table[x=x,y=y,z=z] {\datapath/origin.csv};
-        \addlegendentry{Origin}
-
         % Iterates
         \addplot3[iter1,onlyfront] table[x=x,y=y,z=z] {\datapath/x1_log.csv};
         \addlegendentry{Iterates 1}
@@ -83,6 +80,10 @@
         \addlegendentry{Iterates 2}
         \addplot3[iter3,onlyfront] table[x=x,y=y,z=z] {\datapath/x3_log.csv};
         \addlegendentry{Iterates 3}
+
+        % Origin
+        \addplot3[origin,onlyfront] table[x=x,y=y,z=z] {\datapath/origin.csv};
+        \addlegendentry{Origin}
     \end{axis}
 \end{tikzpicture}
 

--- a/visualisation/cylinder.tex	Fri Dec 06 13:27:48 2024 -0500
+++ b/visualisation/cylinder.tex	Fri Dec 06 13:44:34 2024 -0500
@@ -90,13 +90,6 @@
         ] {\datapath/data.csv};
         \addlegendentry{Data}
 
-        \addplot3[origin, onlyfront] table[
-            x expr = \thisrow{r} * cos(deg(\thisrow{angle})),
-            y expr = \thisrow{r} * sin(deg(\thisrow{angle})),
-            z = z,
-        ] {\datapath/origin.csv};
-        \addlegendentry{Origin}
-
         % Iterates
         \addplot3[iter1,onlyfront] table[
             x expr = \thisrow{r} * cos(deg(\thisrow{angle})),
@@ -116,6 +109,14 @@
             z = z,
         ] {\datapath/x3_log.csv};
         \addlegendentry{Iterates 3}
+
+        % Origin
+        \addplot3[origin, onlyfront] table[
+            x expr = \thisrow{r} * cos(deg(\thisrow{angle})),
+            y expr = \thisrow{r} * sin(deg(\thisrow{angle})),
+            z = z,
+        ] {\datapath/origin.csv};
+        \addlegendentry{Origin}
     \end{axis}
 \end{tikzpicture}
 

--- a/visualisation/plotsetup.tex	Fri Dec 06 13:27:48 2024 -0500
+++ b/visualisation/plotsetup.tex	Fri Dec 06 13:44:34 2024 -0500
@@ -10,10 +10,10 @@
     backdata/.style = {mark=*, blue!30!white, only marks, onlyback, forget plot},
     iter1/.style = {mark=x, red},
     iter2/.style = {mark=star, BlueViolet},
-    iter3/.style = {mark=asterisk, purple},
+    iter3/.style = {mark=asterisk, DarkOliveGreen},
     backiter1/.style = {mark=x, red!30!white, onlyback, forget plot},
     backiter2/.style = {mark=star, BlueViolet!30!white, onlyback, forget plot},
-    backiter3/.style = {mark=asterisk, purple!30!white, onlyback, forget plot},
+    backiter3/.style = {mark=asterisk, DarkOliveGreen!30!white, onlyback, forget plot},
     origin/.style = {mark=o, green, only marks, thick},
     surfstyle/.style = {very nearly opaque, forget plot},
     legend style = {