app-proto/main.css

@@ -3,8 +3,7 @@
   --text-bright: white;
   --text-invalid: #f58fc2; /* bright pink */
   --border: #555; /* light gray */
-  --border-focus-dark: #aaa; /* bright gray */
-  --border-focus-light: white;
+  --border-focus: #aaa; /* bright gray */
   --border-invalid: #70495c; /* dusky pink */
   --selection-highlight: #444; /* medium gray */
   --page-background: #222; /* dark gray */
@@ -24,7 +23,7 @@ body {
   display: flex;
   flex-direction: column;
   float: left;
-  width: 500px;
+  width: 450px;
   height: 100vh;
   margin: 0px;
   padding: 0px;
@@ -78,12 +77,12 @@ summary.selected {
   background-color: var(--selection-highlight);
 }
 
-summary > div, .regulator {
+summary > div, .constraint {
   padding-top: 4px;
   padding-bottom: 4px;
 }
 
-.element, .regulator {
+.element, .constraint {
   display: flex;
   flex-grow: 1;
   padding-left: 8px;
@@ -108,7 +107,7 @@ details[open]:has(li) .element-switch::after {
   flex-grow: 1;
 }
 
-.regulator-label {
+.constraint-label {
   flex-grow: 1;
 }
 
@@ -124,37 +123,26 @@ details[open]:has(li) .element-switch::after {
   width: 56px;
 }
 
-.regulator {
+.constraint {
   font-style: italic;
 }
 
-.regulator-type {
-  padding: 2px 8px 0px 8px;
-  font-size: 10pt;
-}
-
-.regulator.invalid-constraint {
+.constraint.invalid {
   color: var(--text-invalid);
 }
 
-.regulator > input {
+.constraint > input[type=checkbox] {
+  margin: 0px 8px 0px 0px;
+}
+
+.constraint > input[type=text] {
   color: inherit;
   background-color: inherit;
   border: 1px solid var(--border);
   border-radius: 2px;
 }
 
-.regulator > input::placeholder {
-  color: inherit;
-  opacity: 54%;
-  font-style: italic;
-}
-
-.regulator.valid-constraint > input {
-  background-color: var(--display-background);
-}
-
-.regulator.invalid-constraint > input {
+.constraint.invalid > input[type=text] {
   border-color: var(--border-invalid);
 }
 
@@ -166,7 +154,7 @@ details[open]:has(li) .element-switch::after {
   font-style: normal;
 }
 
-.invalid-constraint > .status::after, details:has(.invalid-constraint):not([open]) .status::after {
+.invalid > .status::after, details:has(.invalid):not([open]) .status::after {
   content: '⚠';
   color: var(--text-invalid);
 }
@@ -183,11 +171,5 @@ canvas {
 }
 
 canvas:focus {
-  border-color: var(--border-focus-dark);
-  outline: none;
-}
-
-input:focus {
-  border-color: var(--border-focus-light);
-  outline: none;
+  border-color: var(--border-focus);
 }

app-proto/src/add_remove.rs

@@ -1,17 +1,7 @@
 use sycamore::prelude::*;
 use web_sys::{console, wasm_bindgen::JsValue};
 
-use crate::{
-    engine,
-    AppState,
-    assembly::{
-        Assembly,
-        Regulator,
-        RegulatorRole,
-        Element
-    },
-    engine::Q
-};
+use crate::{engine, AppState, assembly::{Assembly, Constraint, Element}};
 
 /* DEBUG */
 // load an example assembly for testing. this code will be removed once we've
@@ -200,49 +190,41 @@ pub fn AddRemove() -> View {
                             (subject_vec[0].clone(), subject_vec[1].clone())
                         }
                     );
-                    let measurement = state.assembly.elements.map(
-                        move |elts| {
-                            let reps = (
-                                elts[subjects.0].representation.get_clone(),
-                                elts[subjects.1].representation.get_clone()
-                            );
-                            reps.0.dot(&(&*Q * reps.1))
-                        }
-                    );
-                    let set_point = create_signal(0.0);
-                    let role = create_signal(RegulatorRole::Measurement);
-                    state.assembly.insert_regulator(Regulator {
+                    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,
-                        measurement: measurement,
-                        set_point: set_point,
-                        set_point_text: create_signal(String::new()),
-                        role: role,
+                        lorentz_prod: lorentz_prod,
+                        lorentz_prod_text: create_signal(String::new()),
+                        lorentz_prod_valid: lorentz_prod_valid,
+                        active: active,
                     });
                     state.selection.update(|sel| sel.clear());
                     
                     /* DEBUG */
-                    // print updated regulator list
-                    console::log_1(&JsValue::from("Regulators:"));
-                    state.assembly.regulators.with(|regs| {
-                        for (_, reg) in regs.into_iter() {
+                    // print updated constraint list
+                    console::log_1(&JsValue::from("Constraints:"));
+                    state.assembly.constraints.with(|csts| {
+                        for (_, cst) in csts.into_iter() {
                             console::log_5(
                                 &JsValue::from(" "),
-                                &JsValue::from(reg.subjects.0),
-                                &JsValue::from(reg.subjects.1),
+                                &JsValue::from(cst.subjects.0),
+                                &JsValue::from(cst.subjects.1),
                                 &JsValue::from(":"),
-                                &JsValue::from(reg.set_point.get_untracked())
+                                &JsValue::from(cst.lorentz_prod.get_untracked())
                             );
                         }
                     });
                     
-                    // update the realization when the regulator becomes
-                    // a constraint, or is edited while acting as a constraint
+                    // update the realization when the constraint becomes active
+                    // and valid, or is edited while active and valid
                     create_effect(move || {
                         console::log_1(&JsValue::from(
-                            format!("Updated constraint with subjects ({}, {})", subjects.0, subjects.1)
+                            format!("Constraint ({}, {}) updated", subjects.0, subjects.1)
                         ));
-                        set_point.track();
-                        if role.with(|rl| rl.is_valid_constraint()) {
+                        lorentz_prod.track();
+                        if active.get() && lorentz_prod_valid.get() {
                             state.assembly.realize();
                         }
                     });

app-proto/src/assembly.rs

@@ -7,9 +7,9 @@ use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
 
 use crate::engine::{realize_gram, local_unif_to_std, ConfigSubspace, PartialMatrix};
 
-// the types of the keys we use to access an assembly's elements and regulators
+// the types of the keys we use to access an assembly's elements and constraints
 pub type ElementKey = usize;
-pub type RegulatorKey = usize;
+pub type ConstraintKey = usize;
 
 pub type ElementColor = [f32; 3];
 
@@ -26,7 +26,7 @@ pub struct Element {
     pub label: String,
     pub color: ElementColor,
     pub representation: Signal<DVector<f64>>,
-    pub regulators: Signal<BTreeSet<RegulatorKey>>,
+    pub constraints: Signal<BTreeSet<ConstraintKey>>,
 
     // a serial number, assigned by `Element::new`, that uniquely identifies
     // each element
@@ -61,7 +61,7 @@ impl Element {
             label: label,
             color: color,
             representation: create_signal(representation),
-            regulators: create_signal(BTreeSet::default()),
+            constraints: create_signal(BTreeSet::default()),
             serial: serial,
             column_index: None
         }
@@ -111,33 +111,13 @@ impl Element {
     }
 }
 
-pub enum RegulatorRole {
-    Measurement,
-    Constraint(bool)
-}
-
-impl RegulatorRole {
-    pub fn is_valid_constraint(&self) -> bool {
-        match self {
-            RegulatorRole::Measurement => false,
-            RegulatorRole::Constraint(valid) => *valid
-        }
-    }
-}
-
 #[derive(Clone)]
-pub struct Regulator {
+pub struct Constraint {
     pub subjects: (ElementKey, ElementKey),
-    pub measurement: ReadSignal<f64>,
-    pub set_point: Signal<f64>,
-    pub set_point_text: Signal<String>,
-    pub role: Signal<RegulatorRole>
-}
-
-impl Regulator {
-    fn role_is_valid_constraint_untracked(&self) -> bool {
-        self.role.with_untracked(|role| role.is_valid_constraint())
-    }
+    pub lorentz_prod: Signal<f64>,
+    pub lorentz_prod_text: Signal<String>,
+    pub lorentz_prod_valid: Signal<bool>,
+    pub active: Signal<bool>
 }
 
 // the velocity is expressed in uniform coordinates
@@ -151,9 +131,9 @@ type AssemblyMotion<'a> = Vec<ElementMotion<'a>>;
 // a complete, view-independent description of an assembly
 #[derive(Clone)]
 pub struct Assembly {
-    // elements and regulators
+    // elements and constraints
     pub elements: Signal<Slab<Element>>,
-    pub regulators: Signal<Slab<Regulator>>,
+    pub constraints: Signal<Slab<Constraint>>,
     
     // solution variety tangent space. the basis vectors are stored in
     // configuration matrix format, ordered according to the elements' column
@@ -175,13 +155,13 @@ impl Assembly {
     pub fn new() -> Assembly {
         Assembly {
             elements: create_signal(Slab::new()),
-            regulators: create_signal(Slab::new()),
+            constraints: create_signal(Slab::new()),
             tangent: create_signal(ConfigSubspace::zero(0)),
             elements_by_id: create_signal(FxHashMap::default())
         }
     }
     
-    // --- inserting elements and regulators ---
+    // --- inserting elements and constraints ---
     
     // insert an element into the assembly without checking whether we already
     // have an element with the same identifier. any element that does have the
@@ -224,14 +204,14 @@ impl Assembly {
         );
     }
     
-    pub fn insert_regulator(&self, regulator: Regulator) {
-        let subjects = regulator.subjects;
-        let key = self.regulators.update(|regs| regs.insert(regulator));
-        let subject_regulators = self.elements.with(
-            |elts| (elts[subjects.0].regulators, elts[subjects.1].regulators)
+    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_regulators.0.update(|regs| regs.insert(key));
-        subject_regulators.1.update(|regs| regs.insert(key));
+        subject_constraints.0.update(|csts| csts.insert(key));
+        subject_constraints.1.update(|csts| csts.insert(key));
     }
     
     // --- realization ---
@@ -248,13 +228,13 @@ impl Assembly {
         let (gram, guess) = self.elements.with_untracked(|elts| {
             // set up the off-diagonal part of the Gram matrix
             let mut gram_to_be = PartialMatrix::new();
-            self.regulators.with_untracked(|regs| {
-                for (_, reg) in regs {
-                    if reg.role_is_valid_constraint_untracked() {
-                        let subjects = reg.subjects;
+            self.constraints.with_untracked(|csts| {
+                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.unwrap();
                         let col = elts[subjects.1].column_index.unwrap();
-                        gram_to_be.push_sym(row, col, reg.set_point.get_untracked());
+                        gram_to_be.push_sym(row, col, cst.lorentz_prod.get_untracked());
                     }
                 }
             });

app-proto/src/outline.rs

@@ -8,68 +8,49 @@ use web_sys::{
     wasm_bindgen::JsCast
 };
 
-use crate::{
-    AppState,
-    assembly,
-    assembly::{
-        Regulator,
-        RegulatorKey,
-        RegulatorRole::*,
-        ElementKey
-    }
-};
+use crate::{AppState, assembly, assembly::{Constraint, ConstraintKey, ElementKey}};
 
-// an editable view of a regulator
+// an editable view of the Lorentz product representing a constraint
 #[component(inline_props)]
-fn RegulatorInput(regulator: Regulator) -> View {
+fn LorentzProductInput(constraint: Constraint) -> View {
     view! {
         input(
             r#type="text",
-            placeholder=regulator.measurement.with(|result| result.to_string()),
-            bind:value=regulator.set_point_text,
+            bind:value=constraint.lorentz_prod_text,
             on:change=move |event: Event| {
                 let target: HtmlInputElement = event.target().unwrap().unchecked_into();
-                let value = target.value();
-                if value.is_empty() {
-                    regulator.role.set(Measurement);
-                } else {
-                    match target.value().parse::<f64>() {
-                        Ok(set_pt) => batch(|| {
-                            regulator.set_point.set(set_pt);
-                            regulator.role.set(Constraint(true));
-                        }),
-                        Err(_) => regulator.role.set(Constraint(false))
-                    };
-                }
+                match target.value().parse::<f64>() {
+                    Ok(lorentz_prod) => batch(|| {
+                        constraint.lorentz_prod.set(lorentz_prod);
+                        constraint.lorentz_prod_valid.set(true);
+                    }),
+                    Err(_) => constraint.lorentz_prod_valid.set(false)
+                };
             }
         )
     }
 }
 
-// a list item that shows a regulator in an outline view of an element
+// a list item that shows a constraint in an outline view of an element
 #[component(inline_props)]
-fn RegulatorOutlineItem(regulator_key: RegulatorKey, element_key: ElementKey) -> View {
+fn ConstraintOutlineItem(constraint_key: ConstraintKey, element_key: ElementKey) -> View {
     let state = use_context::<AppState>();
     let assembly = &state.assembly;
-    let regulator = assembly.regulators.with(|regs| regs[regulator_key].clone());
-    let other_subject = if regulator.subjects.0 == element_key {
-        regulator.subjects.1
+    let constraint = assembly.constraints.with(|csts| csts[constraint_key].clone());
+    let other_subject = if constraint.subjects.0 == element_key {
+        constraint.subjects.1
     } else {
-        regulator.subjects.0
+        constraint.subjects.0
     };
     let other_subject_label = assembly.elements.with(|elts| elts[other_subject].label.clone());
-    let class = regulator.role.map(
-        |role| match role {
-            Measurement => "regulator",
-            Constraint(true) => "regulator valid-constraint",
-            Constraint(false) => "regulator invalid-constraint"
-        }
+    let class = constraint.lorentz_prod_valid.map(
+        |&lorentz_prod_valid| if lorentz_prod_valid { "constraint" } else { "constraint invalid" }
     );
     view! {
         li(class=class.get()) {
-            div(class="regulator-label") { (other_subject_label) }
-            div(class="regulator-type") { "Inversive distance" }
-            RegulatorInput(regulator=regulator)
+            input(r#type="checkbox", bind:checked=constraint.active)
+            div(class="constraint-label") { (other_subject_label) }
+            LorentzProductInput(constraint=constraint)
             div(class="status")
         }
     }
@@ -93,9 +74,9 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
             ).collect::<Vec<_>>()
         )
     };
-    let regulated = element.regulators.map(|regs| regs.len() > 0);
-    let regulator_list = element.regulators.map(
-        |regs| regs.clone().into_iter().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! {
@@ -110,7 +91,7 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
                                     state.select(key, event.shift_key());
                                     event.prevent_default();
                                 },
-                                "ArrowRight" if regulated.get() => {
+                                "ArrowRight" if constrained.get() => {
                                     let _ = details_node
                                         .get()
                                         .unchecked_into::<web_sys::Element>()
@@ -157,16 +138,16 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
                         div(class="status")
                     }
                 }
-                ul(class="regulators") {
+                ul(class="constraints") {
                     Keyed(
-                        list=regulator_list,
-                        view=move |reg_key| view! {
-                            RegulatorOutlineItem(
-                                regulator_key=reg_key,
+                        list=constraint_list,
+                        view=move |cst_key| view! {
+                            ConstraintOutlineItem(
+                                constraint_key=cst_key,
                                 element_key=key
                             )
                         },
-                        key=|reg_key| reg_key.clone()
+                        key=|cst_key| cst_key.clone()
                     )
                 }
             }
@@ -174,9 +155,9 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
     }
 }
 
-// a component that lists the elements of the current assembly, showing each
-// element's regulators in a collapsible sub-list. its implementation is based
-// on Kate Morley's HTML + CSS tree views:
+// 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:
 //
 //   https://iamkate.com/code/tree-views/
 //