Merge pull request #128 from UnstableDesign/4.0-glitchsatin

new param to glitchsatin

src/app/core/operations/glitchsatin/glitchsatin.ts

@@ -0,0 +1,239 @@
+import { Cell, NumParam, Operation, OpInput, OpParamVal } from "../../model/datatypes";
+import { initDraftFromDrawdown } from "../../model/drafts";
+import { getOpParamValById } from "../../model/operations";
+import { Sequence } from "../../model/sequence";
+
+
+const name = "glitchsatin";
+const old_names = [];
+
+//PARAMS
+const ends: NumParam =
+{
+  name: 'ends',
+  type: 'number',
+  min: 1,
+  max: 1000000,
+  value: 40,
+  dx: ""
+};
+
+const pics: NumParam =
+{
+  name: 'pics',
+  type: 'number',
+  min: 1,
+  max: 100000,
+  value: 40,
+  dx: ""
+}
+
+const odds_min: NumParam =
+{
+  name: 'min float length',
+  type: 'number',
+  min: 1,
+  max: 100000,
+  value: 2,
+  dx: 'average float length'
+};
+
+const odds_max: NumParam =
+{
+  name: 'max float length',
+  type: 'number',
+  min: 1,
+  max: 100000,
+  value: 24,
+  dx: 'max float length'
+};
+
+const frequency: NumParam =
+{
+  name: 'float length frequency',
+  type: 'number',
+  min: 1,
+  max: 100,
+  value: 50,
+  dx: 'float length frequency'
+};
+
+const params = [ends, pics, odds_min, odds_max, frequency];
+
+//INLETS
+const inlets = [];
+
+const perform = (param_vals: Array<OpParamVal>, op_inputs: Array<OpInput>) => {
+  const cols: number = getOpParamValById(0, param_vals);
+  const rows: number = getOpParamValById(1, param_vals);;
+  const odds_min: number = getOpParamValById(2, param_vals);
+  const odds_max: number = getOpParamValById(3, param_vals);
+  const frequency: number = getOpParamValById(4, param_vals);
+
+  // make the grid
+  let grid = [];
+  for (let i = 0; i < cols; i++) {
+    grid[i] = [];
+    for (let j = 0; j < rows; j++) {
+      grid[i][j] = false;
+    }
+  }
+
+  // glitch satin functions
+  grid = printDraftForVerticalDirection(grid, odds_min, odds_max, frequency);
+  grid = fillHorizontalGaps(grid, odds_min, odds_max, frequency);
+
+  // make drawdown
+  let seq_grid = new Sequence.TwoD();
+  for (let i = 0; i < rows; i++) {
+    let row_1 = grid[i].map(el => {
+      if (el == false)
+        return 0
+      else
+        return 1;
+    })
+
+    let seq = new Sequence.OneD().pushRow(row_1);
+    seq_grid.pushWeftSequence(seq.val())
+  }
+
+  let draft = initDraftFromDrawdown(seq_grid.export());
+
+  return Promise.resolve([draft]);
+}
+
+const generateName = (param_vals: Array<OpParamVal>, op_inputs: Array<OpInput>): string => {
+  const floatlength: number = getOpParamValById(2, param_vals);
+
+  return 'gsatin' + floatlength;
+}
+
+export const glitchsatin: Operation = { name, old_names, params, inlets, perform, generateName };
+
+function printDraftForVerticalDirection(grid: Array<Array<boolean>>, odds_denom_min: number, odds_denom_max: number, frequency: number): Array<Array<boolean>> {
+  let cols = grid.length;
+  let rows = grid[0].length;
+  let odds_step = (odds_denom_max - odds_denom_min) / cols;
+  let new_freq = remap(frequency, cols);
+
+  for (let x = 0; x < cols; x++) {
+    let y = 0;
+    let currentFilledV = (Math.random() < 0.5);  // Initialize randomly
+    let odds = 1 / (odds_denom_min + odds_step * new_freq); // change new_freq to x for gradient 
+    let maxStreak = Math.round(1 / odds);
+
+    while (y < rows) {
+      let streakV = Math.floor(Math.random() * maxStreak) + 1;
+      for (let i = 0; i < streakV && y < rows; i++) {
+        grid[x][y] = currentFilledV;
+        y++;
+      }
+      currentFilledV = !currentFilledV;
+    }
+  }
+
+  return grid;
+}
+
+function fillHorizontalGaps(grid: Array<Array<boolean>>, odds_denom_min: number, odds_denom_max: number, frequency: number): Array<Array<boolean>> {
+  let cols = grid.length;
+  let rows = grid[0].length;
+  let odds_step = (odds_denom_max - odds_denom_min) / cols;
+  let new_freq = remap(frequency, cols);
+
+  for (let y = 0; y < rows; y++) {
+    for (let x = 0; x < cols; x++) {
+      let odds = 1 / (odds_denom_min + odds_step * new_freq); // change new_freq to x for gradient 
+      if (!grid[x][y]) {
+        let fillType = Math.random() < odds;
+        grid[x][y] = fillType;
+      }
+    }
+  }
+
+  return grid;
+}
+
+function remap(num: number, cols: number): number {
+  const oldMin = 1;
+  const oldMax = 100;
+  const newMin = 0;
+  const newMax = cols - 1;
+
+  return ((num - oldMin) / (oldMax - oldMin)) * (newMax - newMin) + newMin;
+}
+
+
+
+//version with single odds
+// const  perform = (param_vals: Array<OpParamVal>, op_inputs: Array<OpInput>) => {
+
+
+//     const cols: number = getOpParamValById(0, param_vals);
+//     const rows: number = getOpParamValById(1, param_vals);;
+//     const odds: number = getOpParamValById(2, param_vals);
+
+//     let grid_1 = [];
+//     let grid_2 = [];
+
+//     for (let i = 0; i < cols; i++) {
+//       grid_1[i] = [];
+//       grid_2[i] = [];
+//       for (let j = 0; j < rows; j++) {
+//         grid_1[i][j] = false;
+//         grid_2[i][j] = false;
+//       }
+//     }
+
+//     grid_1  = printDraftForVerticalDirection(cols, rows, grid_1, odds);
+//     grid_1 =  fillHorizontalGaps(cols, rows, grid_1, odds);
+
+
+//     grid_2  = printDraftForVerticalDirection(cols, rows, grid_2, odds/2);
+//     grid_2 =  fillHorizontalGaps(cols, rows, grid_2, odds/2);
+
+
+
+//     let seq_grid = new Sequence.TwoD();
+
+//     for (let i = 0; i < rows; i++) {
+
+//       let row_1 = grid_1[i].map(el => {
+//           if(el == false)
+//           return 0
+//           else
+//           return 1;
+//       })
+
+//       let row_2 = grid_2[i].map(el => {
+//           if(el == false)
+//           return 0
+//           else
+//           return 1;
+//       })
+
+//       let seq = new Sequence.OneD().pushRow(row_1).pushRow(row_2);
+//       seq_grid.pushWeftSequence(seq.val())
+
+
+//     }
+
+//     let draft = initDraftFromDrawdown(seq_grid.export());
+
+
+//   //   let drawdown: Array<Array<Cell>> = [];
+//   //   for (let i = 0; i < cols; i++) {
+//   //     drawdown[i] = [];
+//   //     for (let j = 0; j < rows; j++) {
+//   //       drawdown[i][j] = createCell(grid[i][j]);
+//   //     }
+//   //   }
+
+
+//   //   let draft = initDraftFromDrawdown(drawdown);
+
+
+//     return Promise.resolve([draft]);
+
+// }   
+

src/app/core/provider/operation.service.ts

@@ -73,6 +73,7 @@ import { sawtooth } from '../operations/sawtooth/sawtooth';
 import { erase_blank } from '../operations/erase_blank/erase_blank';
 import { shift } from '../operations/shift/shift';
 import {flip} from '../operations/flip/flip'
+import { glitchsatin } from '../operations/glitchsatin/glitchsatin';
 @Injectable({
   providedIn: 'root'
 })
@@ -168,6 +169,7 @@ export class OperationService {
     this.ops.push(combinatorics);
     this.ops.push(sinewave);
     this.ops.push(sawtooth);
+    this.ops.push(glitchsatin)
     }
 
 

src/app/draftdetail/draftviewer/selection/selection.component.ts

@@ -89,6 +89,14 @@ export class SelectionComponent implements OnInit {
     this.parent = document.getElementById('selection-container');
   }
 
+  clearSelection(){
+    this.start = {i: 0, si:0, j: 0};
+    this.end = {i: 0, si:0, j: 0};
+    this.top = 0;
+    this.left = 0;
+
+  }
+
 
   designActionChange(action : string){
 

src/app/draftdetail/simulation/simulation.component.ts

@@ -166,6 +166,7 @@ export class SimulationComponent implements OnInit {
    * @param end 
    */
   updateSelection(start: Interlacement, end: Interlacement){
+    console.log("UPDATE SELECTION CALLED", start, end)
 
     let width = end.j - start.j;
     if(width <= 0) return;

src/assets/json/op_classifications.json

@@ -17,7 +17,8 @@
                 "bwimagemap",
                 "sine",
                 "sawtooth",
-                "satinish"
+                "satinish",
+                "glitchsatin"
             ]
         },
         {

src/assets/json/op_descriptions.json

@@ -261,6 +261,12 @@
             "description": "Generates a draft of the size specified where the value of each interlacement is generated randomly.",
             "application": "We don't know of current random draft generators, so this one is just for the fun of applying code-based random number generators to weaving structures" 
         },
+        {
+            "name":"glitchsatin",
+            "displayname": "glitch satin",
+            "description": "Generates a glitch satin.",
+            "application": "For Kathryn" 
+        },
         {
             "name":"combos",
             "displayname": "all possible structures",