Differences

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

--- ezfit:target_algorithms [2009/01/29 14:26]
127.0.0.1 external edit
+++ ezfit:target_algorithms [2009/03/03 12:14] (current)
smayr
@@ Line 404: / Line 404: @@
     if (ThreshLevel < = 40)
         LoudTargetLevel = 0;
-    else if (ThreshLevel < 125)
+    else
         LoudTargetLevel = (0.1 * power((ThreshLevel - 40) {base}, 1.4 {exponent}));
     end
@@ Line 494: / Line 494: @@
 |  3000 |  44.15 |  H83  | ''=IF(H83<=20;0; IF(H83<60;(H83-20)*0.6; IF(H83<110;(H83*0.79)-23; IF(H83<120;59))))'' |
 |  4000 |  38.10 |  I83  | ''=IF(I83<=20;0; IF(I83<60;(I83-20)*0.6; IF(I83<110;(I83*0.79)-23; IF(I83<120;59)))) - 10'' |
-|  6000 |  46.00 |  J83  | ''=IF(J83<=20;0; IF(J83<60;(J83-20)*0.6; IF(J83<110;(J83*0.79)-23; IF(J83<125;59)))) - 13'' |
+|  6000 |  46.00 |  J83  | ''=IF(J83<=20;0; IF(J83<60;(J83-20)*0.6; IF(J83<110;(J83*0.79)-23; IF(J83<125 FIXME;59)))) - 13'' |
 |  8000 |  30.10 |  K83  | ''=IF(K83<=20;0; IF(K83<60;(K83-20)*0.6; IF(K83<110;(K83*0.79)-23; IF(K83<120;59)))) - 18'' |
@@ Line 506: / Line 506: @@
     else if (ThreshLevel < 60)
         ModerateTargetLevel = ((ThreshLevel - 20) * 0.6);
-    else if (ThreshLevel < 80)
+    else if (ThreshLevel < 110)
         ModerateTargetLevel = ((ThreshLevel * 0.79) - 23);
     else if (ThreshLevel < 120)
-        ModerateTargetLevel = 49;
+        ModerateTargetLevel = 59;
     end
     // Add High Frequencies compensation
@@ Line 599: / Line 599: @@
   // Get Soft Target Level
   if ThreshFreq in [250, 8000] then
-     LoudTargetLevel = 0;
+     SoftTargetLevel = 0;
   else if ThreshFreq in [500, 750] then
     if (ThreshLevel >= 60)
@@ Line 620: / Line 620: @@
   else if ThreshFreq in [1000, 1500, 2000] then
     if (ThreshLevel < 30)
-        ModerateTargetLevel = 0;
+        SoftTargetLevel = 0;
     else if (ThreshLevel < 45)
-        ModerateTargetLevel = (ThreshLevel / 3);
+        SoftTargetLevel = (ThreshLevel / 3);
     else if (ThreshLevel < 75)
-        ModerateTargetLevel = (ThreshLevel / 2.5);
+        SoftTargetLevel = (ThreshLevel / 2.5);
     else if (ThreshLevel < 125)
-        ModerateTargetLevel = 30;
+        SoftTargetLevel = 30;
     end
-  else if ThreshFreq in [3000, 4000, 6000] then
+  else if ThreshFreq in [3000] then
     if (ThreshLevel < 80)
-        ModerateTargetLevel = (ThreshLevel / 2);
+        SoftTargetLevel = (ThreshLevel / 2);
     else if (ThreshLevel < 120)
-        ModerateTargetLevel = 40;
+        SoftTargetLevel = 40;
+    end
+  else if ThreshFreq in [4000, 6000] then
+    if (ThreshLevel < 80)
+        SoftTargetLevel = (ThreshLevel / 2);
+    else if (ThreshLevel < 120)
+        SoftTargetLevel = 36;
     end
   end
   // Add High Frequencies compensation
-  if (ThreshFreq = 4000)
+  if (ThreshFreq = 4000) then
-     SoftTargetLevel = SoftTargetLevel - 10;
+     SoftTargetLevel = SoftTargetLevel - 6;
-  else if (ThreshFreq = 6000)
+  else if (ThreshFreq = 6000) then
-     SoftTargetLevel = SoftTargetLevel - 13;
+     SoftTargetLevel = SoftTargetLevel - 16;
   end
 end;
@@ Line 664: / Line 670: @@
   // Get Moderate Target Level
   if ThreshFreq in [250, 8000] then
-     LoudTargetLevel = 0;
+     ModerateTargetLevel = 0;
   else
-    if (ThreshLevel < 35)
+    if (ThreshLevel < 35) then
         ModerateTargetLevel = 0;
-    else if (ThreshLevel > 30)  // FIXME There is overlap here, so something needs to be corrected !!!
+    else if (ThreshLevel > 30) then // FIXME There is overlap here, so something needs to be corrected !!!
         ModerateTargetLevel = (ThreshLevel - 3);
     end
@@ Line 698: / Line 704: @@
      LoudTargetLevel = 0;
   else if ThreshFreq in [500, 750, 1000, 1500, 2000] then
-    if (ThreshLevel < = 40)
+    if (ThreshLevel < = 40) then
         LoudTargetLevel = 0;
     else
@@ Line 704: / Line 710: @@
     end
   else if ThreshFreq in [3000, 4000, 6000] then
-    else if (ThreshLevel > 100)
+    else if (ThreshLevel > 100) then
         LoudTargetLevel = 32;
-    else if (ThreshLevel < = 40)
+    else if (ThreshLevel < = 40) then
         LoudTargetLevel = 0;
     else
@@ Line 712: / Line 718: @@
     end
     // Add High Frequencies compensation
-    if (ThreshFreq = 6000)
+    if (ThreshFreq = 4000) then
        LoudTargetLevel = LoudTargetLevel - 6;
-    else if (ThreshFreq = 8000)
+    else if (ThreshFreq = 6000)
        LoudTargetLevel = LoudTargetLevel - 16;
     end