Merge branch 'justify_capstone_code' of github.com:software-tools-in-javascript/js4ds

Author: gvwilson

capstone.tex

@@ -86,12 +86,18 @@ \section{Data Manager}\label{s:capstone-data}
       return {
         key: toString(year),
         year: year,
-        min_hindfoot_length: subset.deflate(r => r.hindfoot_length).min(),
-        ave_hindfoot_length: subset.deflate(r => r.hindfoot_length).average(),
-        max_hindfoot_length: subset.deflate(r => r.hindfoot_length).max(),
-        min_weight: subset.deflate(r => r.weight).min(),
-        ave_weight: subset.deflate(r => r.weight).average(),
-        max_weight: subset.deflate(r => r.weight).max()
+        min_hindfoot_length: subset.deflate(r => r.hindfoot_length)
+                                   .min(),
+        ave_hindfoot_length: subset.deflate(r => r.hindfoot_length)
+                                   .average(),
+        max_hindfoot_length: subset.deflate(r => r.hindfoot_length)
+                                   .max(),
+        min_weight: subset.deflate(r => r.weight)
+                          .min(),
+        ave_weight: subset.deflate(r => r.weight)
+                          .average(),
+        max_weight: subset.deflate(r => r.weight)
+                          .max()
       }
     }
   })
@@ -116,18 +122,30 @@ \section{Data Manager}\label{s:capstone-data}
         return {
           key: toString(year),
           year: year,
-          min_hindfoot_length: subset.where(r => !isNaN(r.hindfoot_length))
-                                     .deflate(r => r.hindfoot_length).min(),
-          ave_hindfoot_length: subset.where(r => !isNaN(r.hindfoot_length))
-                                     .deflate(r => r.hindfoot_length).average(),
-          max_hindfoot_length: subset.where(r => !isNaN(r.hindfoot_length))
-                                     .deflate(r => r.hindfoot_length).max(),
-          min_weight: subset.where(r => !isNaN(r.weight))
-                            .deflate(r => r.weight).min(),
-          ave_weight: subset.where(r => !isNaN(r.weight))
-                            .deflate(r => r.weight).average(),
-          max_weight: subset.where(r => !isNaN(r.weight))
-                            .deflate(r => r.weight).max()
+          min_hindfoot_length: subset
+                               .where(r => !isNaN(r.hindfoot_length))
+                               .deflate(r => r.hindfoot_length)
+                               .min(),
+          ave_hindfoot_length: subset
+                               .where(r => !isNaN(r.hindfoot_length))
+                               .deflate(r => r.hindfoot_length)
+                               .average(),
+          max_hindfoot_length: subset
+                               .where(r => !isNaN(r.hindfoot_length))
+                               .deflate(r => r.hindfoot_length)
+                               .max(),
+          min_weight: subset
+                      .where(r => !isNaN(r.weight))
+                      .deflate(r => r.weight)
+                      .min(),
+          ave_weight: subset
+                      .where(r => !isNaN(r.weight))
+                      .deflate(r => r.weight)
+                      .average(),
+          max_weight: subset
+                      .where(r => !isNaN(r.weight))
+                      .deflate(r => r.weight)
+                      .max()
         }
       }
 // ...as before...