From e16fa5112b500a771496793fa44eae3eb4c0c52d Mon Sep 17 00:00:00 2001
From: Fredrik Bagge Carlson <cont-frb@ulund.org>
Date: Tue, 29 Aug 2017 16:24:55 +0200
Subject: [PATCH] Update FRTN35_lab1.jl
---
src/FRTN35_lab1.jl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/FRTN35_lab1.jl b/src/FRTN35_lab1.jl
index 6b62e92..a49264f 100644
--- a/src/FRTN35_lab1.jl
+++ b/src/FRTN35_lab1.jl
@@ -11,7 +11,7 @@ nbr_of_periods = 3
# and run three experiments. You may modify the freqency vectors
# any way you want and add/remove experiments as needed.
-w1_100 = logspace(log10(1),log10(300),800)
+w1_100 = logspace(log10(1),log10(300),8)
G1 = fra(P, w1_100, amplitude=1, nbr_of_periods=nbr_of_periods, settling_time=settling_time)
@save "workspace.jld"
@@ -61,7 +61,9 @@ function prbs_experiment(;amplitude = 1, duration = 10)
for (i,t) = enumerate(0:h:duration)
@periodically h begin
y[i] = measure(P)
- u[i] = sum(sin(ω*(t-1)) for ω in logspace(-1,3,10))#amplitude*(prbs()-0.5)# randn()
+ u[i] = amplitude*(prbs()-0.5)
+ #u[i] = amplitude*randn()
+ #u[i] = amplitude*sum(sin(ω*(t-1)) for ω in logspace(-1,3,10))
control(P, u[i])
end
end
--
GitLab