glen/dyna3
1
0
Fork 1
Code Issues 26 Pull requests 1 Projects 1 Releases 2 Wiki Activity Actions

Generalize constraints to observables #48

Open
Vectornaut wants to merge 7 commits from Vectornaut/dyna3:observables_on_main into main
pull from: Vectornaut/dyna3:observables_on_main
merge into: glen:main
Conversation 42 Commits 7 Files changed 4 +15 -15
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b3e4e902f3 - Show all commits

14
app-proto/src/add_remove.rs
View file

@ -200,7 +200,7 @@ pub fn AddRemove() -> View {
(subject_vec[0].clone(), subject_vec[1].clone())
}
);
let measured = state.assembly.elements.map(
let measurement = state.assembly.elements.map(
move |elts| {
let reps = (
elts[subjects.0].representation.get_clone(),
@ -209,13 +209,13 @@ pub fn AddRemove() -> View {
reps.0.dot(&(&*Q * reps.1))
}
);
let desired = create_signal(0.0);
let set_point = create_signal(0.0);
let role = create_signal(RegulatorRole::Measurement);
state.assembly.insert_regulator(Regulator {
subjects: subjects,
measured: measured,
desired: desired,
desired_text: create_signal(String::new()),
measurement: measurement,
set_point: set_point,
set_point_text: create_signal(String::new()),
role: role,
});
state.selection.update(|sel| sel.clear());
@ -230,7 +230,7 @@ pub fn AddRemove() -> View {
&JsValue::from(reg.subjects.0),
&JsValue::from(reg.subjects.1),
&JsValue::from(":"),
&JsValue::from(reg.desired.get_untracked())
&JsValue::from(reg.set_point.get_untracked())
);
}
});
@ -241,7 +241,7 @@ pub fn AddRemove() -> View {
console::log_1(&JsValue::from(
format!("Updated constraint with subjects ({}, {})", subjects.0, subjects.1)
));
desired.track();
set_point.track();
if role.with(|rl| rl.is_valid_constraint()) {
state.assembly.realize();
}

8
app-proto/src/assembly.rs
View file

@ -128,9 +128,9 @@ impl RegulatorRole {
#[derive(Clone)]
pub struct Regulator {
pub subjects: (ElementKey, ElementKey),
pub measured: ReadSignal<f64>,
pub desired: Signal<f64>,
pub desired_text: Signal<String>,
pub measurement: ReadSignal<f64>,
pub set_point: Signal<f64>,
pub set_point_text: Signal<String>,
pub role: Signal<RegulatorRole>
}
@ -254,7 +254,7 @@ impl Assembly {
let subjects = reg.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.desired.get_untracked());
gram_to_be.push_sym(row, col, reg.set_point.get_untracked());
}
}
});

8
app-proto/src/outline.rs
View file

@ -25,8 +25,8 @@ fn RegulatorInput(regulator: Regulator) -> View {
view! {
input(
r#type="text",
placeholder=regulator.measured.with(|result| result.to_string()),
bind:value=regulator.desired_text,
placeholder=regulator.measurement.with(|result| result.to_string()),
bind:value=regulator.set_point_text,
on:change=move |event: Event| {
let target: HtmlInputElement = event.target().unwrap().unchecked_into();
let value = target.value();
@ -34,8 +34,8 @@ fn RegulatorInput(regulator: Regulator) -> View {
regulator.role.set(Measurement);
} else {
match target.value().parse::<f64>() {
Ok(desired) => batch(|| {
regulator.desired.set(desired);
Ok(set_pt) => batch(|| {
regulator.set_point.set(set_pt);
regulator.role.set(Constraint(true));
}),
Err(_) => regulator.role.set(Constraint(false))