Merge remote-tracking branch 'rcc02007/master'

tgr12001 · Feb 13, 2017 · 8821175 · 8821175
2 parents 9728528 + e5f170b
commit 8821175
Show file tree

Hide file tree

Showing 10 changed files with 1,956 additions and 6 deletions.
diff --git a/HW3/README.md b/HW3/README.md
@@ -11,8 +11,8 @@
     c. Copy your `projectile.m` function into the 'roots_and_optimization' folder.
     *Disable the plotting routine for the solvers*
 
-    d. Use the four solvers `falsepos.m`, `incsearch.m`, `newtraph.m` and `mod_secant.m`
-    to solve for the angle needed to reach h=1.72 m, with an initial speed of 1.5 m/s. 
+    d. Use the four solvers `falsepos.m`, `bisect.m`, `newtraph.m` and `mod_secant.m`
+    to solve for the angle needed to reach h=1.72 m, with an initial speed of 15 m/s. 
 
     e. The `newtraph.m` function needs a derivative, calculate the derivative of your
     function with respect to theta, `dprojectile_dtheta.m`. This function should
@@ -29,7 +29,7 @@
         | solver | initial guess(es) | ea | number of iterations|
         | --- | --- | --- | --- |
         |falsepos   |  |  |  |
-        |incsearch  |  |  |  |
+        |bisect     |  |  |  |
         |newtraph   |  |  |  |
         |mod_secant |  |  |  |
         ```
@@ -49,7 +49,7 @@ using the numerical solvers, `newtraph.m` and `mod_secant.m`, there are certain
 guesses that do not converge. 
 
     a. Calculate the first 5 iterations for the Newton-Raphson method with an initial
-    guess of x_i=2. 
+    guess of x_i=2 for f(x)=x*exp(-x^2).
 
     b. Add the results to a table in the `README.md` with:
 
@@ -70,5 +70,4 @@ guesses that do not converge.
     'divergence' to 'convergence')
 
 3. Commit your changes to your repository. Sync your local repository with github. Then
-copy and paste the "clone URL" into the following Google Form [Homework
-#3](https://goo.gl/forms/UJBGwp0fQcSxImkq2)
+copy and paste the "clone URL" into the following Google Form [Homework 3](https://goo.gl/forms/UJBGwp0fQcSxImkq2)
diff --git a/lecture_07/.lecture_07.md.swo b/lecture_07/.lecture_07.md.swo
diff --git a/lecture_07/.lecture_07.md.swp b/lecture_07/.lecture_07.md.swp
diff --git a/lecture_08/.ipynb_checkpoints/lecture_08-checkpoint.ipynb b/lecture_08/.ipynb_checkpoints/lecture_08-checkpoint.ipynb
@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/lecture_08/Auchain_model.gif b/lecture_08/Auchain_model.gif
diff --git a/lecture_08/au_chain.jpg b/lecture_08/au_chain.jpg
diff --git a/lecture_08/goldenratio.png b/lecture_08/goldenratio.png
diff --git a/lecture_08/lecture_08.ipynb b/lecture_08/lecture_08.ipynb
diff --git a/lecture_08/lennard_jones.m b/lecture_08/lennard_jones.m
@@ -0,0 +1,4 @@
+function E_LJ =lennard_jones(x,sigma,epsilon)
+  E_LJ = 4*epsilon*((sigma./x).^12-(sigma./x).^6);
+end
+
diff --git a/lecture_08/octave-workspace b/lecture_08/octave-workspace