diff --git a/app-proto/main.css b/app-proto/main.css index 9c45c29..e41fcd9 100644 --- a/app-proto/main.css +++ b/app-proto/main.css @@ -77,12 +77,12 @@ summary.selected { background-color: var(--selection-highlight); } -summary > div, .constraint { +summary > div, .observable { padding-top: 4px; padding-bottom: 4px; } -.element, .constraint { +.element, .observable { display: flex; flex-grow: 1; padding-left: 8px; @@ -107,7 +107,7 @@ details[open]:has(li) .element-switch::after { flex-grow: 1; } -.constraint-label { +.observable-label { flex-grow: 1; } @@ -123,22 +123,22 @@ details[open]:has(li) .element-switch::after { width: 56px; } -.constraint { +.observable { font-style: italic; } -.constraint.invalid { +.observable.invalid { color: var(--text-invalid); } -.constraint > input[type=text] { +.observable > input[type=text] { color: inherit; background-color: inherit; border: 1px solid var(--border); border-radius: 2px; } -.constraint.invalid > input[type=text] { +.observable.invalid > input[type=text] { border-color: var(--border-invalid); } diff --git a/app-proto/src/add_remove.rs b/app-proto/src/add_remove.rs index 360a12d..07b4c28 100644 --- a/app-proto/src/add_remove.rs +++ b/app-proto/src/add_remove.rs @@ -6,8 +6,8 @@ use crate::{ AppState, assembly::{ Assembly, - Constraint, - ConstraintRole, + Observable, + ObservableRole, Element }, engine::Q @@ -210,8 +210,8 @@ pub fn AddRemove() -> View { } ); let desired = create_signal(0.0); - let role = create_signal(ConstraintRole::Measure); - state.assembly.insert_constraint(Constraint { + let role = create_signal(ObservableRole::Measure); + state.assembly.insert_observable(Observable { subjects: subjects, measured: measured, desired: desired, @@ -221,16 +221,16 @@ pub fn AddRemove() -> View { state.selection.update(|sel| sel.clear()); /* DEBUG */ - // print updated constraint list - console::log_1(&JsValue::from("Constraints:")); - state.assembly.constraints.with(|csts| { - for (_, cst) in csts.into_iter() { + // print updated observable list + console::log_1(&JsValue::from("Observables:")); + state.assembly.observables.with(|obsls| { + for (_, obs) in obsls.into_iter() { console::log_5( &JsValue::from(" "), - &JsValue::from(cst.subjects.0), - &JsValue::from(cst.subjects.1), + &JsValue::from(obs.subjects.0), + &JsValue::from(obs.subjects.1), &JsValue::from(":"), - &JsValue::from(cst.desired.get_untracked()) + &JsValue::from(obs.desired.get_untracked()) ); } }); @@ -239,10 +239,10 @@ pub fn AddRemove() -> View { // constrained, or is edited while constrained create_effect(move || { console::log_1(&JsValue::from( - format!("Constraint ({}, {}) updated", subjects.0, subjects.1) + format!("Updated constraint with subjects ({}, {})", subjects.0, subjects.1) )); desired.track(); - if role.with(|r| matches!(r, ConstraintRole::Constrain)) { + if role.with(|r| matches!(r, ObservableRole::Constrain)) { state.assembly.realize(); } }); diff --git a/app-proto/src/assembly.rs b/app-proto/src/assembly.rs index 37bd484..e438934 100644 --- a/app-proto/src/assembly.rs +++ b/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 constraints +// the types of the keys we use to access an assembly's elements and observables pub type ElementKey = usize; -pub type ConstraintKey = usize; +pub type ObservableKey = usize; pub type ElementColor = [f32; 3]; @@ -26,7 +26,7 @@ pub struct Element { pub label: String, pub color: ElementColor, pub representation: Signal>, - pub constraints: Signal>, + pub observables: Signal>, // 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), - constraints: create_signal(BTreeSet::default()), + observables: create_signal(BTreeSet::default()), serial: serial, column_index: None } @@ -111,19 +111,19 @@ impl Element { } } -pub enum ConstraintRole { +pub enum ObservableRole { Measure, Constrain, Invalid } #[derive(Clone)] -pub struct Constraint { +pub struct Observable { pub subjects: (ElementKey, ElementKey), pub measured: ReadSignal, pub desired: Signal, pub desired_text: Signal, - pub role: Signal + pub role: Signal } // the velocity is expressed in uniform coordinates @@ -137,9 +137,9 @@ type AssemblyMotion<'a> = Vec>; // a complete, view-independent description of an assembly #[derive(Clone)] pub struct Assembly { - // elements and constraints + // elements and observables pub elements: Signal>, - pub constraints: Signal>, + pub observables: Signal>, // solution variety tangent space. the basis vectors are stored in // configuration matrix format, ordered according to the elements' column @@ -161,13 +161,13 @@ impl Assembly { pub fn new() -> Assembly { Assembly { elements: create_signal(Slab::new()), - constraints: create_signal(Slab::new()), + observables: create_signal(Slab::new()), tangent: create_signal(ConfigSubspace::zero(0)), elements_by_id: create_signal(FxHashMap::default()) } } - // --- inserting elements and constraints --- + // --- inserting elements and observables --- // insert an element into the assembly without checking whether we already // have an element with the same identifier. any element that does have the @@ -210,14 +210,14 @@ impl Assembly { ); } - 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) + pub fn insert_observable(&self, observable: Observable) { + let subjects = observable.subjects; + let key = self.observables.update(|obsls| obsls.insert(observable)); + let subject_observables = self.elements.with( + |elts| (elts[subjects.0].observables, elts[subjects.1].observables) ); - subject_constraints.0.update(|csts| csts.insert(key)); - subject_constraints.1.update(|csts| csts.insert(key)); + subject_observables.0.update(|obsls| obsls.insert(key)); + subject_observables.1.update(|obsls| obsls.insert(key)); } // --- realization --- @@ -234,13 +234,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.constraints.with_untracked(|csts| { - for (_, cst) in csts { - if cst.role.with_untracked(|role| matches!(role, ConstraintRole::Constrain)) { - let subjects = cst.subjects; + self.observables.with_untracked(|obsls| { + for (_, obs) in obsls { + if obs.role.with_untracked(|role| matches!(role, ObservableRole::Constrain)) { + let subjects = obs.subjects; let row = elts[subjects.0].column_index.unwrap(); let col = elts[subjects.1].column_index.unwrap(); - gram_to_be.push_sym(row, col, cst.desired.get_untracked()); + gram_to_be.push_sym(row, col, obs.desired.get_untracked()); } } }); diff --git a/app-proto/src/outline.rs b/app-proto/src/outline.rs index 8459262..5444974 100644 --- a/app-proto/src/outline.rs +++ b/app-proto/src/outline.rs @@ -12,33 +12,33 @@ use crate::{ AppState, assembly, assembly::{ - Constraint, - ConstraintKey, - ConstraintRole::*, + Observable, + ObservableKey, + ObservableRole::*, ElementKey } }; -// an editable view of the Lorentz product representing a constraint +// an editable view of the Lorentz product representing an observable #[component(inline_props)] -fn LorentzProductInput(constraint: Constraint) -> View { +fn ObservableInput(observable: Observable) -> View { view! { input( r#type="text", - placeholder=constraint.measured.with(|result| result.to_string()), - bind:value=constraint.desired_text, + placeholder=observable.measured.with(|result| result.to_string()), + bind:value=observable.desired_text, on:change=move |event: Event| { let target: HtmlInputElement = event.target().unwrap().unchecked_into(); let value = target.value(); if value.is_empty() { - constraint.role.set(Measure); + observable.role.set(Measure); } else { match target.value().parse::() { Ok(desired) => batch(|| { - constraint.desired.set(desired); - constraint.role.set(Constrain); + observable.desired.set(desired); + observable.role.set(Constrain); }), - Err(_) => constraint.role.set(Invalid) + Err(_) => observable.role.set(Invalid) }; } } @@ -46,29 +46,29 @@ fn LorentzProductInput(constraint: Constraint) -> View { } } -// a list item that shows a constraint in an outline view of an element +// a list item that shows an observable in an outline view of an element #[component(inline_props)] -fn ConstraintOutlineItem(constraint_key: ConstraintKey, element_key: ElementKey) -> View { +fn ObservableOutlineItem(observable_key: ObservableKey, element_key: ElementKey) -> View { let state = use_context::(); 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 + let observable = assembly.observables.with(|obsls| obsls[observable_key].clone()); + let other_subject = if observable.subjects.0 == element_key { + observable.subjects.1 } else { - constraint.subjects.0 + observable.subjects.0 }; let other_subject_label = assembly.elements.with(|elts| elts[other_subject].label.clone()); - let class = constraint.role.map( + let class = observable.role.map( |role| match role { - Measure => "constraint", - Constrain => "constraint constrained", - Invalid => "constraint invalid" + Measure => "observable", + Constrain => "observable constrained", + Invalid => "observable invalid" } ); view! { li(class=class.get()) { - div(class="constraint-label") { (other_subject_label) } - LorentzProductInput(constraint=constraint) + div(class="observable-label") { (other_subject_label) } + ObservableInput(observable=observable) div(class="status") } } @@ -92,9 +92,9 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View { ).collect::>() ) }; - let constrained = element.constraints.map(|csts| csts.len() > 0); - let constraint_list = element.constraints.map( - |csts| csts.clone().into_iter().collect() + let observed = element.observables.map(|obsls| obsls.len() > 0); + let observable_list = element.observables.map( + |obsls| obsls.clone().into_iter().collect() ); let details_node = create_node_ref(); view! { @@ -109,7 +109,7 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View { state.select(key, event.shift_key()); event.prevent_default(); }, - "ArrowRight" if constrained.get() => { + "ArrowRight" if observed.get() => { let _ = details_node .get() .unchecked_into::() @@ -156,16 +156,16 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View { div(class="status") } } - ul(class="constraints") { + ul(class="observables") { Keyed( - list=constraint_list, - view=move |cst_key| view! { - ConstraintOutlineItem( - constraint_key=cst_key, + list=observable_list, + view=move |obs_key| view! { + ObservableOutlineItem( + observable_key=obs_key, element_key=key ) }, - key=|cst_key| cst_key.clone() + key=|obs_key| obs_key.clone() ) } } @@ -174,8 +174,8 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View { } // 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: +// observables associated with 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/ //