Commit: d0bdb9a227d150d2c81511cb61e1ff7ce501a5ab - Resistors (git)

Finds networks of resistors to approximate resistances.

Commit MetaInfo

• Revisão: d0bdb9a227d150d2c81511cb61e1ff7ce501a5ab (tree)
• Hora: 2020-03-11 16:12:16
• Autor: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Mensagem de Log

Sort results by resistor count, then by how close it is to the target

Mudança Sumário

• modified: resistors.m

Diff

--- a/resistors.m
+++ b/resistors.m
@@ -443,7 +443,19 @@ main(!IO) :-
             % Read from stdin
             read_resistors_from_stdin(rbtree.init, Resistors, !IO),
             Sort = (pred(A::in, B::in, Cmp::out) is det :-
-                builtin.compare(Cmp, length(A), length(B)) ),
+                builtin.compare(LenCmp, length(A), length(B)),
+                % If the lengths are identical, sort by how close the
+                % resistance is to our target.
+                ( if
+                    LenCmp = (=)
+                then
+                    % Not entirely sure why the type hinting is needed...
+                    builtin.compare(Cmp,
+                        abs(value(A) - Target):int,
+                        abs(value(B) - Target))
+                else
+                    LenCmp = Cmp
+                ) ),
             
             % Try a simple network.
             promise_equivalent_solutions [SimpleResults] (