Skip to content
Snippets Groups Projects
Commit f32be53b authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Whitespace

parent 913db0d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/octave/curve.m
+ 4
− 5
View file @ f32be53b
...@@ -40,10 +40,10 @@ vecs(1,:) = [0; 0]; % So that we can always calculate a difference ...@@ -40,10 +40,10 @@ vecs(1,:) = [0; 0]; % So that we can always calculate a difference
vecs(2,:) = [0; 1]; % Start vecs(2,:) = [0; 1]; % Start
for j = 2:steps+1 for j = 2:steps+1
vecs(j+1,:) = duneminimise(A,b,func,vecs(j,:)); vecs(j+1,:) = duneminimise(A,b,func,vecs(j,:));
diffs(j,:) = vecs(j+1,:) - vecs(j,:); diffs(j,:) = vecs(j+1,:) - vecs(j,:);
line([vecs(j,1) vecs(j+1,1)], ... line([vecs(j,1) vecs(j+1,1)], ...
[vecs(j,2) vecs(j+1,2)], ... [vecs(j,2) vecs(j+1,2)], ...
[duneevaluate(A,b,func,vecs(j,:)') duneevaluate(A,b,func,vecs(j+1,:)')], ... [duneevaluate(A,b,func,vecs(j,:)') duneevaluate(A,b,func,vecs(j+1,:)')], ...
'color', 'y'); 'color', 'y');
end end
...@@ -52,4 +52,3 @@ axis tight; ...@@ -52,4 +52,3 @@ axis tight;
xlabel x; xlabel x;
ylabel y; ylabel y;
hold off; hold off;
src/octave/zigzag.m
+ 4
− 5
View file @ f32be53b
...@@ -40,10 +40,10 @@ vecs(1,:) = [ 0; 0]; % So that we can always calculate a difference ...@@ -40,10 +40,10 @@ vecs(1,:) = [ 0; 0]; % So that we can always calculate a difference
vecs(2,:) = [279; 0]; % Start vecs(2,:) = [279; 0]; % Start
for j = 2:steps+1 for j = 2:steps+1
vecs(j+1,:) = duneminimise(A,b,func,vecs(j,:)); vecs(j+1,:) = duneminimise(A,b,func,vecs(j,:));
diffs(j,:) = vecs(j+1,:) - vecs(j,:); diffs(j,:) = vecs(j+1,:) - vecs(j,:);
line([vecs(j,1) vecs(j+1,1)], ... line([vecs(j,1) vecs(j+1,1)], ...
[vecs(j,2) vecs(j+1,2)], ... [vecs(j,2) vecs(j+1,2)], ...
[duneevaluate(A,b,func,vecs(j,:)') duneevaluate(A,b,func,vecs(j+1,:)')], ... [duneevaluate(A,b,func,vecs(j,:)') duneevaluate(A,b,func,vecs(j+1,:)')], ...
'color', 'y'); 'color', 'y');
end end
...@@ -52,4 +52,3 @@ axis tight; ...@@ -52,4 +52,3 @@ axis tight;
xlabel x; xlabel x;
ylabel y; ylabel y;
hold off; hold off;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment