Refactoring

Author: ufechner7

test/test_forcespeedcontroller1.jl

@@ -30,7 +30,7 @@ BENCHMARK = false
 include("test_utilities.jl")
 
 STARTUP = get_startup(wcs, SAMPLES)    
-V_WIND = STARTUP .* get_triangle_wind(wcs)
+V_WIND = STARTUP .* get_triangle_wind(wcs, V_WIND_MIN, V_WIND_MAX, FREQ_WIND, SAMPLES)
 V_RO, V_SET_OUT, V_SET_OUT_B, FORCE, F_ERR = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)
 ACC, ACC_SET, V_ERR = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)
 STATE = zeros(Int64, SAMPLES)

test/test_forcespeedcontroller2.jl

@@ -34,7 +34,7 @@ BENCHMARK = false
 include("test_utilities.jl")
 
 STARTUP = get_startup(wcs, SAMPLES)    
-V_WIND = STARTUP .* get_triangle_wind(wcs)
+V_WIND = STARTUP .* get_triangle_wind(wcs, V_WIND_MIN, V_WIND_MAX, FREQ_WIND, SAMPLES)
 V_RO, V_SET_OUT, FORCE, F_ERR = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)
 ACC, ACC_SET, V_ERR = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)
 STATE = zeros(Int64, SAMPLES)

test/test_speedcontroller1.jl

@@ -24,7 +24,7 @@ BENCHMARK = false
 include("test_utilities.jl")
 
 STARTUP = get_startup(wcs, SAMPLES)    
-V_WIND = STARTUP .* get_triangle_wind(wcs)
+V_WIND = STARTUP .* get_triangle_wind(wcs, V_WIND_MIN, V_WIND_MAX, FREQ_WIND, SAMPLES)
 V_RO = zeros(SAMPLES)
 V_SET_OUT = zeros(SAMPLES)
 FORCE = zeros(SAMPLES)

test/test_speedcontroller2.jl

@@ -25,7 +25,7 @@ BENCHMARK = false
 include("test_utilities.jl")
 
 STARTUP = get_startup(wcs, SAMPLES)    
-V_WIND = STARTUP .* get_triangle_wind(wcs)
+V_WIND = STARTUP .* get_triangle_wind(wcs, V_WIND_MIN, V_WIND_MAX, FREQ_WIND, SAMPLES)
 V_RO = zeros(SAMPLES)
 V_SET_OUT = zeros(SAMPLES)
 FORCE = zeros(SAMPLES)

test/test_utilities.jl

@@ -1,24 +1,24 @@
 # Create a wind signal in triangle form, using the constants V_WIND_MIN and V_WIND_MAX with
 # the frequency FREQ_WIND.
-function  get_triangle_wind(wcs::WCSettings)
+function  get_triangle_wind(wcs::WCSettings, min, max, freq, samples)
     result = zeros(SAMPLES)
     v_wind = 0.0
     rising = true
-    delta = FREQ_WIND * 2.0 * (V_WIND_MAX - V_WIND_MIN) * wcs.dt
-    for i in 1:SAMPLES
+    delta = freq * 2.0 * (max - min) * wcs.dt
+    for i in 1:samples
         result[i] = v_wind
         if rising
             v_wind += delta
         end
-        if v_wind >= V_WIND_MAX
-            v_wind = V_WIND_MAX
+        if v_wind >= max
+            v_wind = max
             rising = false
         end
         if ! rising
             v_wind -= delta
         end
-        if v_wind <= V_WIND_MIN
-            v_wind = V_WIND_MIN + delta
+        if v_wind <= min
+            v_wind = min + delta
             rising = true
         end
     end

test/test_winchcontroller.jl

@@ -30,7 +30,7 @@ FREQ_WIND  = 0.25 # frequency of the triangle wind speed signal
 include("test_utilities.jl")
 
 STARTUP = get_startup(wcs, SAMPLES)    
-V_WIND = STARTUP .* get_triangle_wind(wcs)
+V_WIND = STARTUP .* get_triangle_wind(wcs, V_WIND_MIN, V_WIND_MAX, FREQ_WIND, SAMPLES)
 V_RO, V_SET_OUT, FORCE, F_ERR = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)
 ACC, ACC_SET, V_ERR = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)
 RESET, ACTIVE, F_SET = zeros(SAMPLES), zeros(SAMPLES), zeros(SAMPLES)