Differences

This shows you the differences between two versions of the page.

--- matlab:matlab_examples [2016/05/01 03:57] – [Function m-file] mithat
+++ matlab:matlab_examples [2016/05/04 01:56] – [m-files with main function] mithat
@@ Line 30: / Line 30: @@
 ===== m-files with "main" function =====
-Ref.(((Recktenwald, Gerald. "MATLAB Functions -- Basic Features." MATLAB Functions -- Basic Features. Accessed April 30, 2016. http://web.cecs.pdx.edu/~gerry/MATLAB/programming/basics.html.))
+Ref.((Recktenwald, Gerald. "MATLAB Functions -- Basic Features." MATLAB Functions -- Basic Features. Accessed April 30, 2016. http://web.cecs.pdx.edu/~gerry/MATLAB/programming/basics.html.))
 <file matlab compute_trapezoid.m>
 function main
@@ Line 62: / Line 62: @@
 d = disc(a, b, c);
-x1 = (-b + d) / (2*a);
+x1 = (-b + sqrt(d)) / (2*a);
-x2 = (-b - d) / (2*a);
+x2 = (-b - sqrt(d)) / (2*a);
 end
@@ Line 69: / Line 69: @@
 % dis = disc(a,b,c)
 % Return the discriminant of a, b, c.
-dis = sqrt(b^2 - 4*a*c);
+dis = b^2 - 4*a*c;
 end
 </file>
 ===== Returning multiple values =====
-Ref.(((Recktenwald, Gerald. "MATLAB Functions -- Basic Features." MATLAB Functions -- Basic Features. Accessed April 30, 2016. http://web.cecs.pdx.edu/~gerry/MATLAB/programming/basics.html.))
+Ref.((Recktenwald, Gerald. "MATLAB Functions -- Basic Features." MATLAB Functions -- Basic Features. Accessed April 30, 2016. http://web.cecs.pdx.edu/~gerry/MATLAB/programming/basics.html.))
 <file matlab c_to_p.m>
 function main