refactor(gp): fix #256 replace enum w/ type alias

BREAKING CHANGE: replace GeneType w/ type alias
thi-ng · Dec 22, 2020 · 6fd4291 · 6fd4291
1 parent b9cfacb
commit 6fd4291
Show file tree

Hide file tree

Showing 6 changed files with 173 additions and 176 deletions.
diff --git a/packages/gp/src/api.ts b/packages/gp/src/api.ts
@@ -1,10 +1,7 @@
 import type { Fn, Fn2 } from "@thi.ng/api";
 import type { IRandom } from "@thi.ng/random";
 
-export enum GeneType {
-    TERMINAL,
-    OP,
-}
+export type GeneType = "term" | "op";
 
 /**
  * Type alias for S-expression based AST
@@ -66,12 +63,12 @@ export interface MEPOpts<OP, T> extends GPOpts<OP, T, number> {
 }
 
 export interface TerminalGene<T> {
-    type: GeneType.TERMINAL;
+    type: "term";
     value: T;
 }
 
 export interface OpGene<OP, A> {
-    type: GeneType.OP;
+    type: "op";
     op: OP;
     args: A[];
 }
diff --git a/packages/gp/src/ast.ts b/packages/gp/src/ast.ts
@@ -2,7 +2,7 @@ import { assert } from "@thi.ng/api";
 import { SYSTEM } from "@thi.ng/random";
 import { iterate, iterator, repeatedly, takeWhile } from "@thi.ng/transducers";
 import { Location, zipper } from "@thi.ng/zipper";
-import { ASTNode, ASTOpts, GeneType, OpGene } from "./api";
+import type { ASTNode, ASTOpts, OpGene } from "./api";
 import { opNode, probabilities, terminalNode } from "./utils";
 
 export class AST<OP, T> {
@@ -136,7 +136,7 @@ export class AST<OP, T> {
     protected asZipper(tree: ASTNode<OP, T>) {
         return zipper<ASTNode<OP, T>>(
             {
-                branch: (x) => x.type === GeneType.OP,
+                branch: (x) => x.type === "op",
                 children: (x) => (<OpGene<OP, ASTNode<OP, T>>>x).args,
                 factory: (n, args) =>
                     opNode((<OpGene<OP, ASTNode<OP, T>>>n).op, args),

diff --git a/packages/gp/src/mep.ts b/packages/gp/src/mep.ts
@@ -1,7 +1,7 @@
 import { inRange } from "@thi.ng/math";
 import { SYSTEM } from "@thi.ng/random";
 import { repeatedly } from "@thi.ng/transducers";
-import { ASTNode, GeneType, MEPChromosome, MEPGene, MEPOpts } from "./api";
+import type { ASTNode, MEPChromosome, MEPGene, MEPOpts } from "./api";
 import { opNode, probabilities, terminalNode } from "./utils";
 
 export class MEP<OP, T> {
@@ -55,7 +55,7 @@ export class MEP<OP, T> {
         const depths: number[] = [];
         for (let i = 0; i < chromosome.length; i++) {
             const gene = chromosome[i];
-            if (gene.type == GeneType.TERMINAL) {
+            if (gene.type == "term") {
                 res[i] = gene;
                 depths[i] = 1;
             } else {

diff --git a/packages/gp/src/utils.ts b/packages/gp/src/utils.ts
@@ -1,14 +1,14 @@
 import { assert } from "@thi.ng/api";
 import { add, choices, range } from "@thi.ng/transducers";
-import { GeneType, GPOpts, OpGene, TerminalGene } from "./api";
+import type { GPOpts, OpGene, TerminalGene } from "./api";
 
 export const terminalNode = <T>(value: T): TerminalGene<T> => ({
-    type: GeneType.TERMINAL,
+    type: "term",
     value,
 });
 
 export const opNode = <OP, A>(op: OP, args: A[]): OpGene<OP, A> => ({
-    type: GeneType.OP,
+    type: "op",
     op,
     args,
 });

diff --git a/packages/gp/test/ast.ts b/packages/gp/test/ast.ts
@@ -23,33 +23,33 @@ describe("gp (ast)", () => {
 
     it("generate", () => {
         assert.deepStrictEqual(ast.randomAST(), {
-            type: 1,
+            type: "op",
             op: "+",
             args: [
                 {
-                    type: 1,
+                    type: "op",
                     op: "-",
                     args: [
                         {
-                            type: 0,
+                            type: "term",
                             value: 5,
                         },
                         {
-                            type: 0,
+                            type: "term",
                             value: 1,
                         },
                     ],
                 },
                 {
-                    type: 1,
+                    type: "op",
                     op: "*",
                     args: [
                         {
-                            type: 0,
+                            type: "term",
                             value: 8,
                         },
                         {
-                            type: 0,
+                            type: "term",
                             value: 3,
                         },
                     ],