feat: hermitian tests

Author: codeagent

fft/fft2.test.ts

@@ -1,5 +1,15 @@
 import { vec2 } from 'gl-matrix';
-import { abs, add, mult, Complex, complex, sub, eix, conj } from './complex';
+import {
+  abs,
+  add,
+  mult,
+  Complex,
+  complex,
+  sub,
+  eix,
+  conj,
+  im,
+} from './complex';
 import { dft2, fft2, idft2, ifft2 } from './fft2';
 
 export const testDft2 = () => {
@@ -108,7 +118,7 @@ export const testFft2Combined = () => {
 };
 
 export const testFft2Hermitian = () => {
-  for (let pow of [3]) {
+  for (let pow of [1, 2, 3, 4, 5, 6, 7, 8]) {
     // Arrange
     const size = 1 << pow;
 
@@ -146,16 +156,13 @@ export const testFft2Hermitian = () => {
     const inverse = ifft2(spectrum);
 
     // Assert
-
     const ifftf = inverse.flat();
-    console.log(ifftf);
-
-    // const diff = ifftf.map((v, i) => abs(sub(v, complex(s0f[i], s1f[i]))));
-    // const closeEnougth = diff.every((v) => v <= 1.0e-5);
-    // if (!closeEnougth) {
-    //   console.warn("testFft2Hermitian: Test don't passesd: ", diff);
-    //   return;
-    // }
+    const _im = ifftf.map((v) => im(v));
+    const isReal = _im.every((v) => Math.abs(v) <= 1.0e-6);
+    if (!isReal) {
+      console.warn(`testFft2Hermitian: Test don't pass`);
+      return;
+    }
   }
 
   console.log('testFft2Hermitian: Test passed!');

index.ts

@@ -10,8 +10,7 @@ import {
   testDisplacementFieldIfft2,
   testFft2Hermitian,
   testDisplacementFieldIfft2HermitianProperty,
-  testFft2Combined
-  
+  testFft2Combined,
 } from './test';
 
 import { Simulation } from './simulation';
@@ -21,18 +20,17 @@ import { Simulation } from './simulation';
 // testFft();
 // testDft2();
 // testFft2();
-// testDisplacementFieldIfft2();
-testDisplacementFieldIfft2HermitianProperty();
 // testFft2Hermitian();
 // testFft2Combined();
-
+// testDisplacementFieldIfft2();
+// testDisplacementFieldIfft2HermitianProperty();
 
 const simulation = new Simulation(
   document.getElementById('viewport') as HTMLCanvasElement
 );
 simulation.start({
   size: 10,
-  alignment: .01,
+  alignment: 0.01,
   minWave: 0.001,
   geometryResolution: 256,
   resolution: 512,

wave/displacement-field.test.ts

@@ -2,19 +2,7 @@ import { vec2 } from 'gl-matrix';
 
 import { createMockGpu } from '../graphics/gpu.mock';
 import { DisplacementFieldFactory } from './displacement-field-factory';
-import {
-  float4ToComplex2d,
-  ifft2,
-  fft2,
-  abs,
-  sub,
-  add,
-  areAqual,
-  complex,
-  Complex,
-  mult,
-  re,
-} from '../fft';
+import { float4ToComplex2d, ifft2, abs, sub, im } from '../fft';
 
 export const testDisplacementFieldIfft2 = () => {
   const gpu = createMockGpu();
@@ -107,8 +95,8 @@ export const testDisplacementFieldIfft2HermitianProperty = () => {
     alignment: 0.0,
     croppiness: -0.6,
     size: 100,
-    resolution: 8,
-    geometryResolution: 8,
+    resolution: 512,
+    geometryResolution: 256,
     wind: vec2.fromValues(28.0, 28.0),
     strength: 1000000,
   });
@@ -121,7 +109,7 @@ export const testDisplacementFieldIfft2HermitianProperty = () => {
       4
   );
 
-  for (let slot of [0, 1]) {
+  for (let slot of [0, 1, 2, 3]) {
     for (let couple of [0, 1]) {
       displacementField['generateSpectrumTextures'](performance.now());
 
@@ -148,19 +136,19 @@ export const testDisplacementFieldIfft2HermitianProperty = () => {
         couple * 2
       ).flat(1);
 
-console.log(actual);
       // Assert
-      // const diff = actual.map((a, i) => abs(sub(a, expected[i])));
-      // const closeEnougth = diff.every((v) => v <= 1.0e-5);
-      // if (!closeEnougth) {
-      //   console.warn(
-      //     `testDisplacementFieldIfft2 [slot ${slot}-${couple}]: Test don't passesd: `,
-      //     diff
-      //   );
-      //   return;
-      // }
+      const _im = actual.map((v) => im(v));
+      const isReal = _im.every((v) => Math.abs(v) <= 1.0e-5);
+      if (!isReal) {
+        console.warn(
+          `testDisplacementFieldIfft2HermitianProperty [slot ${slot}-${couple}]: Test don't pass: [max: ${Math.max(
+            ..._im
+          )}, min: ${Math.min(..._im)}]`
+        );
+        return;
+      }
       console.log(
-        `testDisplacementFieldIfft2 [slot ${slot}-${couple}]: Test passed!`
+        `testDisplacementFieldIfft2HermitianProperty [slot ${slot}-${couple}]: Test passed!`
       );
     }
   }

wave/programs/hk.ts

@@ -54,36 +54,43 @@ void main() {
   vec2 x = vec2(ivec2(gl_FragCoord.xy)) - float(resolution) * 0.5; //  [-N/2, N/2]
   vec2 k = vec2(2.0 * PI * x.x / size, 2.0 * PI * x.y / size);
   float kLen = length(k);
+
   if(kLen == 0.0f) {
     height = slope = displacement = ddisplacement = vec4(0.0f);
     return;
   }
+
   float w = sqrt(g * kLen);
   vec4 h0Texel = texelFetch(h0Texture, ivec2(gl_FragCoord.xy), 0).rgba;
 
   complex e = eix(w * t);
   complex h0 = complex(h0Texel.x, h0Texel.y);
   complex h0MinConj = complex(h0Texel.z, h0Texel.w);
-  
   complex hy = add(mult(h0, e), mult(h0MinConj, conj(e)));
-  complex dx = mult(complex(0.0f, -k.x / kLen), hy);
-  complex dz = mult(complex(0.0f, -k.y / kLen), hy);
-  complex sx = mult(complex(0.0f, k.x), hy);
-  complex sz = mult(complex(0.0f, k.y), hy);
-  complex dxdx = scale(hy, k.x * k.x / kLen);
-  complex dzdz = scale(hy, k.y * k.y / kLen);
-  complex dxdz = scale(hy, k.y * k.x / kLen);
-
-  // if(
-  //     uint(gl_FragCoord.x) == 0u || 
-  //     uint(gl_FragCoord.x) == resolution - 1u || 
-  //     uint(gl_FragCoord.y) == 0u || 
-  //     uint(gl_FragCoord.y) == resolution - 1u
-  //   ) 
-  // {
-  //   sx = complex(0.0f, 0.0f);
-  //   sz = complex(0.0f, 0.0f);
-  // }
+  complex sx = complex(0.0f, 0.0f);
+  complex sz = complex(0.0f, 0.0f);
+  complex dx = complex(0.0f, 0.0f);
+  complex dz = complex(0.0f, 0.0f);
+  
+  complex dxdx = complex(0.0f, 0.0f);
+  complex dzdz = complex(0.0f, 0.0f);
+  complex dxdz = complex(0.0f, 0.0f);
+
+  if(int(gl_FragCoord.x) != 0) {
+    sx = mult(complex(0.0f, k.x), hy);
+    dx = mult(complex(0.0f, -k.x / kLen), hy);
+    dxdx = scale(hy, k.x * k.x / kLen);
+  }
+
+  if(int(gl_FragCoord.y) != 0) {
+    sz = mult(complex(0.0f, k.y), hy);
+    dz = mult(complex(0.0f, -k.y / kLen), hy);
+    dzdz = scale(hy, k.y * k.y / kLen);
+
+    if(int(gl_FragCoord.x) != 0) {
+      dxdz = scale(hy, k.y * k.x / kLen);
+    }
+  }
 
   height = vec4(hy.re, hy.im, dxdz.re, dxdz.im);
   slope = vec4(sx.re, sx.im, sz.re, sz.im);