First pass.

- Still need to fix rendering of some equations and, - add figures
wyjustin · Aug 5, 2015 · 012bdb0 · 012bdb0
1 parent 2f5e338
commit 012bdb0
Show file tree

Hide file tree

Showing 207 changed files with 1,410 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,8 @@ tex/modeller-images
 tex/modeller.markdown
 tex/objmodel-images
 tex/objmodel.markdown
+tex/pedometer-images
+tex/pedometer.markdown
 tex/sample-images
 tex/sample.markdown
 tex/sampler-images

diff --git a/build.py b/build.py
@@ -14,11 +14,11 @@ def main(chapters=[], epub=False, pdf=False, html=False, mobi=False, pandoc_epub
             run('rm {}'.format(f))
 
     chapter_dirs = [
+        'pedometer',
         'sampler',
         'spreadsheet',
         'cluster',
         'data-store',
-        'sample',
         'objmodel',
         'ci',
         'crawler',
@@ -59,11 +59,11 @@ def main(chapters=[], epub=False, pdf=False, html=False, mobi=False, pandoc_epub
     ]
 
     image_paths = [
+        './pedometer/pedometer-images',
         './sampler/sampler-images',
         './spreadsheet/spreadsheet-images',
         './cluster/cluster-images',
         './data-store/data-store-images',
-        './sample/sample-images',
         './objmodel/objmodel-images',
         './ci/ci-images',
         './crawler/crawler-images',

diff --git a/pedometer/README.md b/pedometer/README.md
@@ -19,8 +19,8 @@ Prerequisites
 
 Running the App
 =============
-* This app uses Sinatra. Start the web server by running **ruby pedometer.rb** from the **pedometer** directory. 
+* This app uses Sinatra. Start the web server by running **ruby pedometer.rb** from the **pedometer/code** directory. 
 * Navigate to **localhost:4567/uploads**. 
 * You'll see a few example uploads. Both of these uploads are from the same walk, but the first parses data in format 1 above (combined acceleration), and the second parses data in format 2 (user acceleration and gravitational acceleration). 
 * The form on the right allows you to upload a data set, parse it, and save it to the file system. 
-* Clicking on the **Detail** link shows more information, as well as the first 1000 points in the data series produced at the two main stages of the step count calculation. 
+* Clicking on the **Detail** link shows more information, as well as the first 1000 points in the data series produced at the two main stages of the step count calculation. 
diff --git a/pedometer/Gemfile → pedometer/code/Gemfile b/pedometer/Gemfile → pedometer/code/Gemfile
diff --git a/pedometer/Gemfile.lock → pedometer/code/Gemfile.lock b/pedometer/Gemfile.lock → pedometer/code/Gemfile.lock
diff --git a/pedometer/Rakefile → pedometer/code/Rakefile b/pedometer/Rakefile → pedometer/code/Rakefile
diff --git a/pedometer/helpers/view_helper.rb → pedometer/code/helpers/view_helper.rb b/pedometer/helpers/view_helper.rb → pedometer/code/helpers/view_helper.rb
diff --git a/pedometer/models/analyzer.rb → pedometer/code/models/analyzer.rb b/pedometer/models/analyzer.rb → pedometer/code/models/analyzer.rb
diff --git a/pedometer/models/filter.rb → pedometer/code/models/filter.rb b/pedometer/models/filter.rb → pedometer/code/models/filter.rb
diff --git a/pedometer/models/parser.rb → pedometer/code/models/parser.rb b/pedometer/models/parser.rb → pedometer/code/models/parser.rb
diff --git a/pedometer/models/pipeline.rb → pedometer/code/models/pipeline.rb b/pedometer/models/pipeline.rb → pedometer/code/models/pipeline.rb
diff --git a/pedometer/models/processor.rb → pedometer/code/models/processor.rb b/pedometer/models/processor.rb → pedometer/code/models/processor.rb
diff --git a/pedometer/models/trial.rb → pedometer/code/models/trial.rb b/pedometer/models/trial.rb → pedometer/code/models/trial.rb
diff --git a/pedometer/models/upload.rb → pedometer/code/models/upload.rb b/pedometer/models/upload.rb → pedometer/code/models/upload.rb
diff --git a/pedometer/models/user.rb → pedometer/code/models/user.rb b/pedometer/models/user.rb → pedometer/code/models/user.rb
diff --git a/pedometer/pedometer.rb → pedometer/code/pedometer.rb b/pedometer/pedometer.rb → pedometer/code/pedometer.rb
diff --git a/pedometer/public/highcharts.js → pedometer/code/public/highcharts.js b/pedometer/public/highcharts.js → pedometer/code/public/highcharts.js
diff --git a/pedometer/public/jquery.min.js → pedometer/code/public/jquery.min.js b/pedometer/public/jquery.min.js → pedometer/code/public/jquery.min.js
diff --git a/pedometer/public/styles.css → pedometer/code/public/styles.css b/pedometer/public/styles.css → pedometer/code/public/styles.css
diff --git a/...male-168.0-70.0_Walk1Combined-100-300.txt → ...male-168.0-70.0_Walk1Combined-100-300.txt b/...male-168.0-70.0_Walk1Combined-100-300.txt → ...male-168.0-70.0_Walk1Combined-100-300.txt
diff --git a/...ale-168.0-70.0_Walk1Separated-100-300.txt → ...ale-168.0-70.0_Walk1Separated-100-300.txt b/...ale-168.0-70.0_Walk1Separated-100-300.txt → ...ale-168.0-70.0_Walk1Separated-100-300.txt
diff --git a/...male-168.0-70.0_Walk2Combined-100-100.txt → ...male-168.0-70.0_Walk2Combined-100-100.txt b/...male-168.0-70.0_Walk2Combined-100-100.txt → ...male-168.0-70.0_Walk2Combined-100-100.txt
diff --git a/...ale-168.0-70.0_Walk2Separated-100-100.txt → ...ale-168.0-70.0_Walk2Separated-100-100.txt b/...ale-168.0-70.0_Walk2Separated-100-100.txt → ...ale-168.0-70.0_Walk2Separated-100-100.txt
diff --git a/...st/data/female-167-70_bagwalk1-100-10.txt → ...st/data/female-167-70_bagwalk1-100-10.txt b/...st/data/female-167-70_bagwalk1-100-10.txt → ...st/data/female-167-70_bagwalk1-100-10.txt
diff --git a/...st/data/female-167-70_bagwalk2-100-10.txt → ...st/data/female-167-70_bagwalk2-100-10.txt b/...st/data/female-167-70_bagwalk2-100-10.txt → ...st/data/female-167-70_bagwalk2-100-10.txt
diff --git a/...st/data/female-167-70_bagwalk3-100-10.txt → ...st/data/female-167-70_bagwalk3-100-10.txt b/...st/data/female-167-70_bagwalk3-100-10.txt → ...st/data/female-167-70_bagwalk3-100-10.txt
diff --git a/...st/data/female-167-70_bagwalk4-100-10.txt → ...st/data/female-167-70_bagwalk4-100-10.txt b/...st/data/female-167-70_bagwalk4-100-10.txt → ...st/data/female-167-70_bagwalk4-100-10.txt
diff --git a/...r/test/data/female-167-70_run1-100-10.txt → ...e/test/data/female-167-70_run1-100-10.txt b/...r/test/data/female-167-70_run1-100-10.txt → ...e/test/data/female-167-70_run1-100-10.txt
diff --git a/...r/test/data/female-167-70_run2-100-10.txt → ...e/test/data/female-167-70_run2-100-10.txt b/...r/test/data/female-167-70_run2-100-10.txt → ...e/test/data/female-167-70_run2-100-10.txt
diff --git a/...r/test/data/female-167-70_run3-100-10.txt → ...e/test/data/female-167-70_run3-100-10.txt b/...r/test/data/female-167-70_run3-100-10.txt → ...e/test/data/female-167-70_run3-100-10.txt
diff --git a/...r/test/data/female-167-70_run4-100-10.txt → ...e/test/data/female-167-70_run4-100-10.txt b/...r/test/data/female-167-70_run4-100-10.txt → ...e/test/data/female-167-70_run4-100-10.txt
diff --git a/.../test/data/female-167-70_walk1-100-10.txt → .../test/data/female-167-70_walk1-100-10.txt b/.../test/data/female-167-70_walk1-100-10.txt → .../test/data/female-167-70_walk1-100-10.txt
diff --git a/.../test/data/female-167-70_walk2-100-10.txt → .../test/data/female-167-70_walk2-100-10.txt b/.../test/data/female-167-70_walk2-100-10.txt → .../test/data/female-167-70_walk2-100-10.txt
diff --git a/.../test/data/female-167-70_walk3-100-10.txt → .../test/data/female-167-70_walk3-100-10.txt b/.../test/data/female-167-70_walk3-100-10.txt → .../test/data/female-167-70_walk3-100-10.txt
diff --git a/.../test/data/female-167-70_walk4-100-10.txt → .../test/data/female-167-70_walk4-100-10.txt b/.../test/data/female-167-70_walk4-100-10.txt → .../test/data/female-167-70_walk4-100-10.txt
diff --git a/...test/data/male-180-78_bagwalk1-100-10.txt → ...test/data/male-180-78_bagwalk1-100-10.txt b/...test/data/male-180-78_bagwalk1-100-10.txt → ...test/data/male-180-78_bagwalk1-100-10.txt
diff --git a/...test/data/male-180-78_bagwalk2-100-10.txt → ...test/data/male-180-78_bagwalk2-100-10.txt b/...test/data/male-180-78_bagwalk2-100-10.txt → ...test/data/male-180-78_bagwalk2-100-10.txt
diff --git a/...test/data/male-180-78_bagwalk3-100-10.txt → ...test/data/male-180-78_bagwalk3-100-10.txt b/...test/data/male-180-78_bagwalk3-100-10.txt → ...test/data/male-180-78_bagwalk3-100-10.txt
diff --git a/...ter/test/data/male-180-78_run1-100-10.txt → ...ode/test/data/male-180-78_run1-100-10.txt b/...ter/test/data/male-180-78_run1-100-10.txt → ...ode/test/data/male-180-78_run1-100-10.txt
diff --git a/...ter/test/data/male-180-78_run2-100-10.txt → ...ode/test/data/male-180-78_run2-100-10.txt b/...ter/test/data/male-180-78_run2-100-10.txt → ...ode/test/data/male-180-78_run2-100-10.txt
diff --git a/...ter/test/data/male-180-78_run3-100-10.txt → ...ode/test/data/male-180-78_run3-100-10.txt b/...ter/test/data/male-180-78_run3-100-10.txt → ...ode/test/data/male-180-78_run3-100-10.txt
diff --git a/...ter/test/data/male-180-78_run4-100-10.txt → ...ode/test/data/male-180-78_run4-100-10.txt b/...ter/test/data/male-180-78_run4-100-10.txt → ...ode/test/data/male-180-78_run4-100-10.txt
diff --git a/...er/test/data/male-180-78_walk1-100-10.txt → ...de/test/data/male-180-78_walk1-100-10.txt b/...er/test/data/male-180-78_walk1-100-10.txt → ...de/test/data/male-180-78_walk1-100-10.txt
diff --git a/...er/test/data/male-180-78_walk2-100-10.txt → ...de/test/data/male-180-78_walk2-100-10.txt b/...er/test/data/male-180-78_walk2-100-10.txt → ...de/test/data/male-180-78_walk2-100-10.txt
diff --git a/...er/test/data/male-180-78_walk3-100-10.txt → ...de/test/data/male-180-78_walk3-100-10.txt b/...er/test/data/male-180-78_walk3-100-10.txt → ...de/test/data/male-180-78_walk3-100-10.txt
diff --git a/...er/test/data/male-180-78_walk4-100-10.txt → ...de/test/data/male-180-78_walk4-100-10.txt b/...er/test/data/male-180-78_walk4-100-10.txt → ...de/test/data/male-180-78_walk4-100-10.txt
diff --git a/pedometer/test/data/upload-1.txt → pedometer/code/test/data/upload-1.txt b/pedometer/test/data/upload-1.txt → pedometer/code/test/data/upload-1.txt
diff --git a/...test/integration/live_data_female_test.rb → ...test/integration/live_data_female_test.rb b/...test/integration/live_data_female_test.rb → ...test/integration/live_data_female_test.rb
diff --git a/...r/test/integration/live_data_male_test.rb → ...e/test/integration/live_data_male_test.rb b/...r/test/integration/live_data_male_test.rb → ...e/test/integration/live_data_male_test.rb
diff --git a/pedometer/test/integration/pedometer_test.rb → ...r/code/test/integration/pedometer_test.rb b/pedometer/test/integration/pedometer_test.rb → ...r/code/test/integration/pedometer_test.rb
diff --git a/pedometer/test/unit/analyzer_test.rb → pedometer/code/test/unit/analyzer_test.rb b/pedometer/test/unit/analyzer_test.rb → pedometer/code/test/unit/analyzer_test.rb
diff --git a/pedometer/test/unit/filter_test.rb → pedometer/code/test/unit/filter_test.rb b/pedometer/test/unit/filter_test.rb → pedometer/code/test/unit/filter_test.rb
diff --git a/pedometer/test/unit/parser_test.rb → pedometer/code/test/unit/parser_test.rb b/pedometer/test/unit/parser_test.rb → pedometer/code/test/unit/parser_test.rb
diff --git a/pedometer/test/unit/pipeline_test.rb → pedometer/code/test/unit/pipeline_test.rb b/pedometer/test/unit/pipeline_test.rb → pedometer/code/test/unit/pipeline_test.rb
diff --git a/pedometer/test/unit/processor_test.rb → pedometer/code/test/unit/processor_test.rb b/pedometer/test/unit/processor_test.rb → pedometer/code/test/unit/processor_test.rb
diff --git a/pedometer/test/unit/trial_test.rb → pedometer/code/test/unit/trial_test.rb b/pedometer/test/unit/trial_test.rb → pedometer/code/test/unit/trial_test.rb
diff --git a/pedometer/test/unit/upload_test.rb → pedometer/code/test/unit/upload_test.rb b/pedometer/test/unit/upload_test.rb → pedometer/code/test/unit/upload_test.rb
diff --git a/pedometer/test/unit/user_test.rb → pedometer/code/test/unit/user_test.rb b/pedometer/test/unit/user_test.rb → pedometer/code/test/unit/user_test.rb
diff --git a/pedometer/test/unit/view_helper_test.rb → pedometer/code/test/unit/view_helper_test.rb b/pedometer/test/unit/view_helper_test.rb → pedometer/code/test/unit/view_helper_test.rb
diff --git a/pedometer/views/summary.erb → pedometer/code/views/summary.erb b/pedometer/views/summary.erb → pedometer/code/views/summary.erb
diff --git a/pedometer/views/upload.erb → pedometer/code/views/upload.erb b/pedometer/views/upload.erb → pedometer/code/views/upload.erb
diff --git a/pedometer/views/uploads.erb → pedometer/code/views/uploads.erb b/pedometer/views/uploads.erb → pedometer/code/views/uploads.erb
diff --git a/...figures/acceleration-dotproduct-jumpy.png → ...-images/acceleration-dotproduct-jumpy.png b/...figures/acceleration-dotproduct-jumpy.png → ...-images/acceleration-dotproduct-jumpy.png
diff --git a/...gures/acceleration-dotproduct-lowpass.png → ...mages/acceleration-dotproduct-lowpass.png b/...gures/acceleration-dotproduct-lowpass.png → ...mages/acceleration-dotproduct-lowpass.png
diff --git a/...apter-figures/acceleration-dotproduct.png → ...ometer-images/acceleration-dotproduct.png b/...apter-figures/acceleration-dotproduct.png → ...ometer-images/acceleration-dotproduct.png
diff --git a/...gures/acceleration-filtered-threshold.png → ...mages/acceleration-filtered-threshold.png b/...gures/acceleration-filtered-threshold.png → ...mages/acceleration-filtered-threshold.png
diff --git a/...chapter-figures/acceleration-filtered.png → ...edometer-images/acceleration-filtered.png b/...chapter-figures/acceleration-filtered.png → ...edometer-images/acceleration-filtered.png
diff --git a/...ures/acceleration-gravitational-small.png → ...ages/acceleration-gravitational-small.png b/...ures/acceleration-gravitational-small.png → ...ages/acceleration-gravitational-small.png
diff --git a/...er-figures/acceleration-gravitational.png → ...ter-images/acceleration-gravitational.png b/...er-figures/acceleration-gravitational.png → ...ter-images/acceleration-gravitational.png
diff --git a/...igures/acceleration-total-phone-still.png → ...images/acceleration-total-phone-still.png b/...igures/acceleration-total-phone-still.png → ...images/acceleration-total-phone-still.png
diff --git a/...pter-figures/acceleration-total-small.png → ...meter-images/acceleration-total-small.png b/...pter-figures/acceleration-total-small.png → ...meter-images/acceleration-total-small.png
diff --git a/...er/chapter-figures/acceleration-total.png → ...r/pedometer-images/acceleration-total.png b/...er/chapter-figures/acceleration-total.png → ...r/pedometer-images/acceleration-total.png
diff --git a/...apter-figures/acceleration-user-small.png → ...ometer-images/acceleration-user-small.png b/...apter-figures/acceleration-user-small.png → ...ometer-images/acceleration-user-small.png
diff --git a/...ter-figures/acceleration-user-y-small.png → ...eter-images/acceleration-user-y-small.png b/...ter-figures/acceleration-user-y-small.png → ...eter-images/acceleration-user-y-small.png
diff --git a/...ter/chapter-figures/acceleration-user.png → ...er/pedometer-images/acceleration-user.png b/...ter/chapter-figures/acceleration-user.png → ...er/pedometer-images/acceleration-user.png
diff --git a/...eter/chapter-figures/amplitude-period.png → ...ter/pedometer-images/amplitude-period.png b/...eter/chapter-figures/amplitude-period.png → ...ter/pedometer-images/amplitude-period.png
diff --git a/pedometer/chapter-figures/app-flow-2.png → pedometer/pedometer-images/app-flow-2.png b/pedometer/chapter-figures/app-flow-2.png → pedometer/pedometer-images/app-flow-2.png
diff --git a/pedometer/chapter-figures/app1.png → pedometer/pedometer-images/app1.png b/pedometer/chapter-figures/app1.png → pedometer/pedometer-images/app1.png
diff --git a/...ter/chapter-figures/app2-full-browser.png → ...er/pedometer-images/app2-full-browser.png b/...ter/chapter-figures/app2-full-browser.png → ...er/pedometer-images/app2-full-browser.png
diff --git a/pedometer/chapter-figures/app2.png → pedometer/pedometer-images/app2.png b/pedometer/chapter-figures/app2.png → pedometer/pedometer-images/app2.png
diff --git a/...ter/chapter-figures/app3-full-browser.png → ...er/pedometer-images/app3-full-browser.png b/...ter/chapter-figures/app3-full-browser.png → ...er/pedometer-images/app3-full-browser.png
diff --git a/pedometer/chapter-figures/app3.png → pedometer/pedometer-images/app3.png b/pedometer/chapter-figures/app3.png → pedometer/pedometer-images/app3.png
diff --git a/pedometer/chapter-figures/app4.png → pedometer/pedometer-images/app4.png b/pedometer/chapter-figures/app4.png → pedometer/pedometer-images/app4.png
diff --git a/pedometer/chapter-figures/app5.png → pedometer/pedometer-images/app5.png b/pedometer/chapter-figures/app5.png → pedometer/pedometer-images/app5.png
diff --git a/...eter/chapter-figures/bumpy-peak-fixed.png → ...ter/pedometer-images/bumpy-peak-fixed.png b/...eter/chapter-figures/bumpy-peak-fixed.png → ...ter/pedometer-images/bumpy-peak-fixed.png
diff --git a/pedometer/chapter-figures/bumpy-peak.png → pedometer/pedometer-images/bumpy-peak.png b/pedometer/chapter-figures/bumpy-peak.png → pedometer/pedometer-images/bumpy-peak.png
diff --git a/...r/chapter-figures/component-signals-1.png → .../pedometer-images/component-signals-1.png b/...r/chapter-figures/component-signals-1.png → .../pedometer-images/component-signals-1.png
diff --git a/...r/chapter-figures/component-signals-2.png → .../pedometer-images/component-signals-2.png b/...r/chapter-figures/component-signals-2.png → .../pedometer-images/component-signals-2.png
diff --git a/...r/chapter-figures/component-signals-3.png → .../pedometer-images/component-signals-3.png b/...r/chapter-figures/component-signals-3.png → .../pedometer-images/component-signals-3.png
diff --git a/...eter/chapter-figures/dot-product-code.png → ...ter/pedometer-images/dot-product-code.png b/...eter/chapter-figures/dot-product-code.png → ...ter/pedometer-images/dot-product-code.png
diff --git a/...apter-figures/dot-product-explanation.png → ...ometer-images/dot-product-explanation.png b/...apter-figures/dot-product-explanation.png → ...ometer-images/dot-product-explanation.png
diff --git a/...es/figure-combined-total-acceleration.png → ...es/figure-combined-total-acceleration.png b/...es/figure-combined-total-acceleration.png → ...es/figure-combined-total-acceleration.png
diff --git a/...gures/figure-dot-product-example-step.png → ...mages/figure-dot-product-example-step.png b/...gures/figure-dot-product-example-step.png → ...mages/figure-dot-product-example-step.png
diff --git a/...er-figures/figure-dot-product-example.png → ...ter-images/figure-dot-product-example.png b/...er-figures/figure-dot-product-example.png → ...ter-images/figure-dot-product-example.png
diff --git a/...r-figures/figure-filter-gravitational.png → ...er-images/figure-filter-gravitational.png b/...r-figures/figure-filter-gravitational.png → ...er-images/figure-filter-gravitational.png
diff --git a/...r/chapter-figures/figure-filter-total.png → .../pedometer-images/figure-filter-total.png b/...r/chapter-figures/figure-filter-total.png → .../pedometer-images/figure-filter-total.png
diff --git a/...er/chapter-figures/figure-filter-user.png → ...r/pedometer-images/figure-filter-user.png b/...er/chapter-figures/figure-filter-user.png → ...r/pedometer-images/figure-filter-user.png
diff --git a/...ures/figure-filtered-smooth-threshold.png → ...ages/figure-filtered-smooth-threshold.png b/...ures/figure-filtered-smooth-threshold.png → ...ages/figure-filtered-smooth-threshold.png
diff --git a/...hapter-figures/figure-filtered-smooth.png → ...dometer-images/figure-filtered-smooth.png b/...hapter-figures/figure-filtered-smooth.png → ...dometer-images/figure-filtered-smooth.png
diff --git a/...r-figures/figure-iphone-accelerometer.png → ...er-images/figure-iphone-accelerometer.png b/...r-figures/figure-iphone-accelerometer.png → ...er-images/figure-iphone-accelerometer.png
diff --git a/...-separated-gravitational-acceleration.png → ...-separated-gravitational-acceleration.png b/...-separated-gravitational-acceleration.png → ...-separated-gravitational-acceleration.png
diff --git a/...es/figure-separated-user-acceleration.png → ...es/figure-separated-user-acceleration.png b/...es/figure-separated-user-acceleration.png → ...es/figure-separated-user-acceleration.png
diff --git a/...er/chapter-figures/figure-sine-wave-1.png → ...r/pedometer-images/figure-sine-wave-1.png b/...er/chapter-figures/figure-sine-wave-1.png → ...r/pedometer-images/figure-sine-wave-1.png
diff --git a/...er/chapter-figures/figure-sine-wave-2.png → ...r/pedometer-images/figure-sine-wave-2.png b/...er/chapter-figures/figure-sine-wave-2.png → ...r/pedometer-images/figure-sine-wave-2.png
diff --git a/...er/chapter-figures/figure-sine-wave-3.png → ...r/pedometer-images/figure-sine-wave-3.png b/...er/chapter-figures/figure-sine-wave-3.png → ...r/pedometer-images/figure-sine-wave-3.png
diff --git a/...er/chapter-figures/figure-sine-wave-4.png → ...r/pedometer-images/figure-sine-wave-4.png b/...er/chapter-figures/figure-sine-wave-4.png → ...r/pedometer-images/figure-sine-wave-4.png
diff --git a/...ter/chapter-figures/figure-split_accl.png → ...er/pedometer-images/figure-split_accl.png b/...ter/chapter-figures/figure-split_accl.png → ...er/pedometer-images/figure-split_accl.png
diff --git a/...gures/graffles/9-signals-filtered.graffle → ...mages/graffles/9-signals-filtered.graffle b/...gures/graffles/9-signals-filtered.graffle → ...mages/graffles/9-signals-filtered.graffle
diff --git a/...es/graffles/app-flow-2.graffle/data.plist → ...es/graffles/app-flow-2.graffle/data.plist b/...es/graffles/app-flow-2.graffle/data.plist → ...es/graffles/app-flow-2.graffle/data.plist
diff --git a/...s/graffles/app-flow-2.graffle/image14.png → ...s/graffles/app-flow-2.graffle/image14.png b/...s/graffles/app-flow-2.graffle/image14.png → ...s/graffles/app-flow-2.graffle/image14.png
diff --git a/...s/graffles/app-flow-2.graffle/image16.png → ...s/graffles/app-flow-2.graffle/image16.png b/...s/graffles/app-flow-2.graffle/image16.png → ...s/graffles/app-flow-2.graffle/image16.png
diff --git a/...ures/graffles/app-flow.graffle/data.plist → ...ages/graffles/app-flow.graffle/data.plist b/...ures/graffles/app-flow.graffle/data.plist → ...ages/graffles/app-flow.graffle/data.plist
diff --git a/...res/graffles/app-flow.graffle/image10.png → ...ges/graffles/app-flow.graffle/image10.png b/...res/graffles/app-flow.graffle/image10.png → ...ges/graffles/app-flow.graffle/image10.png
diff --git a/...res/graffles/app-flow.graffle/image12.png → ...ges/graffles/app-flow.graffle/image12.png b/...res/graffles/app-flow.graffle/image12.png → ...ges/graffles/app-flow.graffle/image12.png
diff --git a/...res/graffles/app-flow.graffle/image13.png → ...ges/graffles/app-flow.graffle/image13.png b/...res/graffles/app-flow.graffle/image13.png → ...ges/graffles/app-flow.graffle/image13.png
diff --git a/...ures/graffles/app-flow.graffle/image7.png → ...ages/graffles/app-flow.graffle/image7.png b/...ures/graffles/app-flow.graffle/image7.png → ...ages/graffles/app-flow.graffle/image7.png
diff --git a/...ures/graffles/app-flow.graffle/image8.png → ...ages/graffles/app-flow.graffle/image8.png b/...ures/graffles/app-flow.graffle/image8.png → ...ages/graffles/app-flow.graffle/image8.png
diff --git a/...hapter-figures/graffles/app1-original.png → ...dometer-images/graffles/app1-original.png b/...hapter-figures/graffles/app1-original.png → ...dometer-images/graffles/app1-original.png
diff --git a/pedometer/chapter-figures/graffles/app1.png → pedometer/pedometer-images/graffles/app1.png b/pedometer/chapter-figures/graffles/app1.png → pedometer/pedometer-images/graffles/app1.png
diff --git a/...hapter-figures/graffles/app2-original.png → ...dometer-images/graffles/app2-original.png b/...hapter-figures/graffles/app2-original.png → ...dometer-images/graffles/app2-original.png
diff --git a/pedometer/chapter-figures/graffles/app2.png → pedometer/pedometer-images/graffles/app2.png b/pedometer/chapter-figures/graffles/app2.png → pedometer/pedometer-images/graffles/app2.png
diff --git a/pedometer/chapter-figures/graffles/app3.png → pedometer/pedometer-images/graffles/app3.png b/pedometer/chapter-figures/graffles/app3.png → pedometer/pedometer-images/graffles/app3.png
diff --git a/...hapter-figures/graffles/app4-original.png → ...dometer-images/graffles/app4-original.png b/...hapter-figures/graffles/app4-original.png → ...dometer-images/graffles/app4-original.png
diff --git a/pedometer/chapter-figures/graffles/app4.png → pedometer/pedometer-images/graffles/app4.png b/pedometer/chapter-figures/graffles/app4.png → pedometer/pedometer-images/graffles/app4.png
diff --git a/...hapter-figures/graffles/app5-original.png → ...dometer-images/graffles/app5-original.png b/...hapter-figures/graffles/app5-original.png → ...dometer-images/graffles/app5-original.png
diff --git a/pedometer/chapter-figures/graffles/app5.png → pedometer/pedometer-images/graffles/app5.png b/pedometer/chapter-figures/graffles/app5.png → pedometer/pedometer-images/graffles/app5.png
diff --git a/...es/component-signals-1.graffle/data.plist → ...es/component-signals-1.graffle/data.plist b/...es/component-signals-1.graffle/data.plist → ...es/component-signals-1.graffle/data.plist
diff --git a/...s/component-signals-1.graffle/image5.tiff → ...s/component-signals-1.graffle/image5.tiff b/...s/component-signals-1.graffle/image5.tiff → ...s/component-signals-1.graffle/image5.tiff
diff --git a/...s/component-signals-1.graffle/image7.tiff → ...s/component-signals-1.graffle/image7.tiff b/...s/component-signals-1.graffle/image7.tiff → ...s/component-signals-1.graffle/image7.tiff
diff --git a/...s/component-signals-1.graffle/image8.tiff → ...s/component-signals-1.graffle/image8.tiff b/...s/component-signals-1.graffle/image8.tiff → ...s/component-signals-1.graffle/image8.tiff
diff --git a/...res/graffles/component-signals-1a.graffle → ...ges/graffles/component-signals-1a.graffle b/...res/graffles/component-signals-1a.graffle → ...ges/graffles/component-signals-1a.graffle
diff --git a/...es/component-signals-2.graffle/data.plist → ...es/component-signals-2.graffle/data.plist b/...es/component-signals-2.graffle/data.plist → ...es/component-signals-2.graffle/data.plist
diff --git a/.../component-signals-2.graffle/image10.tiff → .../component-signals-2.graffle/image10.tiff b/.../component-signals-2.graffle/image10.tiff → .../component-signals-2.graffle/image10.tiff
diff --git a/...s/component-signals-2.graffle/image5.tiff → ...s/component-signals-2.graffle/image5.tiff b/...s/component-signals-2.graffle/image5.tiff → ...s/component-signals-2.graffle/image5.tiff
diff --git a/...s/component-signals-2.graffle/image8.tiff → ...s/component-signals-2.graffle/image8.tiff b/...s/component-signals-2.graffle/image8.tiff → ...s/component-signals-2.graffle/image8.tiff
diff --git a/...s/component-signals-2.graffle/image9.tiff → ...s/component-signals-2.graffle/image9.tiff b/...s/component-signals-2.graffle/image9.tiff → ...s/component-signals-2.graffle/image9.tiff
diff --git a/...res/graffles/component-signals-2a.graffle → ...ges/graffles/component-signals-2a.graffle b/...res/graffles/component-signals-2a.graffle → ...ges/graffles/component-signals-2a.graffle
diff --git a/...ures/graffles/component-signals-3.graffle → ...ages/graffles/component-signals-3.graffle b/...ures/graffles/component-signals-3.graffle → ...ages/graffles/component-signals-3.graffle
diff --git a/...res/graffles/component-signals-3a.graffle → ...ges/graffles/component-signals-3a.graffle b/...res/graffles/component-signals-3a.graffle → ...ges/graffles/component-signals-3a.graffle
diff --git a/...ures/graffles/component-signals-4.graffle → ...ages/graffles/component-signals-4.graffle b/...ures/graffles/component-signals-4.graffle → ...ages/graffles/component-signals-4.graffle
diff --git a/...ffles/dot-product-code.graffle/data.plist → ...ffles/dot-product-code.graffle/data.plist b/...ffles/dot-product-code.graffle/data.plist → ...ffles/dot-product-code.graffle/data.plist
diff --git a/...fles/dot-product-code.graffle/image3.tiff → ...fles/dot-product-code.graffle/image3.tiff b/...fles/dot-product-code.graffle/image3.tiff → ...fles/dot-product-code.graffle/image3.tiff
diff --git a/...fles/dot-product-code.graffle/image5.tiff → ...fles/dot-product-code.graffle/image5.tiff b/...fles/dot-product-code.graffle/image5.tiff → ...fles/dot-product-code.graffle/image5.tiff
diff --git a/...ot-product-explanation.graffle/data.plist → ...ot-product-explanation.graffle/data.plist b/...ot-product-explanation.graffle/data.plist → ...ot-product-explanation.graffle/data.plist
diff --git a/...t-product-explanation.graffle/image1.tiff → ...t-product-explanation.graffle/image1.tiff b/...t-product-explanation.graffle/image1.tiff → ...t-product-explanation.graffle/image1.tiff
diff --git a/...pter-figures/graffles/dot-product.graffle → ...meter-images/graffles/dot-product.graffle b/...pter-figures/graffles/dot-product.graffle → ...meter-images/graffles/dot-product.graffle
diff --git a/...t-product-example-step.graffle/data.plist → ...t-product-example-step.graffle/data.plist b/...t-product-example-step.graffle/data.plist → ...t-product-example-step.graffle/data.plist
diff --git a/...t-product-example-step.graffle/image1.png → ...t-product-example-step.graffle/image1.png b/...t-product-example-step.graffle/image1.png → ...t-product-example-step.graffle/image1.png
diff --git a/...igures/graffles/figure-split_accl.graffle → ...images/graffles/figure-split_accl.graffle b/...igures/graffles/figure-split_accl.graffle → ...images/graffles/figure-split_accl.graffle
diff --git a/...es/graffles/input-data-workflow-1.graffle → ...es/graffles/input-data-workflow-1.graffle b/...es/graffles/input-data-workflow-1.graffle → ...es/graffles/input-data-workflow-1.graffle
diff --git a/.../input-data-workflow-2.graffle/data.plist → .../input-data-workflow-2.graffle/data.plist b/.../input-data-workflow-2.graffle/data.plist → .../input-data-workflow-2.graffle/data.plist
diff --git a/...input-data-workflow-2.graffle/image7.tiff → ...input-data-workflow-2.graffle/image7.tiff b/...input-data-workflow-2.graffle/image7.tiff → ...input-data-workflow-2.graffle/image7.tiff
diff --git a/...input-data-workflow-2.graffle/image9.tiff → ...input-data-workflow-2.graffle/image9.tiff b/...input-data-workflow-2.graffle/image9.tiff → ...input-data-workflow-2.graffle/image9.tiff
diff --git a/...es/input-data-workflow.graffle/data.plist → ...es/input-data-workflow.graffle/data.plist b/...es/input-data-workflow.graffle/data.plist → ...es/input-data-workflow.graffle/data.plist
diff --git a/...s/input-data-workflow.graffle/image7.tiff → ...s/input-data-workflow.graffle/image7.tiff b/...s/input-data-workflow.graffle/image7.tiff → ...s/input-data-workflow.graffle/image7.tiff
diff --git a/...s/input-data-workflow.graffle/image9.tiff → ...s/input-data-workflow.graffle/image9.tiff b/...s/input-data-workflow.graffle/image9.tiff → ...s/input-data-workflow.graffle/image9.tiff
diff --git a/...input-format-to-standard-format-1.graffle → ...input-format-to-standard-format-1.graffle b/...input-format-to-standard-format-1.graffle → ...input-format-to-standard-format-1.graffle
diff --git a/...input-format-to-standard-format-2.graffle → ...input-format-to-standard-format-2.graffle b/...input-format-to-standard-format-2.graffle → ...input-format-to-standard-format-2.graffle
diff --git a/...s/input-format-to-standard-format.graffle → ...s/input-format-to-standard-format.graffle b/...s/input-format-to-standard-format.graffle → ...s/input-format-to-standard-format.graffle
diff --git a/...hapter-figures/graffles/iphone-tilted.png → ...dometer-images/graffles/iphone-tilted.png b/...hapter-figures/graffles/iphone-tilted.png → ...dometer-images/graffles/iphone-tilted.png
diff --git a/...meter/chapter-figures/graffles/iphone.png → ...eter/pedometer-images/graffles/iphone.png b/...meter/chapter-figures/graffles/iphone.png → ...eter/pedometer-images/graffles/iphone.png
diff --git a/...jumpy-slow-short-bumpy.graffle/data.plist → ...jumpy-slow-short-bumpy.graffle/data.plist b/...jumpy-slow-short-bumpy.graffle/data.plist → ...jumpy-slow-short-bumpy.graffle/data.plist
diff --git a/...mpy-slow-short-bumpy.graffle/image11.tiff → ...mpy-slow-short-bumpy.graffle/image11.tiff b/...mpy-slow-short-bumpy.graffle/image11.tiff → ...mpy-slow-short-bumpy.graffle/image11.tiff
diff --git a/...mpy-slow-short-bumpy.graffle/image13.tiff → ...mpy-slow-short-bumpy.graffle/image13.tiff b/...mpy-slow-short-bumpy.graffle/image13.tiff → ...mpy-slow-short-bumpy.graffle/image13.tiff
diff --git a/...mpy-slow-short-bumpy.graffle/image14.tiff → ...mpy-slow-short-bumpy.graffle/image14.tiff b/...mpy-slow-short-bumpy.graffle/image14.tiff → ...mpy-slow-short-bumpy.graffle/image14.tiff
diff --git a/...mpy-slow-short-bumpy.graffle/image16.tiff → ...mpy-slow-short-bumpy.graffle/image16.tiff b/...mpy-slow-short-bumpy.graffle/image16.tiff → ...mpy-slow-short-bumpy.graffle/image16.tiff
diff --git a/...igures/graffles/low-pass-filter-a.graffle → ...images/graffles/low-pass-filter-a.graffle b/...igures/graffles/low-pass-filter-a.graffle → ...images/graffles/low-pass-filter-a.graffle
diff --git a/...ures/graffles/optional-parameters.graffle → ...ages/graffles/optional-parameters.graffle b/...ures/graffles/optional-parameters.graffle → ...ages/graffles/optional-parameters.graffle
diff --git a/...chapter-figures/graffles/pipeline.graffle → ...edometer-images/graffles/pipeline.graffle b/...chapter-figures/graffles/pipeline.graffle → ...edometer-images/graffles/pipeline.graffle
diff --git a/...-figures/graffles/standard-format.graffle → ...r-images/graffles/standard-format.graffle b/...-figures/graffles/standard-format.graffle → ...r-images/graffles/standard-format.graffle
diff --git a/...r/chapter-figures/graffles/stick-dude.png → .../pedometer-images/graffles/stick-dude.png b/...r/chapter-figures/graffles/stick-dude.png → .../pedometer-images/graffles/stick-dude.png
diff --git a/...igures/graffles/walk-1.graffle/data.plist → ...images/graffles/walk-1.graffle/data.plist b/...igures/graffles/walk-1.graffle/data.plist → ...images/graffles/walk-1.graffle/data.plist
diff --git a/...gures/graffles/walk-1.graffle/image5.tiff → ...mages/graffles/walk-1.graffle/image5.tiff b/...gures/graffles/walk-1.graffle/image5.tiff → ...mages/graffles/walk-1.graffle/image5.tiff
diff --git a/...gures/graffles/walk-1.graffle/image6.tiff → ...mages/graffles/walk-1.graffle/image6.tiff b/...gures/graffles/walk-1.graffle/image6.tiff → ...mages/graffles/walk-1.graffle/image6.tiff
diff --git a/...gures/graffles/walk-1.graffle/image8.tiff → ...mages/graffles/walk-1.graffle/image8.tiff b/...gures/graffles/walk-1.graffle/image8.tiff → ...mages/graffles/walk-1.graffle/image8.tiff
diff --git a/...es/graffles/walk-2-old.graffle/data.plist → ...es/graffles/walk-2-old.graffle/data.plist b/...es/graffles/walk-2-old.graffle/data.plist → ...es/graffles/walk-2-old.graffle/data.plist
diff --git a/...es/graffles/walk-2-old.graffle/image4.png → ...es/graffles/walk-2-old.graffle/image4.png b/...es/graffles/walk-2-old.graffle/image4.png → ...es/graffles/walk-2-old.graffle/image4.png
diff --git a/...es/graffles/walk-2-old.graffle/image5.png → ...es/graffles/walk-2-old.graffle/image5.png b/...es/graffles/walk-2-old.graffle/image5.png → ...es/graffles/walk-2-old.graffle/image5.png
diff --git a/...igures/graffles/walk-2.graffle/data.plist → ...images/graffles/walk-2.graffle/data.plist b/...igures/graffles/walk-2.graffle/data.plist → ...images/graffles/walk-2.graffle/data.plist
diff --git a/...igures/graffles/walk-2.graffle/image5.png → ...images/graffles/walk-2.graffle/image5.png b/...igures/graffles/walk-2.graffle/image5.png → ...images/graffles/walk-2.graffle/image5.png
diff --git a/...gures/graffles/walk-2.graffle/image6.tiff → ...mages/graffles/walk-2.graffle/image6.tiff b/...gures/graffles/walk-2.graffle/image6.tiff → ...mages/graffles/walk-2.graffle/image6.tiff
diff --git a/...chapter-figures/input-data-workflow-1.png → ...edometer-images/input-data-workflow-1.png b/...chapter-figures/input-data-workflow-1.png → ...edometer-images/input-data-workflow-1.png
diff --git a/...chapter-figures/input-data-workflow-2.png → ...edometer-images/input-data-workflow-2.png b/...chapter-figures/input-data-workflow-2.png → ...edometer-images/input-data-workflow-2.png
diff --git a/...r/chapter-figures/input-data-workflow.png → .../pedometer-images/input-data-workflow.png b/...r/chapter-figures/input-data-workflow.png → .../pedometer-images/input-data-workflow.png
diff --git a/...res/input-format-to-standard-format-1.png → ...ges/input-format-to-standard-format-1.png b/...res/input-format-to-standard-format-1.png → ...ges/input-format-to-standard-format-1.png
diff --git a/...res/input-format-to-standard-format-2.png → ...ges/input-format-to-standard-format-2.png b/...res/input-format-to-standard-format-2.png → ...ges/input-format-to-standard-format-2.png
diff --git a/...gures/input-format-to-standard-format.png → ...mages/input-format-to-standard-format.png b/...gures/input-format-to-standard-format.png → ...mages/input-format-to-standard-format.png
diff --git a/...pter-figures/jumpy-slow-short-bumpy-1.png → ...meter-images/jumpy-slow-short-bumpy-1.png b/...pter-figures/jumpy-slow-short-bumpy-1.png → ...meter-images/jumpy-slow-short-bumpy-1.png
diff --git a/...pter-figures/jumpy-slow-short-bumpy-2.png → ...meter-images/jumpy-slow-short-bumpy-2.png b/...pter-figures/jumpy-slow-short-bumpy-2.png → ...meter-images/jumpy-slow-short-bumpy-2.png
diff --git a/...pter-figures/jumpy-slow-short-bumpy-3.png → ...meter-images/jumpy-slow-short-bumpy-3.png b/...pter-figures/jumpy-slow-short-bumpy-3.png → ...meter-images/jumpy-slow-short-bumpy-3.png
diff --git a/...pter-figures/jumpy-slow-short-bumpy-4.png → ...meter-images/jumpy-slow-short-bumpy-4.png b/...pter-figures/jumpy-slow-short-bumpy-4.png → ...meter-images/jumpy-slow-short-bumpy-4.png
diff --git a/...hapter-figures/jumpy-slow-short-bumpy.png → ...dometer-images/jumpy-slow-short-bumpy.png b/...hapter-figures/jumpy-slow-short-bumpy.png → ...dometer-images/jumpy-slow-short-bumpy.png
diff --git a/...ter/chapter-figures/low-pass-filter-a.png → ...er/pedometer-images/low-pass-filter-a.png b/...ter/chapter-figures/low-pass-filter-a.png → ...er/pedometer-images/low-pass-filter-a.png
diff --git a/...r/chapter-figures/optional-parameters.png → .../pedometer-images/optional-parameters.png b/...r/chapter-figures/optional-parameters.png → .../pedometer-images/optional-parameters.png
diff --git a/pedometer/chapter-figures/pipeline.png → pedometer/pedometer-images/pipeline.png b/pedometer/chapter-figures/pipeline.png → pedometer/pedometer-images/pipeline.png
diff --git a/...er-figures/signal-dot-product-cropped.png → ...ter-images/signal-dot-product-cropped.png b/...er-figures/signal-dot-product-cropped.png → ...ter-images/signal-dot-product-cropped.png
diff --git a/...igures/signal-filtered-smooth-cropped.png → ...images/signal-filtered-smooth-cropped.png b/...igures/signal-filtered-smooth-cropped.png → ...images/signal-filtered-smooth-cropped.png
diff --git a/...meter/chapter-figures/sine-wave-noise.png → ...eter/pedometer-images/sine-wave-noise.png b/...meter/chapter-figures/sine-wave-noise.png → ...eter/pedometer-images/sine-wave-noise.png
diff --git a/...meter/chapter-figures/sine-wave-plain.png → ...eter/pedometer-images/sine-wave-plain.png b/...meter/chapter-figures/sine-wave-plain.png → ...eter/pedometer-images/sine-wave-plain.png
diff --git a/pedometer/chapter-figures/sine-wave.xlsx → pedometer/pedometer-images/sine-wave.xlsx b/pedometer/chapter-figures/sine-wave.xlsx → pedometer/pedometer-images/sine-wave.xlsx
diff --git a/...meter/chapter-figures/standard-format.png → ...eter/pedometer-images/standard-format.png b/...meter/chapter-figures/standard-format.png → ...eter/pedometer-images/standard-format.png
diff --git a/pedometer/chapter-figures/walk-1.png → pedometer/pedometer-images/walk-1.png b/pedometer/chapter-figures/walk-1.png → pedometer/pedometer-images/walk-1.png
diff --git a/pedometer/chapter-figures/walk-2.png → pedometer/pedometer-images/walk-2.png b/pedometer/chapter-figures/walk-2.png → pedometer/pedometer-images/walk-2.png
diff --git a/pedometer/chapter-figures/~$sine-wave.xlsx → pedometer/pedometer-images/~$sine-wave.xlsx b/pedometer/chapter-figures/~$sine-wave.xlsx → pedometer/pedometer-images/~$sine-wave.xlsx
diff --git a/pedometer/chapter.md → pedometer/pedometer.markdown b/pedometer/chapter.md → pedometer/pedometer.markdown
diff --git a/tex/500L.tex b/tex/500L.tex
@@ -259,6 +259,8 @@
 \mainmatter
 
 
+\include{pedometer}
+
 \include{sampler}
 
 \include{spreadsheet}
@@ -267,8 +269,6 @@
 
 \include{data-store}
 
-\include{sample}
-
 \include{objmodel}
 
 \include{ci}