テストを追加

qniapp · Aug 7, 2023 · f4ef79e · f4ef79e
1 parent 3451335
commit f4ef79e
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 26 deletions.
diff --git a/packages/common/src/complex.ts b/packages/common/src/complex.ts
@@ -147,17 +147,17 @@ export class Complex {
     return this.ln().times(Complex.from(exponent)).exp()
   }
 
-  exp(): Complex {
-    return Complex.polar(Math.exp(this.real), this.imag)
+  toString(format?: Format): string {
+    format = format || Format.EXACT
+    return format.allowAbbreviation ? this.toStringAllowSingleValue(format) : this.toStringBothValues(format)
   }
 
-  ln(): Complex {
-    return new Complex(Math.log(this.abs()), this.phase())
+  private exp(): Complex {
+    return Complex.polar(Math.exp(this.real), this.imag)
   }
 
-  toString(format?: Format): string {
-    format = format || Format.EXACT
-    return format.allowAbbreviation ? this.toStringAllowSingleValue(format) : this.toStringBothValues(format)
+  private ln(): Complex {
+    return new Complex(Math.log(this.abs()), this.phase())
   }
 
   private toStringAllowSingleValue(format: Format): string {

diff --git a/packages/common/test/complex.test.ts b/packages/common/test/complex.test.ts
@@ -1,7 +1,13 @@
 import {Complex} from '../src/complex'
+import {Format} from '../src/format'
 import {equate} from '../src/equate'
 
 describe('Complex', () => {
+  const π = Math.PI
+  const i = Complex.I
+  const e = new Complex(Math.E, 0)
+  const s = Math.sqrt(0.5)
+
   let c: Complex
 
   describe('from', () => {
@@ -196,7 +202,7 @@ describe('Complex', () => {
       })
 
       test('equal i', () => {
-        expect(equate(c, Complex.I)).toBeTruthy()
+        expect(equate(c, i)).toBeTruthy()
       })
     })
 
@@ -206,7 +212,7 @@ describe('Complex', () => {
       })
 
       test('equal -i', () => {
-        expect(equate(c, Complex.I.times(-1))).toBeTruthy()
+        expect(equate(c, i.times(-1))).toBeTruthy()
       })
     })
 
@@ -312,7 +318,7 @@ describe('Complex', () => {
 
     describe('I', () => {
       beforeEach(() => {
-        c = Complex.I
+        c = i
       })
 
       test('equal i', () => {
@@ -472,7 +478,7 @@ describe('Complex', () => {
 
     describe('0+i', () => {
       test('equal 1', () => {
-        expect(Complex.I.norm2()).toBe(1)
+        expect(i.norm2()).toBe(1)
       })
     })
 
@@ -534,7 +540,7 @@ describe('Complex', () => {
 
     describe('0+i', () => {
       test('equal 1', () => {
-        expect(Complex.I.abs()).toBe(1)
+        expect(i.abs()).toBe(1)
       })
     })
 
@@ -620,37 +626,37 @@ describe('Complex', () => {
 
     describe('0+0.5i', () => {
       test('equal i', () => {
-        expect(new Complex(0, 0.5).unit().isEqualTo(Complex.I))
+        expect(new Complex(0, 0.5).unit().isEqualTo(i))
       })
     })
 
     describe('0+i', () => {
       test('equal i', () => {
-        expect(Complex.I.unit().isEqualTo(Complex.I))
+        expect(i.unit().isEqualTo(i))
       })
     })
 
     describe('0+2i', () => {
       test('equal i', () => {
-        expect(new Complex(0, 2).unit().isEqualTo(Complex.I))
+        expect(new Complex(0, 2).unit().isEqualTo(i))
       })
     })
 
     describe('0-0.5i', () => {
       test('equal -i', () => {
-        expect(new Complex(0, -0.5).unit().isEqualTo(Complex.I.times(-1)))
+        expect(new Complex(0, -0.5).unit().isEqualTo(i.times(-1)))
       })
     })
 
     describe('0-i', () => {
       test('equal -i', () => {
-        expect(new Complex(0, -1).unit().isEqualTo(Complex.I.times(-1)))
+        expect(new Complex(0, -1).unit().isEqualTo(i.times(-1)))
       })
     })
 
     describe('0-2i', () => {
       test('equal -i', () => {
-        expect(new Complex(0, -2).unit().isEqualTo(Complex.I.times(-1)))
+        expect(new Complex(0, -2).unit().isEqualTo(i.times(-1)))
       })
     })
 
@@ -681,7 +687,7 @@ describe('Complex', () => {
 
     describe('0+i', () => {
       test('equal π/2', () => {
-        expect(Complex.I.phase()).toBeCloseTo(Math.PI / 2)
+        expect(i.phase()).toBeCloseTo(Math.PI / 2)
       })
     })
 
@@ -711,11 +717,6 @@ describe('Complex', () => {
   })
 
   describe('raisedTo', () => {
-    const π = Math.PI
-    const i = Complex.I
-    const e = new Complex(Math.E, 0)
-    const s = Math.sqrt(0.5)
-
     describe('e^-iπ/2', () => {
       test('equal -i', () => {
         expect(e.raisedTo(i.times(-π / 2))).toEqual(new Complex(0, -1))
@@ -730,7 +731,7 @@ describe('Complex', () => {
 
     describe('e^iπ/2', () => {
       test('equal i', () => {
-        expect(e.raisedTo(i.times(π / 2))).toEqual(Complex.I)
+        expect(e.raisedTo(i.times(π / 2))).toEqual(i)
       })
     })
 
@@ -802,7 +803,7 @@ describe('Complex', () => {
 
     describe('(-1)^½', () => {
       test('equal i', () => {
-        expect(new Complex(-1, 0).raisedTo(0.5)).toEqual(Complex.I)
+        expect(new Complex(-1, 0).raisedTo(0.5)).toEqual(i)
       })
     })
 
@@ -847,4 +848,130 @@ describe('Complex', () => {
       })
     })
   })
+
+  describe('toString', () => {
+    describe('ZERO', () => {
+      test("equal '0'", () => {
+        expect(Complex.ZERO.toString()).toBe('0')
+      })
+    })
+
+    describe('ONE', () => {
+      test("equal '1'", () => {
+        expect(Complex.ONE.toString()).toBe('1')
+      })
+    })
+
+    describe('I', () => {
+      test("equal 'i'", () => {
+        expect(i.toString()).toBe('i')
+      })
+    })
+
+    describe('1+i', () => {
+      test("equal '1+i'", () => {
+        expect(new Complex(1, 1).toString()).toBe('1+i')
+      })
+    })
+
+    describe('-1', () => {
+      test("equal '-1'", () => {
+        expect(new Complex(-1, 0).toString()).toBe('-1')
+      })
+    })
+
+    describe('-i', () => {
+      test("equal '-i'", () => {
+        expect(new Complex(0, -1).toString()).toBe('-i')
+      })
+    })
+
+    describe('-1-i', () => {
+      test("equal '-1-i'", () => {
+        expect(new Complex(-1, -1).toString()).toBe('-1-i')
+      })
+    })
+
+    describe('2', () => {
+      test("equal '2'", () => {
+        expect(new Complex(2, 0).toString()).toBe('2')
+      })
+    })
+
+    describe('2i', () => {
+      test("equal '2i'", () => {
+        expect(new Complex(0, 2).toString()).toBe('2i')
+      })
+    })
+
+    describe('2+2i', () => {
+      test("equal '2+2i'", () => {
+        expect(new Complex(2, 2).toString()).toBe('2+2i')
+      })
+    })
+
+    describe('2-3i', () => {
+      test("equal '2-3i'", () => {
+        expect(new Complex(2, -3).toString()).toBe('2-3i')
+      })
+    })
+
+    describe('√½-⅓i', () => {
+      test("equal '√½-⅓i'", () => {
+        expect(new Complex(Math.sqrt(1 / 2), -1 / 3).toString()).toBe('√½-⅓i')
+      })
+    })
+
+    describe('2-3i', () => {
+      beforeEach(() => {
+        c = new Complex(2, -3)
+      })
+
+      test('Format', () => {
+        expect(c.toString(Format.CONSISTENT)).toBe('+2.00-3.00i')
+        expect(c.toString(Format.EXACT)).toBe('2-3i')
+        expect(c.toString(Format.MINIFIED)).toBe('2-3i')
+        expect(c.toString(Format.SIMPLIFIED)).toBe('2-3i')
+      })
+    })
+
+    describe('-2-3i', () => {
+      beforeEach(() => {
+        c = new Complex(-2, -3)
+      })
+
+      test('Format', () => {
+        expect(c.toString(Format.CONSISTENT)).toBe('-2.00-3.00i')
+        expect(c.toString(Format.EXACT)).toBe('-2-3i')
+        expect(c.toString(Format.MINIFIED)).toBe('-2-3i')
+        expect(c.toString(Format.SIMPLIFIED)).toBe('-2-3i')
+      })
+    })
+
+    describe('-i', () => {
+      beforeEach(() => {
+        c = new Complex(0, -1)
+      })
+
+      test('Format', () => {
+        expect(c.toString(Format.CONSISTENT)).toBe('+0.00-1.00i')
+        expect(c.toString(Format.EXACT)).toBe('-i')
+        expect(c.toString(Format.MINIFIED)).toBe('-i')
+        expect(c.toString(Format.SIMPLIFIED)).toBe('-i')
+      })
+    })
+
+    describe('1/3', () => {
+      beforeEach(() => {
+        c = new Complex(1 / 3, 0)
+      })
+
+      test('Format', () => {
+        expect(c.toString(Format.CONSISTENT)).toBe('+0.33+0.00i')
+        expect(c.toString(Format.EXACT)).toBe('⅓')
+        expect(c.toString(Format.MINIFIED)).toBe('⅓')
+        expect(c.toString(Format.SIMPLIFIED)).toBe('⅓')
+      })
+    })
+  })
 })