improve coloring

64json · 64json · commit 219e34332dcb · 2016-06-19T22:19:33.000+09:00
diff --git a/algorithm/cryptography/affine_cipher/basic/code.js b/algorithm/cryptography/affine_cipher/basic/code.js
@@ -1,82 +1,83 @@
 /*
-	code assumes that plainText contains ONLY LOWER CASE ALPHABETS
-*/
+ code assumes that plainText contains ONLY LOWER CASE ALPHABETS
+ */
 
 Number.prototype.mod = function (n) {
-    return ((this%n)+n)%n;
+  return ((this % n) + n) % n;
 };
 
 var keys = {a: 5, b: 7},
-	N = 26;
+  N = 26;
 
-function encrypt (plainText) {
-	var cypherText = '';
-	function cryptAlpha (alpha) {
-		var index = alpha.charCodeAt (0) - 'a'.charCodeAt (0);
-		var result = ((keys.a * index) + keys.b).mod (N);
+function encrypt(plainText) {
+  var cypherText = '';
 
-		logger._print ('Index of ' + alpha + ' = ' + index);
+  function cryptAlpha(alpha) {
+    var index = alpha.charCodeAt(0) - 'a'.charCodeAt(0);
+    var result = ((keys.a * index) + keys.b).mod(N);
 
-		result += 'a'.charCodeAt (0);
-		return String.fromCharCode (result);
-	}
+    logger._print('Index of ' + alpha + ' = ' + index);
 
-	logger._print ('Beginning Affine Encryption');
-	logger._print ('Encryption formula: <b>((keys.a * index_of_alphabet) + keys.b) % N</b>');
-	logger._print ('keys.a=' + keys.a + ', keys.b=' + keys.b + ', N=' + N);
+    result += 'a'.charCodeAt(0);
+    return String.fromCharCode(result);
+  }
 
-	for (var i in plainText) {
-		ptTracer._select (i)._wait ();
-		ptTracer._deselect (i)._wait ();
+  logger._print('Beginning Affine Encryption');
+  logger._print('Encryption formula: <b>((keys.a * index_of_alphabet) + keys.b) % N</b>');
+  logger._print('keys.a=' + keys.a + ', keys.b=' + keys.b + ', N=' + N);
 
-		cypherText += cryptAlpha (plainText [i]);
+  for (var i in plainText) {
+    ptTracer._select(i)._wait();
+    ptTracer._deselect(i);
 
-		ptTracer._notify (i, cypherText.slice (-1))._wait ();
-		ptTracer._denotify (i)._wait ();
-	}
+    cypherText += cryptAlpha(plainText [i]);
 
-	return cypherText;
+    ptTracer._notify(i, cypherText.slice(-1))._wait();
+    ptTracer._denotify(i);
+  }
+
+  return cypherText;
 }
 
-function decrypt (cypherText) {
-	var plainText = '';
-	var aInverse = (function () {
-		for (var i = 1; i < N; i++) {
-			if ( ((keys.a * i).mod (N)) === 1 ) {
-				return i;
-			}
-		}
-	}) ();
+function decrypt(cypherText) {
+  var plainText = '';
+  var aInverse = (function () {
+    for (var i = 1; i < N; i++) {
+      if (((keys.a * i).mod(N)) === 1) {
+        return i;
+      }
+    }
+  })();
 
-	logger._print ('a<sup>-1</sup> = ' + aInverse);
+  logger._print('a<sup>-1</sup> = ' + aInverse);
 
-	function decryptAlpha (alpha) {
-		var index = alpha.charCodeAt (0) - 'a'.charCodeAt (0);
-		var result = (aInverse * (index - keys.b)).mod (N);
+  function decryptAlpha(alpha) {
+    var index = alpha.charCodeAt(0) - 'a'.charCodeAt(0);
+    var result = (aInverse * (index - keys.b)).mod(N);
 
-		logger._print ('Index of ' + alpha + ' = ' + index);
+    logger._print('Index of ' + alpha + ' = ' + index);
 
-		result += 'a'.charCodeAt (0);
-		return String.fromCharCode (result);
-	}
+    result += 'a'.charCodeAt(0);
+    return String.fromCharCode(result);
+  }
 
-	logger._print ('Beginning Affine Decryption');
-	logger._print ('Decryption formula: <b>(a<sup>-1</sup> * (index - keys.b)) % N</b>');
-	logger._print ('keys.b=' + keys.b + ', N=' + N);
+  logger._print('Beginning Affine Decryption');
+  logger._print('Decryption formula: <b>(a<sup>-1</sup> * (index - keys.b)) % N</b>');
+  logger._print('keys.b=' + keys.b + ', N=' + N);
 
-	for (var i in cypherText) {
-		ctTracer._select (i)._wait ();
-		ctTracer._deselect (i)._wait ();
+  for (var i in cypherText) {
+    ctTracer._select(i)._wait();
+    ctTracer._deselect(i)._wait();
 
-		plainText += decryptAlpha (cypherText [i]);
+    plainText += decryptAlpha(cypherText [i]);
 
-		ctTracer._notify (i, plainText.slice (-1))._wait ();
-		ctTracer._denotify (i)._wait ();
-	}
+    ctTracer._notify(i, plainText.slice(-1))._wait();
+    ctTracer._denotify(i)._wait();
+  }
 
-	return plainText;
+  return plainText;
 }
 
-var cipherText = encrypt (plainText);
-ctTracer._setData (cipherText);
-decrypt (cipherText);
+var cipherText = encrypt(plainText);
+ctTracer._setData(cipherText);
+decrypt(cipherText);
diff --git a/js/module/tracer/array2d.js b/js/module/tracer/array2d.js
@@ -14,16 +14,12 @@ class Array2DTracer extends Tracer {
   constructor(name) {
     super(name);
 
-    this.selectColor = '#2962ff';
-    this.notifyColor = '#c51162';
-
     if (this.isNew) initView(this);
   }
 
   _notify(x, y, v) {
     this.manager.pushStep(this.capsule, {
       type: 'notify',
-      color: this.notifyColor,
       x: x,
       y: y,
       v: v
@@ -145,8 +141,7 @@ class Array2DTracer extends Tracer {
         }
     }
     var step = {
-      type: type,
-      color: this.selectColor
+      type: type
     };
     $.extend(step, coord);
     this.manager.pushStep(this.capsule, step);
@@ -163,8 +158,8 @@ class Array2DTracer extends Tracer {
       case 'denotify':
       case 'select':
       case 'deselect':
-        var colorClass = step.color;
-        var addClass = step.type == 'select' || step.type == 'notify';
+        var color = step.type == 'select' || step.type == 'deselect' ? this.color.selected : this.color.notified;
+        var paint = step.type == 'select' || step.type == 'notify';
         var sx = step.sx;
         var sy = step.sy;
         var ex = step.ex;
@@ -173,7 +168,7 @@ class Array2DTracer extends Tracer {
         if (sy === undefined) sy = step.y;
         if (ex === undefined) ex = step.x;
         if (ey === undefined) ey = step.y;
-        this.paintColor(sx, sy, ex, ey, colorClass, addClass);
+        this.paintColor(sx, sy, ex, ey, color, paint);
         break;
       case 'separate':
         this.deseparate(step.x, step.y);
@@ -292,22 +287,19 @@ class Array2DTracer extends Tracer {
     this.refresh();
   }
 
-  paintColor(sx, sy, ex, ey, colorClass, addClass) {
+  paintColor(sx, sy, ex, ey, color, paint) {
     for (var i = sx; i <= ex; i++) {
       var $row = this.$table.find('.mtbl-row').eq(i);
       for (var j = sy; j <= ey; j++) {
         var $col = $row.find('.mtbl-col').eq(j);
-        if(addClass) $col[0].style.backgroundColor = colorClass;
-        else $col[0].style.backgroundColor = "";
+        if (paint) $col.css('background', color);
+        else $col.css('background', '');
       }
     }
   }
 
   clearColor() {
-    var divs = this.$table.find('.mtbl-col');
-    for (var i = 0; i < divs.length; i++){
-      divs[i].style.backgroundColor = "";
-    }
+    this.$table.find('.mtbl-col').css('background', '');
   }
 
   separate(x, y) {
diff --git a/js/module/tracer/chart.js b/js/module/tracer/chart.js
@@ -10,10 +10,6 @@ class ChartTracer extends Tracer {
   constructor(name) {
     super(name);
 
-    this.selectColor = '#2962ff';
-    this.notifyColor = '#c51162';
-    this.defaultColor = 'rgb(136, 136, 136)';
-
     if (this.isNew) initView(this);
   }
 
@@ -25,7 +21,7 @@ class ChartTracer extends Tracer {
     }
 
     var color = [];
-    for (var i = 0; i < C.length; i++) color.push(this.defaultColor);
+    for (var i = 0; i < C.length; i++) color.push(this.color.default);
     this.chart.config.data = {
       labels: C.map(String),
       datasets: [{
@@ -81,7 +77,7 @@ class ChartTracer extends Tracer {
       case 'denotify':
       case 'select':
       case 'deselect':
-        let color = step.type == 'notify' ? this.notifyColor : step.type == 'select' ? this.selectColor : this.defaultColor;
+        let color = step.type == 'notify' ? this.color.notified : step.type == 'select' ? this.color.selected : this.color.default;
         if (step.e !== undefined)
           for (var i = step.s; i <= step.e; i++)
             this.chart.config.data.datasets[0].backgroundColor[i] = color;
@@ -107,7 +103,7 @@ class ChartTracer extends Tracer {
     if (data.datasets.length) {
       const backgroundColor = data.datasets[0].backgroundColor;
       for (let i = 0; i < backgroundColor.length; i++) {
-        backgroundColor[i] = this.defaultColor;
+        backgroundColor[i] = this.color.default;
       }
       this.chart.update();
     }
diff --git a/js/module/tracer/coordinate_system.js b/js/module/tracer/coordinate_system.js
@@ -25,8 +25,7 @@ class CoordinateSystemTracer extends DirectedGraphTracer {
         x: C[i][0],
         y: C[i][1],
         label: '' + i,
-        size: 1,
-        color: this.defaultColor
+        size: 1
       });
     this.graph.read({
       nodes: nodes,
@@ -49,7 +48,7 @@ class CoordinateSystemTracer extends DirectedGraphTracer {
       case 'leave':
         var visit = step.type == 'visit';
         var targetNode = this.graph.nodes(this.n(step.target));
-        var color = visit ? this.visitedColor : this.leftColor;
+        var color = visit ? this.color.visited : this.color.left;
         targetNode.color = color;
         if (step.source !== undefined) {
           var edgeId = this.e(step.source, step.target);
@@ -62,7 +61,6 @@ class CoordinateSystemTracer extends DirectedGraphTracer {
               id: this.e(step.target, step.source),
               source: this.n(step.source),
               target: this.n(step.target),
-              color: color,
               size: 1
             });
           }
diff --git a/js/module/tracer/directed_graph.js b/js/module/tracer/directed_graph.js
@@ -14,11 +14,6 @@ class DirectedGraphTracer extends Tracer {
   constructor(name) {
     super(name);
 
-    this.selectColor = '#2962ff';
-    this.visitedColor = '#f50057';
-    this.leftColor = '#616161';
-    this.defaultColor = '#bdbdbd';
-
     if (this.isNew) initView(this);
   }
 
@@ -57,7 +52,7 @@ class DirectedGraphTracer extends Tracer {
       case 'leave':
         var visit = step.type == 'visit';
         var targetNode = this.graph.nodes(this.n(step.target));
-        var color = visit ? this.visitedColor : this.leftColor;
+        var color = visit ? this.color.visited : this.color.left;
         targetNode.color = color;
         if (step.source !== undefined) {
           var edgeId = this.e(step.source, step.target);
@@ -135,7 +130,7 @@ class DirectedGraphTracer extends Tracer {
         x: .5 + Math.sin(currentAngle) / 2,
         y: .5 + Math.cos(currentAngle) / 2,
         size: 1,
-        color: this.defaultColor,
+        color: this.color.default,
         weight: 0
       });
 
@@ -147,7 +142,7 @@ class DirectedGraphTracer extends Tracer {
               id: this.e(i, j),
               source: this.n(i),
               target: this.n(j),
-              color: this.defaultColor,
+              color: this.color.default,
               size: 1,
               weight: refineByType(value)
             });
@@ -160,7 +155,7 @@ class DirectedGraphTracer extends Tracer {
               id: this.e(i, j),
               source: this.n(i),
               target: this.n(j),
-              color: this.defaultColor,
+              color: this.color.default,
               size: 1,
               weight: refineByType(G[i][j])
             });
@@ -208,10 +203,10 @@ class DirectedGraphTracer extends Tracer {
     var tracer = this;
 
     this.graph.nodes().forEach(function (node) {
-      node.color = tracer.defaultColor;
+      node.color = tracer.color.default;
     });
     this.graph.edges().forEach(function (edge) {
-      edge.color = tracer.defaultColor;
+      edge.color = tracer.color.default;
     });
   }
 
diff --git a/js/module/tracer/tracer.js b/js/module/tracer/tracer.js
@@ -15,11 +15,13 @@ class Tracer {
   constructor(name) {
     this.module = this.constructor;
 
-    this.selectColor;
-    this.notifyColor;
-    this.defaultColor;
-    this.leftColor;
-    this.visitedColor;
+    this.color = {
+      selected: '#2962ff',
+      notified: '#f50057',
+      visited: '#f50057',
+      left: '#616161',
+      default: '#bdbdbd'
+    };
 
     this.manager = app.getTracerManager();
     this.capsule = this.manager.allocate(this);
@@ -48,24 +50,24 @@ class Tracer {
     return this;
   }
 
-  _setSelectFillColor(c) {
-    this.selectColor = c;
+  _setSelectedColor(c) {
+    this.color.selected = c;
   }
 
-  _setNotifyFillColor(c) {
-    this.notifyColor = c;
+  _setNotifiedColor(c) {
+    this.color.notified = c;
   }
 
-  _setDefaultFillColor(c){
-    this.defaultColor = c;
+  _setVisitedColor(c) {
+    this.color.visited = c;
   }
 
-  _setLeftFillColor(c){
-    this.leftColor = c;
+  _setLeftColor(c) {
+    this.color.left = c;
   }
 
-  _setVisitedFillColor(c){
-    this.visitedColor = c;
+  _setDefaultColor(c) {
+    this.color.default = c;
   }
 
   processStep(step, options) {
diff --git a/js/module/tracer/weighted_directed_graph.js b/js/module/tracer/weighted_directed_graph.js
