From 450ed4278ccd7c53f6aed6aaf86361aceefc9c34 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 1 Nov 2011 15:27:15 +0100
Subject: [PATCH] Declare what function we will use at one point
---
src/curve.m | 7 ++++---
src/zigzag.m | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/curve.m b/src/curve.m
index f58e244d..69c90ccb 100644
--- a/src/curve.m
+++ b/src/curve.m
@@ -13,6 +13,7 @@ b=[
1
2.5
];
+func = 'S'; % steepFunctionNonsmooth
x = -.1:.005:.4;
y = .9:.005:1.1;
@@ -23,7 +24,7 @@ ylabel('y')
tic
for i=1:length(y)
in = [ X(i,:); Y(i,:) ];
- f(i,:) = duneevaluate(A,b, 'S', in);
+ f(i,:) = duneevaluate(A,b,func, in);
end
clear X Y;
toc
@@ -40,11 +41,11 @@ vecs(2,:) = [0; 1]; % Start
for j = 2:steps+1 % Something random
% Zero is code for 'SteepFunctionNonsmooth'
- vecs(j+1,:) = duneminimise(A,b, 'S', vecs(j,:));
+ vecs(j+1,:) = duneminimise(A,b,func,vecs(j,:));
diffs(j,:) = vecs(j+1,:) - vecs(j,:);
line([vecs(j,1) vecs(j+1,1)], ...
[vecs(j,2) vecs(j+1,2)], ...
- [duneevaluate(A,b, 'S', vecs(j,:)') duneevaluate(A,b, 'S', vecs(j+1,:)')], ...
+ [duneevaluate(A,b,func,vecs(j,:)') duneevaluate(A,b,func,vecs(j+1,:)')], ...
'color', 'y');
end
diff --git a/src/zigzag.m b/src/zigzag.m
index 12121007..13f2b54c 100644
--- a/src/zigzag.m
+++ b/src/zigzag.m
@@ -13,6 +13,7 @@ b=[
1
2
];
+func = 's'; % sampleFunction
x = -50:1:300;
y = -125:1:50;
@@ -23,7 +24,7 @@ ylabel('y')
tic
for i=1:length(y)
in = [ X(i,:); Y(i,:) ];
- f(i,:) = duneevaluate(A,b, 's', in);
+ f(i,:) = duneevaluate(A,b,func,in);
end
clear X Y;
toc
@@ -40,11 +41,11 @@ vecs(2,:) = [279; 0]; % Start
for j = 2:steps+1 % Something random
% One is code for 'SampleFunction'
- vecs(j+1,:) = duneminimise(A,b, 's', vecs(j,:));
+ vecs(j+1,:) = duneminimise(A,b,func,vecs(j,:));
diffs(j,:) = vecs(j+1,:) - vecs(j,:);
line([vecs(j,1) vecs(j+1,1)], ...
[vecs(j,2) vecs(j+1,2)], ...
- [duneevaluate(A,b, 's', vecs(j,:)') duneevaluate(A,b, 's', vecs(j+1,:)')], ...
+ [duneevaluate(A,b,func,vecs(j,:)') duneevaluate(A,b,func,vecs(j+1,:)')], ...
'color', 'y');
end
--
GitLab