Move new test to avoid merge conflict

Confirm that frozen entries are frozen exactly
Name constraint Lorentz product more descriptively
2024-11-11 15:41:42 -08:00 · 2024-11-11 15:34:51 -08:00 · 2024-11-11 00:27:28 -08:00 · 2024-11-11 00:04:48 -08:00 · 2024-11-11 07:56:27 +00:00 · 2024-11-10 23:47:34 -08:00
15 changed files with 507 additions and 774 deletions
--- a/README.md
+++ b/README.md
@ -17,51 +17,3 @@ Note that currently this is just the barest beginnings of the project, more of a
 * Able to run in browser (so implemented in WASM-compatible language)

 * Produce scalable graphics of 3D diagrams, and maybe STL files (or other fabricatable file format) as well.
-
-## Prototype
-
-The latest prototype is in the folder `app-proto`. It includes both a user interface and a numerical constraint-solving engine.
-
-### Install the prerequisites
-
-1. Install [`rustup`](https://rust-lang.github.io/rustup/): the officially recommended Rust toolchain manager
-   * It's available on Ubuntu as a [Snap](https://snapcraft.io/rustup)
-2. Call `rustup default stable` to "download the latest stable release of Rust and set it as your default toolchain"
-   * If you forget, the `rustup` [help system](https://github.com/rust-lang/rustup/blob/d9b3601c3feb2e88cf3f8ca4f7ab4fdad71441fd/src/errors.rs#L109-L112) will remind you
-3. Call `rustup target add wasm32-unknown-unknown` to add the [most generic 32-bit WebAssembly target](https://doc.rust-lang.org/nightly/rustc/platform-support/wasm32-unknown-unknown.html)
-4. Call `cargo install wasm-pack` to install the [WebAssembly toolchain](https://rustwasm.github.io/docs/wasm-pack/)
-5. Call `cargo install trunk` to install the [Trunk](https://trunkrs.dev/) web-build tool
-6. Add the `.cargo/bin` folder in your home directory to your executable search path
-   * This lets you call Trunk, and other tools installed by Cargo, without specifying their paths
-   * On POSIX systems, the search path is stored in the `PATH` environment variable
-
-### Play with the prototype
-
-1. Go into the `app-proto` folder
-2. Call `trunk serve --release` to build and serve the prototype
-   * *The crates the prototype depends on will be downloaded and served automatically*
-   * *For a faster build, at the expense of a much slower prototype, you can call `trunk serve` without the `--release` flag*
-3. In a web browser, visit one of the URLs listed under the message `INFO 📡 server listening at:`
-   * *Touching any file in the `app-proto` folder will make Trunk rebuild and live-reload the prototype*
-4. Press *ctrl+C* in the shell where Trunk is running to stop serving the prototype
-
-### Run the engine on some example problems
-
-1. Go into the `app-proto` folder
-2. Call `./run-examples`
-   * *For each example problem, the engine will print the value of the loss function at each optimization step*
-   * *The first example that prints is the same as the Irisawa hexlet example from the Julia version of the engine prototype. If you go into `engine-proto/gram-test`, launch Julia, and then*
-     
-     ```julia
-     include("irisawa-hexlet.jl")
-     for (step, scaled_loss) in enumerate(history_alt.scaled_loss)
-       println(rpad(step-1, 4), " | ", scaled_loss)
-     end
-     ```
-     
-     *you should see that it prints basically the same loss history until the last few steps, when the lower default precision of the Rust engine really starts to show*
-
-### Run the automated tests
-
-1. Go into the `app-proto` folder
-2. Call `cargo test`
--- a/app-proto/Cargo.toml
+++ b/app-proto/Cargo.toml
@ -1,12 +1,11 @@
 [package]
-name = "dyna3"
+name = "sketch-outline"
 version = "0.1.0"
-authors = ["Aaron Fenyes", "Glen Whitney"]
+authors = ["Aaron"]
 edition = "2021"

 [features]
 default = ["console_error_panic_hook"]
-dev = []

 [dependencies]
 itertools = "0.13.0"
@ -26,7 +25,6 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 [dependencies.web-sys]
 version = "0.3.69"
 features = [
-  'DomRect',
  'HtmlCanvasElement',
  'HtmlInputElement',
  'Performance',
@ -38,12 +36,7 @@ features = [
  'WebGlVertexArrayObject'
 ]

-# the self-dependency specifies features to use for tests and examples
-#
-#   https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987
-#
 [dev-dependencies]
-dyna3 = { path = ".", default-features = false, features = ["dev"] }
 wasm-bindgen-test = "0.3.34"

 [profile.release]
--- a/app-proto/examples/irisawa-hexlet.rs
+++ b/app-proto/examples/irisawa-hexlet.rs
@ -1,25 +0,0 @@
-use dyna3::engine::{Q, irisawa::realize_irisawa_hexlet};
-
-fn main() {
-    const SCALED_TOL: f64 = 1.0e-12;
-    let (config, success, history) = realize_irisawa_hexlet(SCALED_TOL);
-    print!("\nCompleted Gram matrix:{}", config.tr_mul(&*Q) * &config);
-    if success {
-        println!("Target accuracy achieved!");
-    } else {
-        println!("Failed to reach target accuracy");
-    }
-    println!("Steps: {}", history.scaled_loss.len() - 1);
-    println!("Loss: {}", history.scaled_loss.last().unwrap());
-    if success {
-        println!("\nChain diameters:");
-        println!("  {} sun (given)", 1.0 / config[(3, 3)]);
-        for k in 4..9 {
-            println!("  {} sun", 1.0 / config[(3, k)]);
-        }
-    }
-    println!("\nStep │ Loss\n─────┼────────────────────────────────");
-    for (step, scaled_loss) in history.scaled_loss.into_iter().enumerate() {
-        println!("{:<4} │ {}", step, scaled_loss);
-    }
-}
--- a/app-proto/examples/point-on-sphere.rs
+++ b/app-proto/examples/point-on-sphere.rs
@ -1,38 +0,0 @@
-use nalgebra::DMatrix;
-
-use dyna3::engine::{Q, point, realize_gram, sphere, PartialMatrix};
-
-fn main() {
-    let gram = {
-        let mut gram_to_be = PartialMatrix::new();
-        for j in 0..2 {
-            for k in j..2 {
-                gram_to_be.push_sym(j, k, if (j, k) == (1, 1) { 1.0 } else { 0.0 });
-            }
-        }
-        gram_to_be
-    };
-    let guess = DMatrix::from_columns(&[
-        point(0.0, 0.0, 2.0),
-        sphere(0.0, 0.0, 0.0, 1.0)
-    ]);
-    let frozen = [(3, 0)];
-    println!();
-    let (config, success, history) = realize_gram(
-        &gram, guess, &frozen,
-        1.0e-12, 0.5, 0.9, 1.1, 200, 110
-    );
-    print!("\nCompleted Gram matrix:{}", config.tr_mul(&*Q) * &config);
-    print!("Configuration:{}", config);
-    if success {
-        println!("Target accuracy achieved!");
-    } else {
-        println!("Failed to reach target accuracy");
-    }
-    println!("Steps: {}", history.scaled_loss.len() - 1);
-    println!("Loss: {}", history.scaled_loss.last().unwrap());
-    println!("\nStep │ Loss\n─────┼────────────────────────────────");
-    for (step, scaled_loss) in history.scaled_loss.into_iter().enumerate() {
-        println!("{:<4} │ {}", step, scaled_loss);
-    }
-}
--- a/app-proto/examples/three-spheres.rs
+++ b/app-proto/examples/three-spheres.rs
@ -1,40 +0,0 @@
-use nalgebra::DMatrix;
-
-use dyna3::engine::{Q, realize_gram, sphere, PartialMatrix};
-
-fn main() {
-    let gram = {
-        let mut gram_to_be = PartialMatrix::new();
-        for j in 0..3 {
-            for k in j..3 {
-                gram_to_be.push_sym(j, k, if j == k { 1.0 } else { -1.0 });
-            }
-        }
-        gram_to_be
-    };
-    let guess = {
-        let a: f64 = 0.75_f64.sqrt();
-        DMatrix::from_columns(&[
-            sphere(1.0, 0.0, 0.0, 1.0),
-            sphere(-0.5, a, 0.0, 1.0),
-            sphere(-0.5, -a, 0.0, 1.0)
-        ])
-    };
-    println!();
-    let (config, success, history) = realize_gram(
-        &gram, guess, &[],
-        1.0e-12, 0.5, 0.9, 1.1, 200, 110
-    );
-    print!("\nCompleted Gram matrix:{}", config.tr_mul(&*Q) * &config);
-    if success {
-        println!("Target accuracy achieved!");
-    } else {
-        println!("Failed to reach target accuracy");
-    }
-    println!("Steps: {}", history.scaled_loss.len() - 1);
-    println!("Loss: {}", history.scaled_loss.last().unwrap());
-    println!("\nStep │ Loss\n─────┼────────────────────────────────");
-    for (step, scaled_loss) in history.scaled_loss.into_iter().enumerate() {
-        println!("{:<4} │ {}", step, scaled_loss);
-    }
-}
--- a/app-proto/index.html
+++ b/app-proto/index.html
@ -2,10 +2,8 @@
 <html>
  <head>
    <meta charset="utf-8"/>
-    <title>dyna3</title>
+    <title>Sketch outline</title>
    <link data-trunk rel="css" href="main.css"/>
-    <link href="https://fonts.bunny.net/css?family=fira-sans:ital,wght@0,400;1,400&display=swap" rel="stylesheet">
-    <link href="https://fonts.bunny.net/css?family=noto-emoji:wght@400&text=%f0%9f%94%97%e2%9a%a0&display=swap" rel="stylesheet">
  </head>
  <body></body>
 </html>
--- a/app-proto/main.css
+++ b/app-proto/main.css
@ -1,20 +1,7 @@
-:root {
-  --text: #fcfcfc; /* almost white */
-  --text-bright: white;
-  --text-invalid: #f58fc2; /* bright pink */
-  --border: #555; /* light gray */
-  --border-focus: #aaa; /* bright gray */
-  --border-invalid: #70495c; /* dusky pink */
-  --selection-highlight: #444; /* medium gray */
-  --page-background: #222; /* dark gray */
-  --display-background: #020202; /* almost black */
-}
-
 body {
  margin: 0px;
-  color: var(--text);
-  background-color: var(--page-background);
-  font-family: 'Fira Sans', sans-serif;
+  color: #fcfcfc;
+  background-color: #222;
 }

 /* sidebar */
@ -29,7 +16,7 @@ body {
  padding: 0px;
  border-width: 0px 1px 0px 0px;
  border-style: solid;
-  border-color: var(--border);
+  border-color: #555;
 }

 /* add-remove */
@ -46,15 +33,6 @@ body {
  font-size: large;
 }

-/* KLUDGE */
-/*
-  for convenience, we're using emoji as temporary icons for some buttons. these
-  buttons need to be displayed in an emoji font
-*/
-#add-remove > button.emoji {
-  font-family: 'Noto Emoji', sans-serif;
-}
-
 /* outline */

 #outline {
@ -73,103 +51,81 @@ summary {
 }

 summary.selected {
-  color: var(--text-bright);
-  background-color: var(--selection-highlight);
+  color: #fff;
+  background-color: #444;
 }

-summary > div, .constraint {
+summary > div, .cst {
  padding-top: 4px;
  padding-bottom: 4px;
 }

-.element, .constraint {
+.elt, .cst {
  display: flex;
  flex-grow: 1;
  padding-left: 8px;
  padding-right: 8px;
 }

-.element-switch {
+.elt-switch {
  width: 18px;
  padding-left: 2px;
  text-align: center;
 }

-details:has(li) .element-switch::after {
+details:has(li) .elt-switch::after {
  content: '▸';
 }

-details[open]:has(li) .element-switch::after {
+details[open]:has(li) .elt-switch::after {
  content: '▾';
 }

-.element-label {
+.elt-label {
  flex-grow: 1;
 }

-.constraint-label {
+.cst-label {
  flex-grow: 1;
 }

-.element-representation {
+.elt-rep {
  display: flex;
 }

-.element-representation > div {
+.elt-rep > div {
  padding: 2px 0px 0px 0px;
  font-size: 10pt;
-  font-variant-numeric: tabular-nums;
-  text-align: right;
+  text-align: center;
  width: 56px;
 }

-.constraint {
+.cst {
  font-style: italic;
 }

-.constraint.invalid {
-  color: var(--text-invalid);
-}
-
-.constraint > input[type=checkbox] {
+.cst > input[type=checkbox] {
  margin: 0px 8px 0px 0px;
 }

-.constraint > input[type=text] {
-  color: inherit;
+.cst > input[type=text] {
+  color: #fcfcfc;
  background-color: inherit;
-  border: 1px solid var(--border);
+  border: 1px solid #555;
  border-radius: 2px;
 }

-.constraint.invalid > input[type=text] {
-  border-color: var(--border-invalid);
-}
-
-.status {
-  width: 20px;
-  padding-left: 4px;
-  text-align: center;
-  font-family: 'Noto Emoji';
-  font-style: normal;
-}
-
-.invalid > .status::after, details:has(.invalid):not([open]) .status::after {
-  content: '⚠';
-  color: var(--text-invalid);
-}
-
 /* display */

 canvas {
  float: left;
  margin-left: 20px;
  margin-top: 20px;
-  background-color: var(--display-background);
-  border: 1px solid var(--border);
+  background-color: #020202;
+  border: 1px solid #555;
  border-radius: 16px;
 }

 canvas:focus {
-  border-color: var(--border-focus);
+  border-color: #aaa;
 }
--- a/app-proto/run-examples
+++ b/app-proto/run-examples
@ -1,11 +1,8 @@
-#!/bin/sh
-
-# run all Cargo examples, as described here:
+# based on "Enabling print statements in Cargo tests", by Jon Almeida
 #
-#   Karol Kuczmarski. "Add examples to your Rust libraries"
-#   http://xion.io/post/code/rust-examples.html
+#   https://jonalmeida.com/posts/2015/01/23/print-cargo/
 #

-cargo run --example irisawa-hexlet
-cargo run --example three-spheres
-cargo run --example point-on-sphere
+cargo test -- --nocapture engine::tests::irisawa_hexlet_test
+cargo test -- --nocapture engine::tests::three_spheres_example
+cargo test -- --nocapture engine::tests::point_on_sphere_example
--- a/app-proto/src/add_remove.rs
+++ b/app-proto/src/add_remove.rs
@ -1,130 +1,155 @@
+use std::collections::BTreeSet; /* DEBUG */
 use sycamore::prelude::*;
 use web_sys::{console, wasm_bindgen::JsValue};

 use crate::{engine, AppState, assembly::{Assembly, Constraint, Element}};

 /* DEBUG */
-// load an example assembly for testing. this code will be removed once we've
-// built a more formal test assembly system
 fn load_gen_assemb(assembly: &Assembly) {
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("gemini_a"),
-            String::from("Castor"),
-            [1.00_f32, 0.25_f32, 0.00_f32],
-            engine::sphere(0.5, 0.5, 0.0, 1.0)
-        )
+        Element {
+            id: String::from("gemini_a"),
+            label: String::from("Castor"),
+            color: [1.00_f32, 0.25_f32, 0.00_f32],
+            representation: engine::sphere(0.5, 0.5, 0.0, 1.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("gemini_b"),
-            String::from("Pollux"),
-            [0.00_f32, 0.25_f32, 1.00_f32],
-            engine::sphere(-0.5, -0.5, 0.0, 1.0)
-        )
+        Element {
+            id: String::from("gemini_b"),
+            label: String::from("Pollux"),
+            color: [0.00_f32, 0.25_f32, 1.00_f32],
+            representation: engine::sphere(-0.5, -0.5, 0.0, 1.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("ursa_major"),
-            String::from("Ursa major"),
-            [0.25_f32, 0.00_f32, 1.00_f32],
-            engine::sphere(-0.5, 0.5, 0.0, 0.75)
-        )
+        Element {
+            id: String::from("ursa_major"),
+            label: String::from("Ursa major"),
+            color: [0.25_f32, 0.00_f32, 1.00_f32],
+            representation: engine::sphere(-0.5, 0.5, 0.0, 0.75),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("ursa_minor"),
-            String::from("Ursa minor"),
-            [0.25_f32, 1.00_f32, 0.00_f32],
-            engine::sphere(0.5, -0.5, 0.0, 0.5)
-        )
+        Element {
+            id: String::from("ursa_minor"),
+            label: String::from("Ursa minor"),
+            color: [0.25_f32, 1.00_f32, 0.00_f32],
+            representation: engine::sphere(0.5, -0.5, 0.0, 0.5),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("moon_deimos"),
-            String::from("Deimos"),
-            [0.75_f32, 0.75_f32, 0.00_f32],
-            engine::sphere(0.0, 0.15, 1.0, 0.25)
-        )
+        Element {
+            id: String::from("moon_deimos"),
+            label: String::from("Deimos"),
+            color: [0.75_f32, 0.75_f32, 0.00_f32],
+            representation: engine::sphere(0.0, 0.15, 1.0, 0.25),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("moon_phobos"),
-            String::from("Phobos"),
-            [0.00_f32, 0.75_f32, 0.50_f32],
-            engine::sphere(0.0, -0.15, -1.0, 0.25)
-        )
+        Element {
+            id: String::from("moon_phobos"),
+            label: String::from("Phobos"),
+            color: [0.00_f32, 0.75_f32, 0.50_f32],
+            representation: engine::sphere(0.0, -0.15, -1.0, 0.25),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
 }

 /* DEBUG */
-// load an example assembly for testing. this code will be removed once we've
-// built a more formal test assembly system
 fn load_low_curv_assemb(assembly: &Assembly) {
    let a = 0.75_f64.sqrt();
    let _ = assembly.try_insert_element(
-        Element::new(
-            "central".to_string(),
-            "Central".to_string(),
-            [0.75_f32, 0.75_f32, 0.75_f32],
-            engine::sphere(0.0, 0.0, 0.0, 1.0)
-        )
+        Element {
+            id: "central".to_string(),
+            label: "Central".to_string(),
+            color: [0.75_f32, 0.75_f32, 0.75_f32],
+            representation: engine::sphere(0.0, 0.0, 0.0, 1.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            "assemb_plane".to_string(),
-            "Assembly plane".to_string(),
-            [0.75_f32, 0.75_f32, 0.75_f32],
-            engine::sphere_with_offset(0.0, 0.0, 1.0, 0.0, 0.0)
-        )
+        Element {
+            id: "assemb_plane".to_string(),
+            label: "Assembly plane".to_string(),
+            color: [0.75_f32, 0.75_f32, 0.75_f32],
+            representation: engine::sphere_with_offset(0.0, 0.0, 1.0, 0.0, 0.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            "side1".to_string(),
-            "Side 1".to_string(),
-            [1.00_f32, 0.00_f32, 0.25_f32],
-            engine::sphere_with_offset(1.0, 0.0, 0.0, 1.0, 0.0)
-        )
+        Element {
+            id: "side1".to_string(),
+            label: "Side 1".to_string(),
+            color: [1.00_f32, 0.00_f32, 0.25_f32],
+            representation: engine::sphere_with_offset(1.0, 0.0, 0.0, 1.0, 0.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            "side2".to_string(),
-            "Side 2".to_string(),
-            [0.25_f32, 1.00_f32, 0.00_f32],
-            engine::sphere_with_offset(-0.5, a, 0.0, 1.0, 0.0)
-        )
+        Element {
+            id: "side2".to_string(),
+            label: "Side 2".to_string(),
+            color: [0.25_f32, 1.00_f32, 0.00_f32],
+            representation: engine::sphere_with_offset(-0.5, a, 0.0, 1.0, 0.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            "side3".to_string(),
-            "Side 3".to_string(),
-            [0.00_f32, 0.25_f32, 1.00_f32],
-            engine::sphere_with_offset(-0.5, -a, 0.0, 1.0, 0.0)
-        )
+        Element {
+            id: "side3".to_string(),
+            label: "Side 3".to_string(),
+            color: [0.00_f32, 0.25_f32, 1.00_f32],
+            representation: engine::sphere_with_offset(-0.5, -a, 0.0, 1.0, 0.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            "corner1".to_string(),
-            "Corner 1".to_string(),
-            [0.75_f32, 0.75_f32, 0.75_f32],
-            engine::sphere(-4.0/3.0, 0.0, 0.0, 1.0/3.0)
-        )
+        Element {
+            id: "corner1".to_string(),
+            label: "Corner 1".to_string(),
+            color: [0.75_f32, 0.75_f32, 0.75_f32],
+            representation: engine::sphere(-4.0/3.0, 0.0, 0.0, 1.0/3.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            "corner2".to_string(),
-            "Corner 2".to_string(),
-            [0.75_f32, 0.75_f32, 0.75_f32],
-            engine::sphere(2.0/3.0, -4.0/3.0 * a, 0.0, 1.0/3.0)
-        )
+        Element {
+            id: "corner2".to_string(),
+            label: "Corner 2".to_string(),
+            color: [0.75_f32, 0.75_f32, 0.75_f32],
+            representation: engine::sphere(2.0/3.0, -4.0/3.0 * a, 0.0, 1.0/3.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
    let _ = assembly.try_insert_element(
-        Element::new(
-            String::from("corner3"),
-            String::from("Corner 3"),
-            [0.75_f32, 0.75_f32, 0.75_f32],
-            engine::sphere(2.0/3.0, 4.0/3.0 * a, 0.0, 1.0/3.0)
-        )
+        Element {
+            id: String::from("corner3"),
+            label: String::from("Corner 3"),
+            color: [0.75_f32, 0.75_f32, 0.75_f32],
+            representation: engine::sphere(2.0/3.0, 4.0/3.0 * a, 0.0, 1.0/3.0),
+            constraints: BTreeSet::default(),
+            index: 0
+        }
    );
 }

@ -177,7 +202,6 @@ pub fn AddRemove() -> View {
                }
            ) { "+" }
            button(
-                class="emoji", /* KLUDGE */ // for convenience, we're using an emoji as a temporary icon for this button
                disabled={
                    let state = use_context::<AppState>();
                    state.selection.with(|sel| sel.len() != 2)
@ -191,15 +215,15 @@ pub fn AddRemove() -> View {
                        }
                    );
                    let lorentz_prod = create_signal(0.0);
-                    let lorentz_prod_valid = create_signal(false);
                    let active = create_signal(true);
                    state.assembly.insert_constraint(Constraint {
                        subjects: subjects,
                        lorentz_prod: lorentz_prod,
                        lorentz_prod_text: create_signal(String::new()),
-                        lorentz_prod_valid: lorentz_prod_valid,
+                        lorentz_prod_valid: create_signal(false),
                        active: active,
                    });
+                    state.assembly.realize();
                    state.selection.update(|sel| sel.clear());
                    
                    /* DEBUG */
@ -217,23 +241,23 @@ pub fn AddRemove() -> View {
                        }
                    });
                    
-                    // update the realization when the constraint becomes active
-                    // and valid, or is edited while active and valid
+                    // update the realization when the constraint activated, or
+                    // edited while active
                    create_effect(move || {
-                        console::log_1(&JsValue::from(
-                            format!("Constraint ({}, {}) updated", subjects.0, subjects.1)
-                        ));
                        lorentz_prod.track();
-                        if active.get() && lorentz_prod_valid.get() {
+                        console::log_2(
+                            &JsValue::from("Lorentz product updated to"),
+                            &JsValue::from(lorentz_prod.get_untracked())
+                        );
+                        if active.get() {
                            state.assembly.realize();
                        }
                    });
                }
            ) { "🔗" }
-            select(bind:value=assembly_name) { /* DEBUG */ // example assembly chooser
+            select(bind:value=assembly_name) { /* DEBUG */
                option(value="general") { "General" }
                option(value="low-curv") { "Low-curvature" }
-                option(value="empty") { "Empty" }
            }
        }
    }
--- a/app-proto/src/assembly.rs
+++ b/app-proto/src/assembly.rs
@ -1,7 +1,7 @@
-use nalgebra::{DMatrix, DVector, Vector3};
+use nalgebra::{DMatrix, DVector};
 use rustc_hash::FxHashMap;
 use slab::Slab;
-use std::{collections::BTreeSet, sync::atomic::{AtomicU64, Ordering}};
+use std::collections::BTreeSet;
 use sycamore::prelude::*;
 use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */

@ -13,104 +13,22 @@ pub type ConstraintKey = usize;

 pub type ElementColor = [f32; 3];

-/* KLUDGE */
-// we should reconsider this design when we build a system for switching between
-// assemblies. at that point, we might want to switch to hierarchical keys,
-// where each each element has a key that identifies it within its assembly and
-// each assembly has a key that identifies it within the sesssion
-static NEXT_ELEMENT_SERIAL: AtomicU64 = AtomicU64::new(0);
-
 #[derive(Clone, PartialEq)]
 pub struct Element {
    pub id: String,
    pub label: String,
    pub color: ElementColor,
-    pub representation: Signal<DVector<f64>>,
-    pub constraints: Signal<BTreeSet<ConstraintKey>>,
-
-    // a serial number, assigned by `Element::new`, that uniquely identifies
-    // each element
-    pub serial: u64,
+    pub representation: DVector<f64>,
+    pub constraints: BTreeSet<ConstraintKey>,
    
    // the configuration matrix column index that was assigned to this element
    // last time the assembly was realized
-    column_index: usize
+    /* TO DO */
+    // this is public, as a kludge, because `Element` doesn't have a constructor
+    // yet. it should be made private as soon as the constructor is written
+    pub index: usize
 }

-impl Element {
-    pub fn new(
-        id: String,
-        label: String,
-        color: ElementColor,
-        representation: DVector<f64>
-    ) -> Element {
-        // take the next serial number, panicking if that was the last number we
-        // had left. the technique we use to panic on overflow is taken from
-        // _Rust Atomics and Locks_, by Mara Bos
-        //
-        //   https://marabos.nl/atomics/atomics.html#example-handle-overflow
-        //
-        let serial = NEXT_ELEMENT_SERIAL.fetch_update(
-            Ordering::SeqCst, Ordering::SeqCst,
-            |serial| serial.checked_add(1)
-        ).expect("Out of serial numbers for elements");
-        
-        Element {
-            id: id,
-            label: label,
-            color: color,
-            representation: create_signal(representation),
-            constraints: create_signal(BTreeSet::default()),
-            serial: serial,
-            column_index: 0
-        }
-    }
-    
-    // the smallest positive depth, represented as a multiple of `dir`, where
-    // the line generated by `dir` hits the element (which is assumed to be a
-    // sphere). returns `None` if the line misses the sphere. this function
-    // should be kept synchronized with `sphere_cast` in `inversive.frag`, which
-    // does essentially the same thing on the GPU side
-    pub fn cast(&self, dir: Vector3<f64>, assembly_to_world: &DMatrix<f64>) -> Option<f64> {
-        // if `a/b` is less than this threshold, we approximate
-        // `a*u^2 + b*u + c` by the linear function `b*u + c`
-        const DEG_THRESHOLD: f64 = 1e-9;
-        
-        let rep = self.representation.with_untracked(|rep| assembly_to_world * rep);
-        let a = -rep[3] * dir.norm_squared();
-        let b = rep.rows_range(..3).dot(&dir);
-        let c = -rep[4];
-        
-        let adjust = 4.0*a*c/(b*b);
-        if adjust < 1.0 {
-            // as long as `b` is non-zero, the linear approximation of
-            //
-            //   a*u^2 + b*u + c
-            //
-            // at `u = 0` will reach zero at a finite depth `u_lin`. the root of
-            // the quadratic adjacent to `u_lin` is stored in `lin_root`. if
-            // both roots have the same sign, `lin_root` will be the one closer
-            // to `u = 0`
-            let square_rect_ratio = 1.0 + (1.0 - adjust).sqrt();
-            let lin_root = -(2.0*c)/b / square_rect_ratio;
-            if a.abs() > DEG_THRESHOLD * b.abs() {
-                if lin_root > 0.0 {
-                    Some(lin_root)
-                } else {
-                    let other_root = -b/(2.*a) * square_rect_ratio;
-                    (other_root > 0.0).then_some(other_root)
-                }
-            } else {
-                (lin_root > 0.0).then_some(lin_root)
-            }
-        } else {
-            // the line through `dir` misses the sphere completely
-            None
-        }
-    }
-}
-            
-
 #[derive(Clone)]
 pub struct Constraint {
    pub subjects: (ElementKey, ElementKey),
@ -174,23 +92,24 @@ impl Assembly {
        
        // create and insert a new element
        self.insert_element_unchecked(
-            Element::new(
-                id,
-                format!("Sphere {}", id_num),
-                [0.75_f32, 0.75_f32, 0.75_f32],
-                DVector::<f64>::from_column_slice(&[0.0, 0.0, 0.0, 0.5, -0.5])
-            )
+            Element {
+                id: id,
+                label: format!("Sphere {}", id_num),
+                color: [0.75_f32, 0.75_f32, 0.75_f32],
+                representation: DVector::<f64>::from_column_slice(&[0.0, 0.0, 0.0, 0.5, -0.5]),
+                constraints: BTreeSet::default(),
+                index: 0
+            }
        );
    }
    
    pub fn insert_constraint(&self, constraint: Constraint) {
        let subjects = constraint.subjects;
        let key = self.constraints.update(|csts| csts.insert(constraint));
-        let subject_constraints = self.elements.with(
-            |elts| (elts[subjects.0].constraints, elts[subjects.1].constraints)
-        );
-        subject_constraints.0.update(|csts| csts.insert(key));
-        subject_constraints.1.update(|csts| csts.insert(key));
+        self.elements.update(|elts| {
+            elts[subjects.0].constraints.insert(key);
+            elts[subjects.1].constraints.insert(key);
+        });
    }
    
    // --- realization ---
@ -199,7 +118,7 @@ impl Assembly {
        // index the elements
        self.elements.update_silent(|elts| {
            for (index, (_, elt)) in elts.into_iter().enumerate() {
-                elt.column_index = index;
+                elt.index = index;
            }
        });
        
@ -211,8 +130,8 @@ impl Assembly {
                for (_, cst) in csts {
                    if cst.active.get_untracked() && cst.lorentz_prod_valid.get_untracked() {
                        let subjects = cst.subjects;
-                        let row = elts[subjects.0].column_index;
-                        let col = elts[subjects.1].column_index;
+                        let row = elts[subjects.0].index;
+                        let col = elts[subjects.1].index;
                        gram_to_be.push_sym(row, col, cst.lorentz_prod.get_untracked());
                    }
                }
@ -222,9 +141,9 @@ impl Assembly {
            // Gram matrix
            let mut guess_to_be = DMatrix::<f64>::zeros(5, elts.len());
            for (_, elt) in elts {
-                let index = elt.column_index;
+                let index = elt.index;
                gram_to_be.push_sym(index, index, 1.0);
-                guess_to_be.set_column(index, &elt.representation.get_clone_untracked());
+                guess_to_be.set_column(index, &elt.representation);
            }
            
            (gram_to_be, guess_to_be)
@ -266,11 +185,11 @@ impl Assembly {
        
        if success {
            // read out the solution
-            for (_, elt) in self.elements.get_clone_untracked() {
-                elt.representation.update(
-                    |rep| rep.set_column(0, &config.column(elt.column_index))
-                );
-            }
+            self.elements.update(|elts| {
+                for (_, elt) in elts.iter_mut() {
+                    elt.representation.set_column(0, &config.column(elt.index));
+                }
+            });
        }
    }
 }
--- a/app-proto/src/display.rs
+++ b/app-proto/src/display.rs
@ -4,9 +4,7 @@ use sycamore::{prelude::*, motion::create_raf};
 use web_sys::{
    console,
    window,
-    Element,
    KeyboardEvent,
-    MouseEvent,
    WebGl2RenderingContext,
    WebGlProgram,
    WebGlShader,
@ -14,7 +12,7 @@ use web_sys::{
    wasm_bindgen::{JsCast, JsValue}
 };

-use crate::{AppState, assembly::ElementKey};
+use crate::AppState;

 fn compile_shader(
    context: &WebGl2RenderingContext,
@ -84,24 +82,6 @@ fn bind_vertex_attrib(
    );
 }

-// the direction in camera space that a mouse event is pointing along
-fn event_dir(event: &MouseEvent) -> Vector3<f64> {
-    let target: Element = event.target().unwrap().unchecked_into();
-    let rect = target.get_bounding_client_rect();
-    let width = rect.width();
-    let height = rect.height();
-    let shortdim = width.min(height);
-    
-    // this constant should be kept synchronized with `inversive.frag`
-    const FOCAL_SLOPE: f64 = 0.3;
-    
-    Vector3::new(
-        FOCAL_SLOPE * (2.0*(f64::from(event.client_x()) - rect.left()) - width) / shortdim,
-        FOCAL_SLOPE * (2.0*(rect.bottom() - f64::from(event.client_y())) - height) / shortdim,
-        -1.0
-    )
-}
-
 #[component]
 pub fn Display() -> View {
    let state = use_context::<AppState>();
@ -109,9 +89,6 @@ pub fn Display() -> View {
    // canvas
    let display = create_node_ref();
    
-    // viewpoint
-    let assembly_to_world = create_signal(DMatrix::<f64>::identity(5, 5));
-    
    // navigation
    let pitch_up = create_signal(0.0);
    let pitch_down = create_signal(0.0);
@ -126,11 +103,7 @@ pub fn Display() -> View {
    // change listener
    let scene_changed = create_signal(true);
    create_effect(move || {
-        state.assembly.elements.with(|elts| {
-            for (_, elt) in elts {
-                elt.representation.track();
-            }
-        });
+        state.assembly.elements.track();
        state.selection.track();
        scene_changed.set(true);
    });
@ -319,43 +292,28 @@ pub fn Display() -> View {
                        0.0, 0.0,   0.0, 0.0, 1.0
                    ])
                };
-                let asm_to_world = &location * &orientation;
+                let assembly_to_world = &location * &orientation;
                
                // get the assembly
-                let (
-                    elt_cnt,
-                    reps_world,
-                    colors,
-                    highlights
-                ) = state.assembly.elements.with(|elts| {
-                    (
-                        // number of elements
-                        elts.len() as i32,
-                        
-                        // representation vectors in world coordinates
-                        elts.iter().map(
-                            |(_, elt)| elt.representation.with(|rep| &asm_to_world * rep)
-                        ).collect::<Vec<_>>(),
-                        
-                        // colors
-                        elts.iter().map(|(key, elt)| {
-                            if state.selection.with(|sel| sel.contains(&key)) {
-                                elt.color.map(|ch| 0.2 + 0.8*ch)
-                            } else {
-                                elt.color
-                            }
-                        }).collect::<Vec<_>>(),
-                        
-                        // highlight levels
-                        elts.iter().map(|(key, _)| {
-                            if state.selection.with(|sel| sel.contains(&key)) {
-                                1.0_f32
-                            } else {
-                                HIGHLIGHT
-                            }
-                        }).collect::<Vec<_>>()
-                    )
-                });
+                let elements = state.assembly.elements.get_clone();
+                let element_iter = (&elements).into_iter();
+                let reps_world: Vec<_> = element_iter.clone().map(
+                    |(_, elt)| &assembly_to_world * &elt.representation
+                ).collect();
+                let colors: Vec<_> = element_iter.clone().map(|(key, elt)|
+                    if state.selection.with(|sel| sel.contains(&key)) {
+                        elt.color.map(|ch| 0.2 + 0.8*ch)
+                    } else {
+                        elt.color
+                    }
+                ).collect();
+                let highlights: Vec<_> = element_iter.map(|(key, _)|
+                    if state.selection.with(|sel| sel.contains(&key)) {
+                        1.0_f32
+                    } else {
+                        HIGHLIGHT
+                    }
+                ).collect();
                
                // set the resolution
                let width = canvas.width() as f32;
@ -364,7 +322,7 @@ pub fn Display() -> View {
                ctx.uniform1f(shortdim_loc.as_ref(), width.min(height));
                
                // pass the assembly
-                ctx.uniform1i(sphere_cnt_loc.as_ref(), elt_cnt);
+                ctx.uniform1i(sphere_cnt_loc.as_ref(), elements.len() as i32);
                for n in 0..reps_world.len() {
                    let v = &reps_world[n];
                    ctx.uniform3f(
@ -393,9 +351,6 @@ pub fn Display() -> View {
                // draw the scene
                ctx.draw_arrays(WebGl2RenderingContext::TRIANGLES, 0, VERTEX_CNT as i32);
                
-                // update the viewpoint
-                assembly_to_world.set(asm_to_world);
-                
                // clear the scene change flag
                scene_changed.set(
                    pitch_up_val != 0.0
@ -484,31 +439,6 @@ pub fn Display() -> View {
                yaw_left.set(0.0);
                roll_ccw.set(0.0);
                roll_cw.set(0.0);
-            },
-            on:click=move |event: MouseEvent| {
-                // find the nearest element along the pointer direction
-                let dir = event_dir(&event);
-                console::log_1(&JsValue::from(dir.to_string()));
-                let mut clicked: Option<(ElementKey, f64)> = None;
-                for (key, elt) in state.assembly.elements.get_clone_untracked() {
-                    match assembly_to_world.with(|asm_to_world| elt.cast(dir, asm_to_world)) {
-                        Some(depth) => match clicked {
-                            Some((_, best_depth)) => {
-                                if depth < best_depth {
-                                    clicked = Some((key, depth))
-                                }
-                            },
-                            None => clicked = Some((key, depth))
-                        }
-                        None => ()
-                    };
-                }
-                
-                // if we clicked something, select it
-                match clicked {
-                    Some((key, _)) => state.select(key, event.shift_key()),
-                    None => state.selection.update(|sel| sel.clear())
-                };
            }
        )
    }
--- a/app-proto/src/engine.rs
+++ b/app-proto/src/engine.rs
@ -4,7 +4,7 @@ use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */

 // --- elements ---

-#[cfg(feature = "dev")]
+#[cfg(test)]
 pub fn point(x: f64, y: f64, z: f64) -> DVector<f64> {
    DVector::from_column_slice(&[x, y, z, 0.5, 0.5*(x*x + y*y + z*z)])
 }
@ -113,7 +113,7 @@ impl DescentHistory {

 // the Lorentz form
 lazy_static! {
-    pub static ref Q: DMatrix<f64> = DMatrix::from_row_slice(5, 5, &[
+    static ref Q: DMatrix<f64> = DMatrix::from_row_slice(5, 5, &[
        1.0, 0.0, 0.0,  0.0,  0.0,
        0.0, 1.0, 0.0,  0.0,  0.0,
        0.0, 0.0, 1.0,  0.0,  0.0,
@ -277,79 +277,12 @@ pub fn realize_gram(

 // --- tests ---

-// this problem is from a sangaku by Irisawa Shintarō Hiroatsu. the article
-// below includes a nice translation of the problem statement, which was
-// recorded in Uchida Itsumi's book _Kokon sankan_ (_Mathematics, Past and
-// Present_)
-//
-//   "Japan's 'Wasan' Mathematical Tradition", by Abe Haruki
-//   https://www.nippon.com/en/japan-topics/c12801/
-//
-#[cfg(feature = "dev")]
-pub mod irisawa {
+#[cfg(test)]
+mod tests {
    use std::{array, f64::consts::PI};
    
    use super::*;
    
-    pub fn realize_irisawa_hexlet(scaled_tol: f64) -> (DMatrix<f64>, bool, DescentHistory) {
-        let gram = {
-            let mut gram_to_be = PartialMatrix::new();
-            for s in 0..9 {
-                // each sphere is represented by a spacelike vector
-                gram_to_be.push_sym(s, s, 1.0);
-                
-                // the circumscribing sphere is tangent to all of the other
-                // spheres, with matching orientation
-                if s > 0 {
-                    gram_to_be.push_sym(0, s, 1.0);
-                }
-                
-                if s > 2 {
-                    // each chain sphere is tangent to the "sun" and "moon"
-                    // spheres, with opposing orientation
-                    for n in 1..3 {
-                        gram_to_be.push_sym(s, n, -1.0);
-                    }
-                    
-                    // each chain sphere is tangent to the next chain sphere,
-                    // with opposing orientation
-                    let s_next = 3 + (s-2) % 6;
-                    gram_to_be.push_sym(s, s_next, -1.0);
-                }
-            }
-            gram_to_be
-        };
-        
-        let guess = DMatrix::from_columns(
-            [
-                sphere(0.0, 0.0, 0.0, 15.0),
-                sphere(0.0, 0.0, -9.0, 5.0),
-                sphere(0.0, 0.0, 11.0, 3.0)
-            ].into_iter().chain(
-                (1..=6).map(
-                    |k| {
-                        let ang = (k as f64) * PI/3.0;
-                        sphere(9.0 * ang.cos(), 9.0 * ang.sin(), 0.0, 2.5)
-                    }
-                )
-            ).collect::<Vec<_>>().as_slice()
-        );
-        
-        // the frozen entries fix the radii of the circumscribing sphere, the
-        // "sun" and "moon" spheres, and one of the chain spheres
-        let frozen: [(usize, usize); 4] = array::from_fn(|k| (3, k));
-        
-        realize_gram(
-            &gram, guess, &frozen,
-            scaled_tol, 0.5, 0.9, 1.1, 200, 110
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{*, irisawa::realize_irisawa_hexlet};
-    
    #[test]
    fn sub_proj_test() {
        let target = PartialMatrix(vec![
@ -395,20 +328,182 @@ mod tests {
        assert!(state.loss.abs() < f64::EPSILON);
    }
    
+    // this problem is from a sangaku by Irisawa Shintarō Hiroatsu. the article
+    // below includes a nice translation of the problem statement, which was
+    // recorded in Uchida Itsumi's book _Kokon sankan_ (_Mathematics, Past and
+    // Present_)
+    //
+    //   "Japan's 'Wasan' Mathematical Tradition", by Abe Haruki
+    //   https://www.nippon.com/en/japan-topics/c12801/
+    //
    #[test]
    fn irisawa_hexlet_test() {
-        // solve Irisawa's problem
+        let gram = PartialMatrix({
+            let mut entries = Vec::<MatrixEntry>::new();
+            for s in 0..9 {
+                // each sphere is represented by a spacelike vector
+                entries.push(MatrixEntry { index: (s, s), value: 1.0 });
+                
+                // the circumscribing sphere is tangent to all of the other
+                // spheres, with matching orientation
+                if s > 0 {
+                    entries.push(MatrixEntry { index: (0, s), value: 1.0 });
+                    entries.push(MatrixEntry { index: (s, 0), value: 1.0 });
+                }
+                
+                if s > 2 {
+                    // each chain sphere is tangent to the "sun" and "moon"
+                    // spheres, with opposing orientation
+                    for n in 1..3 {
+                        entries.push(MatrixEntry { index: (s, n), value: -1.0 });
+                        entries.push(MatrixEntry { index: (n, s), value: -1.0 });
+                    }
+                    
+                    // each chain sphere is tangent to the next chain sphere,
+                    // with opposing orientation
+                    let s_next = 3 + (s-2) % 6;
+                    entries.push(MatrixEntry { index: (s, s_next), value: -1.0 });
+                    entries.push(MatrixEntry { index: (s_next, s), value: -1.0 });
+                }
+            }
+            entries
+        });
+        let guess = DMatrix::from_columns(
+            [
+                sphere(0.0, 0.0, 0.0, 15.0),
+                sphere(0.0, 0.0, -9.0, 5.0),
+                sphere(0.0, 0.0, 11.0, 3.0)
+            ].into_iter().chain(
+                (1..=6).map(
+                    |k| {
+                        let ang = (k as f64) * PI/3.0;
+                        sphere(9.0 * ang.cos(), 9.0 * ang.sin(), 0.0, 2.5)
+                    }
+                )
+            ).collect::<Vec<_>>().as_slice()
+        );
+        let frozen: [(usize, usize); 4] = array::from_fn(|k| (3, k));
        const SCALED_TOL: f64 = 1.0e-12;
-        let (config, _, _) = realize_irisawa_hexlet(SCALED_TOL);
-        
-        // check against Irisawa's solution
+        let (config, success, history) = realize_gram(
+            &gram, guess, &frozen,
+            SCALED_TOL, 0.5, 0.9, 1.1, 200, 110
+        );
        let entry_tol = SCALED_TOL.sqrt();
        let solution_diams = [30.0, 10.0, 6.0, 5.0, 15.0, 10.0, 3.75, 2.5, 2.0 + 8.0/11.0];
        for (k, diam) in solution_diams.into_iter().enumerate() {
            assert!((config[(3, k)] - 1.0 / diam).abs() < entry_tol);
        }
+        print!("\nCompleted Gram matrix:{}", config.tr_mul(&*Q) * &config);
+        if success {
+            println!("Target accuracy achieved!");
+        } else {
+            println!("Failed to reach target accuracy");
+        }
+        println!("Steps: {}", history.scaled_loss.len() - 1);
+        println!("Loss: {}", history.scaled_loss.last().unwrap());
+        if success {
+            println!("\nChain diameters:");
+            println!("  {} sun (given)", 1.0 / config[(3, 3)]);
+            for k in 4..9 {
+                println!("  {} sun", 1.0 / config[(3, k)]);
+            }
+        }
+        println!("\nStep │ Loss\n─────┼────────────────────────────────");
+        for (step, scaled_loss) in history.scaled_loss.into_iter().enumerate() {
+            println!("{:<4} │ {}", step, scaled_loss);
+        }
    }
    
+    // --- process inspection examples ---
+    
+    // these tests are meant for human inspection, not automated use. run them
+    // one at a time in `--nocapture` mode and read through the results and
+    // optimization histories that they print out. the `run-examples` script
+    // will run all of them
+    
+    #[test]
+    fn three_spheres_example() {
+        let gram = PartialMatrix({
+            let mut entries = Vec::<MatrixEntry>::new();
+            for j in 0..3 {
+                for k in 0..3 {
+                    entries.push(MatrixEntry {
+                        index: (j, k),
+                        value: if j == k { 1.0 } else { -1.0 }
+                    });
+                }
+            }
+            entries
+        });
+        let guess = {
+            let a: f64 = 0.75_f64.sqrt();
+            DMatrix::from_columns(&[
+                sphere(1.0, 0.0, 0.0, 1.0),
+                sphere(-0.5, a, 0.0, 1.0),
+                sphere(-0.5, -a, 0.0, 1.0)
+            ])
+        };
+        println!();
+        let (config, success, history) = realize_gram(
+            &gram, guess, &[],
+            1.0e-12, 0.5, 0.9, 1.1, 200, 110
+        );
+        print!("\nCompleted Gram matrix:{}", config.tr_mul(&*Q) * &config);
+        if success {
+            println!("Target accuracy achieved!");
+        } else {
+            println!("Failed to reach target accuracy");
+        }
+        println!("Steps: {}", history.scaled_loss.len() - 1);
+        println!("Loss: {}", history.scaled_loss.last().unwrap());
+        println!("\nStep │ Loss\n─────┼────────────────────────────────");
+        for (step, scaled_loss) in history.scaled_loss.into_iter().enumerate() {
+            println!("{:<4} │ {}", step, scaled_loss);
+        }
+    }
+    
+    #[test]
+    fn point_on_sphere_example() {
+        let gram = PartialMatrix({
+            let mut entries = Vec::<MatrixEntry>::new();
+            for j in 0..2 {
+                for k in 0..2 {
+                    entries.push(MatrixEntry {
+                        index: (j, k),
+                        value: if (j, k) == (1, 1) { 1.0 } else { 0.0 }
+                    });
+                }
+            }
+            entries
+        });
+        let guess = DMatrix::from_columns(&[
+            point(0.0, 0.0, 2.0),
+            sphere(0.0, 0.0, 0.0, 1.0)
+        ]);
+        let frozen = [(3, 0)];
+        println!();
+        let (config, success, history) = realize_gram(
+            &gram, guess, &frozen,
+            1.0e-12, 0.5, 0.9, 1.1, 200, 110
+        );
+        print!("\nCompleted Gram matrix:{}", config.tr_mul(&*Q) * &config);
+        print!("Configuration:{}", config);
+        if success {
+            println!("Target accuracy achieved!");
+        } else {
+            println!("Failed to reach target accuracy");
+        }
+        println!("Steps: {}", history.scaled_loss.len() - 1);
+        println!("Loss: {}", history.scaled_loss.last().unwrap());
+        println!("\nStep │ Loss\n─────┼────────────────────────────────");
+        for (step, scaled_loss) in history.scaled_loss.into_iter().enumerate() {
+            println!("{:<4} │ {}", step, scaled_loss);
+        }
+    }
+    
+    /* TO DO */
+    // --- new test placed here to avoid merge conflict ---
+    
    // at the frozen indices, the optimization steps should have exact zeros,
    // and the realized configuration should match the initial guess
    #[test]
--- a/app-proto/src/lib.rs
+++ b/app-proto/src/lib.rs
@ -1 +0,0 @@
-pub mod engine;
--- a/app-proto/src/main.rs
+++ b/app-proto/src/main.rs
@ -25,24 +25,6 @@ impl AppState {
            selection: create_signal(FxHashSet::default())
        }
    }
-    
-    // in single-selection mode, select the element with the given key. in
-    // multiple-selection mode, toggle whether the element with the given key
-    // is selected
-    fn select(&self, key: ElementKey, multi: bool) {
-        if multi {
-            self.selection.update(|sel| {
-                if !sel.remove(&key) {
-                    sel.insert(key);
-                }
-            });
-        } else {
-            self.selection.update(|sel| {
-                sel.clear();
-                sel.insert(key);
-            });
-        }
-    }
 }

 fn main() {
--- a/app-proto/src/outline.rs
+++ b/app-proto/src/outline.rs
@ -1,6 +1,7 @@
 use itertools::Itertools;
-use sycamore::prelude::*;
+use sycamore::{prelude::*, web::tags::div};
 use web_sys::{
+    Element,
    Event,
    HtmlInputElement,
    KeyboardEvent,
@ -8,7 +9,7 @@ use web_sys::{
    wasm_bindgen::JsCast
 };

-use crate::{AppState, assembly, assembly::{Constraint, ConstraintKey, ElementKey}};
+use crate::{AppState, assembly::Constraint};

 // an editable view of the Lorentz product representing a constraint
 #[component(inline_props)]
@ -31,132 +32,6 @@ fn LorentzProductInput(constraint: Constraint) -> View {
    }
 }

-// a list item that shows a constraint in an outline view of an element
-#[component(inline_props)]
-fn ConstraintOutlineItem(constraint_key: ConstraintKey, element_key: ElementKey) -> View {
-    let state = use_context::<AppState>();
-    let assembly = &state.assembly;
-    let constraint = assembly.constraints.with(|csts| csts[constraint_key].clone());
-    let other_subject = if constraint.subjects.0 == element_key {
-        constraint.subjects.1
-    } else {
-        constraint.subjects.0
-    };
-    let other_subject_label = assembly.elements.with(|elts| elts[other_subject].label.clone());
-    let class = constraint.lorentz_prod_valid.map(
-        |&lorentz_prod_valid| if lorentz_prod_valid { "constraint" } else { "constraint invalid" }
-    );
-    view! {
-        li(class=class.get()) {
-            input(r#type="checkbox", bind:checked=constraint.active)
-            div(class="constraint-label") { (other_subject_label) }
-            LorentzProductInput(constraint=constraint)
-            div(class="status")
-        }
-    }
-}
-
-// a list item that shows an element in an outline view of an assembly
-#[component(inline_props)]
-fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
-    let state = use_context::<AppState>();
-    let class = state.selection.map(
-        move |sel| if sel.contains(&key) { "selected" } else { "" }
-    );
-    let label = element.label.clone();
-    let rep_components = element.representation.map(
-        |rep| rep.iter().map(
-            |u| format!("{:.3}", u).replace("-", "\u{2212}")
-        ).collect()
-    );
-    let constrained = element.constraints.map(|csts| csts.len() > 0);
-    let constraint_list = element.constraints.map(
-        |csts| csts.clone().into_iter().collect()
-    );
-    let details_node = create_node_ref();
-    view! {
-        li {
-            details(ref=details_node) {
-                summary(
-                    class=class.get(),
-                    on:keydown={
-                        move |event: KeyboardEvent| {
-                            match event.key().as_str() {
-                                "Enter" => {
-                                    state.select(key, event.shift_key());
-                                    event.prevent_default();
-                                },
-                                "ArrowRight" if constrained.get() => {
-                                    let _ = details_node
-                                        .get()
-                                        .unchecked_into::<web_sys::Element>()
-                                        .set_attribute("open", "");
-                                },
-                                "ArrowLeft" => {
-                                    let _ = details_node
-                                        .get()
-                                        .unchecked_into::<web_sys::Element>()
-                                        .remove_attribute("open");
-                                },
-                                _ => ()
-                            }
-                        }
-                    }
-                ) {
-                    div(
-                        class="element-switch",
-                        on:click=|event: MouseEvent| event.stop_propagation()
-                    )
-                    div(
-                        class="element",
-                        on:click={
-                            move |event: MouseEvent| {
-                                if event.shift_key() {
-                                    state.selection.update(|sel| {
-                                        if !sel.remove(&key) {
-                                            sel.insert(key);
-                                        }
-                                    });
-                                } else {
-                                    state.selection.update(|sel| {
-                                        sel.clear();
-                                        sel.insert(key);
-                                    });
-                                }
-                                event.stop_propagation();
-                                event.prevent_default();
-                            }
-                        }
-                    ) {
-                        div(class="element-label") { (label) }
-                        div(class="element-representation") {
-                            Indexed(
-                                list=rep_components,
-                                view=|coord_str| view! {
-                                    div { (coord_str) }
-                                }
-                            )
-                        }
-                        div(class="status")
-                    }
-                }
-                ul(class="constraints") {
-                    Keyed(
-                        list=constraint_list,
-                        view=move |cst_key| view! {
-                            ConstraintOutlineItem(
-                                constraint_key=cst_key,
-                                element_key=key
-                            )
-                        },
-                        key=|cst_key| cst_key.clone()
-                    )
-                }
-            }
-        }
-    }
-}
-
 // a component that lists the elements of the current assembly, showing the
 // constraints on each element as a collapsible sub-list. its implementation
 // is based on Kate Morley's HTML + CSS tree views:
@ -165,16 +40,15 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
 //
 #[component]
 pub fn Outline() -> View {
-    let state = use_context::<AppState>();
-    
-    // list the elements alphabetically by ID
-    let element_list = state.assembly.elements.map(
-        |elts| elts
-            .clone()
+    // sort the elements alphabetically by ID
+    let elements_sorted = create_memo(|| {
+        let state = use_context::<AppState>();
+        state.assembly.elements
+            .get_clone()
            .into_iter()
            .sorted_by_key(|(_, elt)| elt.id.clone())
            .collect()
-    );
+    });
    
    view! {
        ul(
@ -185,11 +59,128 @@ pub fn Outline() -> View {
            }
        ) {
            Keyed(
-                list=element_list,
-                view=|(key, elt)| view! {
-                    ElementOutlineItem(key=key, element=elt)
+                list=elements_sorted,
+                view=|(key, elt)| {
+                    let state = use_context::<AppState>();
+                    let class = create_memo({
+                        move || {
+                            if state.selection.with(|sel| sel.contains(&key)) {
+                                "selected"
+                            } else {
+                                ""
+                            }
+                        }
+                    });
+                    let label = elt.label.clone();
+                    let rep_components = elt.representation.iter().map(|u| {
+                        let u_coord = u.to_string().replace("-", "\u{2212}");
+                        View::from(div().children(u_coord))
+                    }).collect::<Vec<_>>();
+                    let constrained = elt.constraints.len() > 0;
+                    let details_node = create_node_ref();
+                    view! {
+                        li {
+                            details(ref=details_node) {
+                                summary(
+                                    class=class.get(),
+                                    on:keydown={
+                                        move |event: KeyboardEvent| {
+                                            match event.key().as_str() {
+                                                "Enter" => {
+                                                    if event.shift_key() {
+                                                        state.selection.update(|sel| {
+                                                            if !sel.remove(&key) {
+                                                                sel.insert(key);
+                                                            }
+                                                        });
+                                                    } else {
+                                                        state.selection.update(|sel| {
+                                                            sel.clear();
+                                                            sel.insert(key);
+                                                        });
+                                                    }
+                                                    event.prevent_default();
+                                                },
+                                                "ArrowRight" if constrained => {
+                                                    let _ = details_node
+                                                        .get()
+                                                        .unchecked_into::<Element>()
+                                                        .set_attribute("open", "");
+                                                },
+                                                "ArrowLeft" => {
+                                                    let _ = details_node
+                                                        .get()
+                                                        .unchecked_into::<Element>()
+                                                        .remove_attribute("open");
+                                                },
+                                                _ => ()
+                                            }
+                                        }
+                                    }
+                                ) {
+                                    div(
+                                        class="elt-switch",
+                                        on:click=|event: MouseEvent| event.stop_propagation()
+                                    )
+                                    div(
+                                        class="elt",
+                                        on:click={
+                                            move |event: MouseEvent| {
+                                                if event.shift_key() {
+                                                    state.selection.update(|sel| {
+                                                        if !sel.remove(&key) {
+                                                            sel.insert(key);
+                                                        }
+                                                    });
+                                                } else {
+                                                    state.selection.update(|sel| {
+                                                        sel.clear();
+                                                        sel.insert(key);
+                                                    });
+                                                }
+                                                event.stop_propagation();
+                                                event.prevent_default();
+                                            }
+                                        }
+                                    ) {
+                                        div(class="elt-label") { (label) }
+                                        div(class="elt-rep") { (rep_components) }
+                                    }
+                                }
+                                ul(class="constraints") {
+                                    Keyed(
+                                        list=elt.constraints.into_iter().collect::<Vec<_>>(),
+                                        view=move |c_key| {
+                                            let c_state = use_context::<AppState>();
+                                            let assembly = &c_state.assembly;
+                                            let cst = assembly.constraints.with(|csts| csts[c_key].clone());
+                                            let other_arg = if cst.subjects.0 == key {
+                                                cst.subjects.1
+                                            } else {
+                                                cst.subjects.0
+                                            };
+                                            let other_arg_label = assembly.elements.with(|elts| elts[other_arg].label.clone());
+                                            view! {
+                                                li(class="cst") {
+                                                    input(r#type="checkbox", bind:checked=cst.active)
+                                                    div(class="cst-label") { (other_arg_label) }
+                                                    LorentzProductInput(constraint=cst)
+                                                }
+                                            }
+                                        },
+                                        key=|c_key| c_key.clone()
+                                    )
+                                }
+                            }
+                        }
+                    }
                },
-                key=|(_, elt)| elt.serial
+                key=|(key, elt)| (
+                    key.clone(),
+                    elt.id.clone(),
+                    elt.label.clone(),
+                    elt.constraints.clone()
+                )
            )
        }
    }
Author	SHA1	Message	Date
Aaron Fenyes	5332fda6e4	Move new test to avoid merge conflict	2024-11-11 15:41:42 -08:00
Aaron Fenyes	22a93bee28	Confirm that frozen entries are frozen exactly	2024-11-11 15:34:51 -08:00
Aaron Fenyes	5839882ed7	Name constraint Lorentz product more descriptively	2024-11-11 00:27:28 -08:00
Aaron Fenyes	a4ec52a4e7	Alias the type of an element's color	2024-11-11 00:04:48 -08:00
Vectornaut	abb9d35335	Correct `align` environment in notes	2024-11-11 07:56:27 +00:00
Aaron Fenyes	a170492e3d	Add engine conventions to inversive coordinates notes	2024-11-10 23:47:34 -08:00
Aaron Fenyes	b8ca1139d5	Explain what the `Element::index` field holds Also, remind us to make the field private when that becomes possible.	2024-11-10 23:22:30 -08:00
Aaron Fenyes	ced001bbfe	Alias the types of element and constraint keys This will make it easier to change the key types if we change how we store and access elements and constraints.	2024-11-10 22:55:58 -08:00
Aaron Fenyes	ed1890bffc	Improve naming of constraint subjects	2024-11-10 19:36:40 -08:00
Aaron Fenyes	da008fd090	Write out `representation` in `Element` structure	2024-11-10 19:24:26 -08:00
Aaron Fenyes	933f05661d	Only compile `engine::point` when it's used This function will eventually be used in the application, but right now it's only used in tests.	2024-11-10 16:31:29 -08:00
Aaron Fenyes	9c191ae586	Polish log messages	2024-10-30 00:27:16 -07:00
Aaron Fenyes	9e31037e17	Spread web-sys imports over multiple lines	2024-10-30 00:19:44 -07:00
Aaron Fenyes	c2e3c64d4a	Remove debug log from Lorentz product input	2024-10-30 00:16:34 -07:00
Aaron Fenyes	76ad4245d5	Factor out Lorentz product input	2024-10-29 23:43:41 -07:00
Aaron Fenyes	a46ef2c8d6	Work around data binding bug in number input Setting `bind:value` or `bind:valueAsNumber` for a number input seems to restrict what you can type in it. We work around this by switching to text inputs for now. We should probably switch back to number inputs if we can, though, because they let us take advantage of the browser's parsing and validation.	2024-10-29 22:53:48 -07:00
Aaron Fenyes	e0880d2ad2	Make constraints editable	2024-10-29 22:32:00 -07:00
Aaron Fenyes	e5f4d523f9	Update the realization when a constraint is activated Sycamore probably has a better way to do this, but this way works for now.	2024-10-29 13:46:15 -07:00
Aaron Fenyes	a37c71153d	Enforce constraints in the editor	2024-10-26 23:51:27 -07:00
Aaron Fenyes	ce33bbf418	Record optimization history	2024-10-26 01:07:17 -07:00
Aaron Fenyes	9f8632efb3	Port the Irisawa hexlet test to Rust In the process, notice that the tolerance scale adjustment was ported wrong, and correct it.	2024-10-25 21:43:53 -07:00
Aaron Fenyes	9fe03264ab	Port the Gram matrix realization routine to Rust Validate with the process inspection example tests, which print out their results and optimization histories when run one at a time in `--nocapture` mode.	2024-10-25 17:34:29 -07:00
Aaron Fenyes	e59d60bf77	Reorganize search state; remove unused variables	2024-10-25 17:17:49 -07:00
Aaron Fenyes	16df161fe7	Test alternate projection technique	2024-10-24 19:51:10 -07:00