Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several fixes to the main bootcamp page; added vignettes #2

Merged
merged 12 commits into from
Jan 25, 2014
Merged

Several fixes to the main bootcamp page; added vignettes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dd53bf8
Remove references to SQL/database material
rhiever Jan 25, 2014
a9e3e9d
Update README.md
rhiever Jan 25, 2014
e2d2ccd
Add agenda to home page
rhiever Jan 25, 2014
9980a39
Add useful links
rhiever Jan 25, 2014
dc9c446
Add proper install instructions
rhiever Jan 25, 2014
5e187f6
Reorganize guides & links
rhiever Jan 25, 2014
82d210f
Add line break below "setup"
rhiever Jan 25, 2014
9cf746d
Update olson.r.html
rhiever Jan 25, 2014
278c67a
Remove line breaks under "agenda" and "setup"
rhiever Jan 25, 2014
190c995
Add the vignettes back in
rhiever Jan 25, 2014
de1c396
Update links for NumPy and plotting sections
rhiever Jan 25, 2014
a2b48a2
Fix NumPy and plotting links in agenda
rhiever Jan 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## Massachusetts Institute of Technology
**When:** January 30-31, 2014

**Where:** 77 Massachusetts Avenue, Room ??, Cambridge, MA 02139
**Where:** 77 Massachusetts Avenue, Room 48-316, Cambridge, MA 02139

Please see the boot camp [website](http://rhiever.github.io/2014-01-30-mit/) for the schedule and installation instructions.
Please see the boot camp [website](http://geocarpentry.github.io/2014-01-30-mit/) for the schedule and installation instructions.

Please contact [Aron Ahmadia](mailto:aron@ahmadia.net) with any questions.
20 changes: 12 additions & 8 deletions _includes/people/olson.r.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
<img class="media-object pull-left" src="{{page.root}}/img/people/olson.r.jpg" alt="Randy Olson" />
<div id="olson.r" class="media-body">
<span class="person"><a href="http://www.randalolson.com/">Randy Olson</a></span>
is a PhD candidate in Computer Science &amp; Ecology, Evolutionary Biology, and Behavior at Michigan State University.
His research interests are primarily focused on artificial intelligence and evolutionary processes,
where he is seeking to combine the two to evolve increasingly-intelligent algorithms.
An avid research blogger,
Randy regularly publishes blog posts about Python,
scientific computing,
open science,
and artificial intelligence.
is a Computer Science graduate research assistant at
<a href="http://msu.edu/">Michigan State University</a> in
<a href="http://adamilab.msu.edu/">Dr. Chris Adami's lab</a> specializing in artificial intelligence,
artificial life,
and evolutionary computation.
He runs a
<a href="http://www.randalolson.com/blog/">research blog</a>
where he writes about scientific computing,
data visualization,
evolution,
and AI. Randy is an ardent advocate of open science and regularly travels the U.S.
to teach researchers scientific computing skills at Software Carpentry workshops.
</div>
</div>
219 changes: 173 additions & 46 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: bootcamp
root: .
venue: Massachusetts Institute of Technology
address: 77 Massachusetts Avenue, Room ??
address: 77 Massachusetts Avenue, Room 48-316
country: United-States
humandate: Jan 30-31, 2014
humantime: 9:00 am - 4:30 pm
Expand All @@ -23,64 +23,191 @@

<hr/>

<h2>Setup</h2>
<h2>Agenda</h2>

<div class="row-fluid">
<div class="span6">
{% include setup/overview-bash.html %}
{% include setup/overview-editor.html %}
</div>
<div class="span6">
{% include setup/overview-git.html %}
{% include setup/overview-python.html %}
</div>
</div>
<table class="table table-striped">
<tr>
<th colspan="3"> Day 1 </th>
</tr>
<tr>
<td> 08:00-09:00 </td>
<td> Setup Help </td>
<td> </td>
</tr>
<tr>
<td> 09:00-09:30 </td>
<td> <a href="{{page.root}}/overview/overview.html">Introduction and Overview</a> </td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 09:30-10:30 </td>
<td> <a href="{{page.root}}/bash/novice/index.html">
Automating Your Actions (Shell Part 1)</a> </td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 10:30-10:45 </td>
<td> Break </td>
<td> </td>
</tr>
<tr>
<td> 10:45-12:00 </td>
<td> <a href="{{page.root}}/bash/novice/index.html">
Automating Your Actions (Shell Part 2)</a> </td>
<td> Randal Olson </td>
</tr>
<tr>
<td> 12:00-13:00 </td>
<td> Lunch Break </td>
<td> </td>
</tr>
<tr>
<td> 13:00-13:30 </td>
<td> <a href="http://ipython.org/ipython-doc/stable/interactive/tutorial.html">
IPython</a>
and
<a href="http://ipython.org/ipython-doc/stable/interactive/notebook.html">
IPython Notebook Orientation </a></td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 13:30-15:00 </td>
<td> <a href="http://nbviewer.ipython.org/github/geocarpentry/2014-01-21-erdc/blob/gh-pages/python/intermediate/01-intro-python.ipynb">
Intro to Python Programming and Analysis (Python Part 1)</a></td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 15:00-15:15 </td>
<td> Break </td>
<td> </td>
</tr>
<tr>
<td> 15:15-16:30 </td>
<td> <a href="http://nbviewer.ipython.org/github/geocarpentry/2014-01-21-erdc/blob/gh-pages/python/intermediate/02-modularization-documentation.ipynb">
Modularization and Documentation (Python Part 2)</a></td>
<td> Randal Olson </td>
</tr>
<tr>
<th colspan="3"> Day 2 </th>
</tr>
<tr>
<td> 08:00-09:00 </td>
<td> Office Hour </td>
<td> </td>
</tr>
<tr>
<td> 09:00-09:30 </td>
<td> <a href="{{page.root}}/git/intermediate/00-intro.html">Introduction to Distributed Version Control</a> </td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 09:30-10:30 </td>
<td> <a href="{{page.root}}/git/intermediate/01-conversational-git.html">Accessing and Creating Software History (Git Part 1)</a> </td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 10:30-10:45 </td>
<td> Break </td>
<td> </td>
</tr>
<tr>
<td> 10:45-12:00 </td>
<td> <a href="{{page.root}}/git/intermediate/01-conversational-git.html">Sharing and Collaborating with GitHub (Git Part 2)</a> </td>
<td> Aron Ahmadia </td>
</tr>
<tr>
<td> 12:00-13:00 </td>
<td> Lunch Break </td>
<td> </td>
</tr>
<tr>
<td> 13:00-13:30 </td>
<td> Content Review </td>
<td> Aron Ahmadia and Randal Olson </td>
</tr>
<tr>
<td> 13:30-15:00 </td>
<td> <a href="http://nbviewer.ipython.org/urls/raw2.github.com/geocarpentry/2014-01-30-mit/gh-pages/lessons/vignettes/Numerical_analysis_with_NumPy.ipynb">Numerical analysis with NumPy</a> </td>
<td> Randal Olson </td>
</tr>
<tr>
<td> 15:00-15:15 </td>
<td> Break </td>
<td> </td>
</tr>
<tr>
<td> 15:15-16:30 </td>
<td> <a href="http://nbviewer.ipython.org/urls/raw2.github.com/geocarpentry/2014-01-30-mit/gh-pages/lessons/vignettes/Plotting_with_Matplotlib_and_Basemap.ipynb">Plotting with Matplotlib and Basemap</a> </td>
<td> Randal Olson </td>
</tr>
</table>

<hr/>
<hr />

<h2>Topics</h2>
<h2>Setup</h2>

<div class="row-fluid">
<div class="span6">
<h3><a href="lessons/swc-shell/tutorial.html">The Unix Shell</a></h3>
<ul>
<li>{% include guide-shell/intro/title.md %}</li>
<li>{% include guide-shell/filedir/title.md %}</li>
<li>{% include guide-shell/create/title.md %}</li>
<li>{% include guide-shell/pipefilter/title.md %}</li>
<li>{% include guide-shell/loop/title.md %}</li>
<li>{% include guide-shell/scripts/title.md %}</li>
<li>{% include guide-shell/find/title.md %}</li>
</ul>

<h3>MacOSX</h3>
<div class="well">
{% include setup/macosx-bash.html %}
{% include setup/macosx-editor.html %}
{% include setup/macosx-git.html %}
{% include setup/macosx-python.html %}
<!--{% include setup/macosx-r.html %}-->
</div>
</div>
<div class="span6">
<h3><a href="lessons/swc-db/tutorial.html">Databases</a></h3>
<ul>
<li>{% include guide-db/select/title.md %}</li>
<li>{% include guide-db/distinct/title.md %}</li>
<li>{% include guide-db/filter/title.md %}</li>
<li>{% include guide-db/calc/title.md %}</li>
<li>{% include guide-db/sort/title.md %}</li>
<li>{% include guide-db/null/title.md %}</li>
<li>{% include guide-db/aggregate/title.md %}</li>
<li>{% include guide-db/grouping/title.md %}</li>
<li>{% include guide-db/join/title.md %}</li>
<li>{% include guide-db/create/title.md %}</li>
<li>{% include guide-db/transactions/title.md %}</li>
<li>{% include guide-db/programming/title.md %}</li>
</ul>
</div>

<h3>Windows</h3>
<div class="well">
{% include setup/windows-git.html %}
{% include setup/windows-editor.html %}
{% include setup/windows-anaconda.html %}
{% include setup/windows-swc.html %}
<!--{% include setup/windows-r.html %}-->
</div>

<h3>Linux</h3>
<div class="well">
{% include setup/linux-bash.html %}
{% include setup/linux-git.html %}
{% include setup/linux-editor.html %}
{% include setup/linux-python.html %}
<!--{% include setup/linux-r.html %}-->
</div>
</div>
</div>

<hr/>

<h2>Reference Guides</h2>
<div class="row-fluid">
<div class="span6">
<h3>Reference Guides</h3>
<div class="well">
<ul>
<li><a href="{{page.root}}/lessons/ref/shell.html">The Unix Shell</a></li>
<li><a href="{{page.root}}/lessons/ref/python.html">Python</a></li>
</ul>
</div>
</div>

<ul>
<li><a href="{{page.root}}/lessons/ref/shell.html">The Unix Shell</a></li>
<li><a href="{{page.root}}/lessons/ref/python.html">Python</a></li>
<li><a href="{{page.root}}/lessons/ref/sql.html">SQL</a></li>
</ul>
<div class="span6">
<h3>Useful Links</h3>
<div class="well">
<ul>
<li><a href="https://github.com/veltman/clmystery">Fun with Unix commands: A Command-Line Murder Mystery</a></li>
<li><a href="http://docs.python.org/2/tutorial/">Python tutorial</a></li>
<li><a href="http://www.randalolson.com/2012/08/06/statistical-analysis-made-easy-in-python/">Quick guide on data analysis with Python and pandas</a></li>
<li><a href="http://pythontutor.com/">Python Tutor (steps through the code with you as it executes)</a></li>
<li><a href="http://pcottle.github.io/learnGitBranching/?NODEMO">Visualization of Git commands</a></li>
<li><a href="http://osrc.dfm.io/ahmadia">Your GitHub "resume"</a></li>
</ul>
</div>
</div>
</div>

<h2>Instructors</h2>

Expand Down
Loading