Skip to content
Permalink
Browse files

Merge remote-tracking branch 'rcc02007/master'

  • Loading branch information
Thomas Ressler Thomas Ressler
Thomas Ressler authored and Thomas Ressler committed Feb 13, 2017
2 parents 9728528 + e5f170b commit 8821175f2ae0a061e686b7036ec0833bc02670a7
@@ -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)
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,6 @@
{
"cells": [],
"metadata": {},
"nbformat": 4,
"nbformat_minor": 2
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

@@ -0,0 +1,4 @@
function E_LJ =lennard_jones(x,sigma,epsilon)
E_LJ = 4*epsilon*((sigma./x).^12-(sigma./x).^6);
end

Binary file not shown.

0 comments on commit 8821175

Please sign in to comment.
You can’t perform that action at this time.