Merge branch 'master' of https://github.uconn.edu/cpl11001/07_final_p…

…roject

README.md

@@ -208,6 +208,7 @@ Using the given pressure range, the tension is found at each different pressure
 ```matlab
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 % This creates a plot for the max_w vs a given pressure
 clear
 P = linspace(0.001,0.01,10); % Assign the range of pressures used to find T
@@ -221,25 +222,35 @@ P = linspace(0.001,0.01,10);
 clear
 P = linspace(0.001,0.01,10);
 
+>>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
+=======
+clear
+P = linspace(0.001,0.01,10);
+
 >>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
 for i = 1:length(P)
     func = @(T) SE_diff(T,P(i),10);
     [root(i),fx,ea,iter] = bisect_final_project(func,0.001,1,.1);
 end
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 % Each value of w is calculated using each root and pressure value
 =======
 
 >>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
 =======
 
+>>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
+=======
+
 >>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
 for i = 1:length(root)
     w = membrane_solution(root(i),P(i),10);
     w1(:,i) = w;
 end
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 w_max = max(w1); % in order to get the w_max we take the maximum w value from each column of the w vector
@@ -250,12 +261,17 @@ plot(w_max,P,w_max,Y,'or') % plot the w_max vs. the Pressure and include a cubic
 =======
 =======
 >>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
+=======
+>>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
 w_max = max(w1);
 coefficients = polyfit(w_max,P,3);
 Y = polyval(coefficients,w_max);
 
 plot(w_max,P,w_max,Y,'or')
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
+=======
 >>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2
 =======
 >>>>>>> 3daf399f8af002d376801f3e913283aac67f17f2