glen/dyna3
1
0
Fork 0
forked from StudioInfinity/dyna3
Code Pull requests Activity

Spruce up formatting and error messages

Browse source 
Make the new code's formatting and error messages more consistent with
the previous code. I don't necessarily have a strong preference for the
previous conventions, but I do like stuff to be consistent.
This commit is contained in:
Aaron Fenyes 2025-10-07 16:19:14 -07:00 • committed by Glen Whitney
parent 6ad3ed1176
commit 5ee24aa91d
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -315,10 +315,11 @@ impl Element for Point {
fn default_regulators(self: Rc<Self>) -> Vec<Rc<dyn Regulator>> { fn default_regulators(self: Rc<Self>) -> Vec<Rc<dyn Regulator>> {
all::<Axis>() all::<Axis>()
.map(|axis| { .map(
Rc::new(PointCoordinateRegulator::new(self.clone(), axis)) |axis| Rc::new(
as Rc::<dyn Regulator> PointCoordinateRegulator::new(self.clone(), axis)
}) ) as Rc::<dyn Regulator>
)
.collect() .collect()
} }
@ -543,19 +544,32 @@ impl PointCoordinateRegulator {
let measurement = subject.representation().map( let measurement = subject.representation().map(
move |rep| rep[axis as usize] move |rep| rep[axis as usize]
); );
let set_point = create_signal(SpecifiedValue::from_empty_spec()); let set_point = create_signal(SpecifiedValue::from_empty_spec());
Self { subject, axis, measurement, set_point, serial: Self::next_serial() } let serial = Self::next_serial();
Self { subject, axis, measurement, set_point, serial }
} }
} }
impl Serial for PointCoordinateRegulator { impl Serial for PointCoordinateRegulator {
fn serial(&self) -> u64 { self.serial } fn serial(&self) -> u64 {
self.serial
}
} }
impl Regulator for PointCoordinateRegulator { impl Regulator for PointCoordinateRegulator {
fn subjects(&self) -> Vec<Rc<dyn Element>> { vec![self.subject.clone()] } fn subjects(&self) -> Vec<Rc<dyn Element>> {
fn measurement(&self) -> ReadSignal<f64> { self.measurement } vec![self.subject.clone()]
fn set_point(&self) -> Signal<SpecifiedValue> { self.set_point } }
fn measurement(&self) -> ReadSignal<f64> {
self.measurement
}
fn set_point(&self) -> Signal<SpecifiedValue> {
self.set_point
}
} }
impl ProblemPoser for PointCoordinateRegulator { impl ProblemPoser for PointCoordinateRegulator {
@ -576,10 +590,10 @@ impl ProblemPoser for PointCoordinateRegulator {
coords[index.0] = value coords[index.0] = value
} }
} }
if nset == Axis::CARDINALITY { if n_set == Axis::CARDINALITY {
let [x, y, z] = coords; let [x, y, z] = coords_frozen;
problem.frozen.push( let norm = point(x, y, z)[Point::NORM_COMPONENT];
Point::NORM_COMPONENT, col, point(x,y,z)[Point::NORM_COMPONENT]); problem.frozen.push(Point::NORM_COMPONENT, col, norm);
} }
} }
}); });