Преглед на файлове

Tweak alpha definition again

Kirk Trombley преди 3 години
родител
ревизия
ba4ad05154
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3 3
      web/metrics.js

+ 3 - 3
web/metrics.js

@@ -4,9 +4,9 @@ const metrics = {
     displayName: String.raw`\alpha`,
     displayName: String.raw`\alpha`,
     displayBody: p => String.raw`
     displayBody: p => String.raw`
       \frac{
       \frac{
-        \sigma\left(${p}\right)^{1 - (C\left(\left\{\vec{q}\right\}\right) - L\left(\left\{\vec{q}\right\}\right))}
+        \sigma\left(${p}\right)^{1 - C\left(\left\{\vec{q}\right\}\right) L\left(\left\{\vec{q}\right\}\right)}
       }{
       }{
-        \Theta\left(${p}\right)^{-1 - (C\left(\left\{\vec{q}\right\}\right) - L\left(\left\{\vec{q}\right\}\right))}
+        \Theta\left(${p}\right)^{-1 - C\left(\left\{\vec{q}\right\}\right) L\left(\left\{\vec{q}\right\}\right)}
       }
       }
     `,
     `,
     evaluate: () => 0, // calculated below
     evaluate: () => 0, // calculated below
@@ -131,7 +131,7 @@ const applyMetrics = (data, target) => {
     Object.entries(metrics)
     Object.entries(metrics)
       .map(([name, metric]) => [name, metric.evaluate(data, target)])
       .map(([name, metric]) => [name, metric.evaluate(data, target)])
   );
   );
-  const power = target.chroma - target.lightness;
+  const power = target.chroma * target.lightness;
   scores.alpha = Math.pow(scores.sigma, 1 - power) * Math.pow(scores.bigTheta, 1 + power);
   scores.alpha = Math.pow(scores.sigma, 1 - power) * Math.pow(scores.bigTheta, 1 + power);
   return scores;
   return scores;
 };
 };