From eb2a7108be4473138c90182d09e8ad56a88bd861 Mon Sep 17 00:00:00 2001
From: Patrick Begley <pat42@Patricks-MacBook-Pro-3.local>
Date: Wed, 15 Feb 2017 21:07:59 -0500
Subject: [PATCH] update

added projectile
---
 HW1/projectile.m  | 28 ++++++++++++++++++++++++++++
 HW1/projectile.m~ | 26 ++++++++++++++++++++++++++
 test.m            |  1 -
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 HW1/projectile.m
 create mode 100644 HW1/projectile.m~
 delete mode 100644 test.m

diff --git a/HW1/projectile.m b/HW1/projectile.m
new file mode 100644
index 0000000..0d4ea20
--- /dev/null
+++ b/HW1/projectile.m
@@ -0,0 +1,28 @@
+function [h,t_linear,y] = projectile(v_mag,theta)
+% Function that takes the initial velocity magnitude and the angle of
+% launch of the projectile and calculates the height at 2.37m away from the
+% initial position from an initial height of 1.72m.
+%   Inputs: v_mag, theta
+%   Output: h
+%
+% Also plots the path to a distance of 2.37m.
+
+i = 1;
+x0 = 2.37;
+y0 = 1.72;
+g = -9.81;
+
+t = x0/(v_mag*cos(theta));
+t_linear = 0:0.01:t;
+y = zeros(1,length(t_linear));
+h = y0 + x0/cos(theta) + 0.5*g*(x0/(v_mag*cos(theta)))^2;
+
+for t = t_linear
+    y(i) = y0 + v_mag*t + 0.5*g*t^2;
+    i = i + 1;
+end
+
+plot(t_linear, y)
+
+end
+
diff --git a/HW1/projectile.m~ b/HW1/projectile.m~
new file mode 100644
index 0000000..bed113e
--- /dev/null
+++ b/HW1/projectile.m~
@@ -0,0 +1,26 @@
+function [h,t_linear,y] = projectile(v_mag,theta)
+% Function that takes the initial velocity magnitude and the angle of
+% launch of the projectile and calculates the height at 2.37m away from the
+% initial position from an initial height of 1.72m.
+%   Inputs: v_mag, theta
+%   Output: h
+%
+% Also plots the path to a distance of 2.37m.
+
+x0 = 2.37;
+y0 = 1.72;
+g = -9.81;
+
+t = x0/(v_mag*cos(theta));
+t_linear = 0:0.1:t;
+y = zeros(length(t_linear));
+h = y0 + x0/cos(theta) + 0.5*g*(x0/(v_mag*cos(theta)))^2;
+
+for t = t_linear
+    y() = y0 + v_mag*t + 0.5*g*t^2;
+end
+
+plot(t_linear, y)
+
+end
+
diff --git a/test.m b/test.m
deleted file mode 100644
index 5155298..0000000
--- a/test.m
+++ /dev/null
@@ -1 +0,0 @@
-blank
\ No newline at end of file