Merge branch 'main' of github.com:input-output-hk/ouroboros-leios

Author: cjkoepke

Logbook.md

@@ -40,6 +40,7 @@ source-repository-package
     type: git
     location: https://github.com/Saizan/io-sim.git
     tag: cb3926463e42d5eff98acdbdeadd4a05c7c81f90
+    --sha256: 64IWzs36fLSvf1Jb5z1ajeBppMooFynN2/lgjlu3ojo=
     subdir:
       io-sim
-      io-classes
+      io-classes

analysis/adversarial-quorum.svg

@@ -101,3 +101,11 @@ You may want to copy the latest example from `models.txt`, taking the whole set
 ## Known Shortcomings
 
 - functional but ugly
+
+## misc
+
+### converting from latencies.json of the Haskell simulation
+
+```sh
+jq -r '[.[]|.[1]]|sort|length as $l|[foreach .[] as $i (0;.+1;if .%100==0 or .==$l then "("+($i|tostring)+", "+(./$l|tostring)+")" else null end)|select(.)]|join(",")' latencies.json
+```

analysis/alba-size.svg

@@ -395,7 +395,7 @@ fn edit_expression(props: &EditExpressionProps) -> HtmlResult {
                 <pre>{ &*result }</pre>
             </div>
         } else {
-            <span class={classes!("dq_show")} onclick={cloned!(editing; move |_| editing.set(true))}>{ value.to_string() }</span>
+            <span class={classes!("dq_show")} onclick={cloned!(editing; move |_| editing.set(true))}>{ format!("{:#}", *value) }</span>
         }
     })
 }

analysis/alba-success.svg

@@ -62,7 +62,11 @@ impl Default for CDF {
 impl fmt::Display for CDF {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "CDF")?;
-        write!(f, "{}", self.steps)?;
+        if f.alternate() {
+            write!(f, "{:#}", self.steps)?;
+        } else {
+            write!(f, "{}", self.steps)?;
+        }
         Ok(())
     }
 }

analysis/committee_statistics-1000.svg

@@ -470,7 +470,11 @@ impl DeltaQ {
                 }
             }
             DeltaQExpr::Outcome(outcome) => {
-                write!(f, "{}", outcome)
+                if f.alternate() {
+                    write!(f, "{:#}", outcome)
+                } else {
+                    write!(f, "{}", outcome)
+                }
             }
             DeltaQExpr::Seq(first, load, second) => {
                 if parens {

analysis/committee_statistics-500.svg

@@ -160,9 +160,16 @@ impl Outcome {
 }
 impl Display for Outcome {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.cdf)?;
-        for (metric, load) in self.load.iter() {
-            write!(f, " WITH {metric}{load}")?;
+        if f.alternate() {
+            write!(f, "{:#}", self.cdf)?;
+            for (metric, load) in self.load.iter() {
+                write!(f, " WITH {metric}{load:#}")?;
+            }
+        } else {
+            write!(f, "{}", self.cdf)?;
+            for (metric, load) in self.load.iter() {
+                write!(f, " WITH {metric}{load}")?;
+            }
         }
         Ok(())
     }

analysis/committee_statistics-750.svg

@@ -196,7 +196,7 @@ pub fn cdf_component(props: &CdfProps) -> Html {
 
     html! {
         <div class={classes!("cdf", "anchor")} onclick={cloned!(popup; move |_| if !*popup { popup.set(true) })}>
-            { format!("{}", props.outcome) }
+            { format!("{:#}", props.outcome) }
             if *popup {
                 <div class={classes!("popup")}>
                     <button onclick={cloned!(popup; move |_| popup.set(false))}>{ "abort" }</button>

analysis/honest-quorum.svg

@@ -352,17 +352,26 @@ where
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut scratch = String::new();
 
+        let mut written = 1;
         write!(f, "[")?;
         for (i, (x, y)) in self.data().iter().enumerate() {
             if i > 0 {
                 write!(f, ", ")?;
+                written += 2;
             }
             write!(&mut scratch, "{:.5}", x)?;
             write!(f, "({}, ", trim(&scratch))?;
+            written += 3 + scratch.len();
             scratch.clear();
             y.pretty_print(&mut scratch)?;
             write!(f, "{})", trim(&scratch))?;
+            written += 1 + scratch.len();
             scratch.clear();
+
+            if f.alternate() && written > 80 {
+                write!(f, " ...")?;
+                break;
+            }
         }
         write!(f, "]")?;
         Ok(())

analysis/no-honest-quorum.svg

@@ -6,7 +6,7 @@ jq --unbuffered -rc 'select(.message.type=="TransactionGenerated") | (.message.i
     echo $id $t
     CDF=`(
       echo $t
-      jq -c 'select(.message|.type=="TransactionReceived" and .id=='$id') | {time,id:.message.id}' < "$1"
+      jq -c $id' as $id|select(.message|{type,id}|. == {type: "TransactionReceived", id: $id|tostring}) | {time,id:.message.id}' < "$1"
     ) | jq -srf convert.jq`
     if [ -z "$RET" ]; then
       RET="$CDF"