Merge branch 'gh-pages' of https://github.com/dhandeo/potts-simulation into gh-pages

sturney · sturney · commit 5271c13106f4 · 2013-03-19T15:32:05.000-04:00
diff --git a/Init.js b/Init.js
@@ -96,4 +96,4 @@ function start()
                 }, 0);
             }
         });
-    }
+    }
diff --git a/Simulation.js b/Simulation.js
@@ -53,9 +53,9 @@ Simulation.prototype.Draw = function()
         for(var i = 0; i < this.x;  i++)  
             {
             // Select the colors from the pallette
-            if (this.grid[j][i] >this.palette.length -1 )
+            if (this.grid[j][i] > this.palette.length - 1 )
                 {
-                this.ctx.fillStyle =this.palette[0];
+                this.ctx.fillStyle = this.palette[0];
                 }
              else
                 {
@@ -90,7 +90,7 @@ Simulation.prototype.Flip = function(i,j)
         }
     else
         {
-        this.grid[i][j] =  1;
+        this.grid[i][j] = 1;
         }
     }
     
diff --git a/Target.js b/Target.js
@@ -11,7 +11,7 @@ function Target( width, height, no_axons, sim_no)
     {
     // Call super constructor.
     Simulation.call( this, width, height );
-    this.sim_no = sim_no ;
+    this.sim_no = sim_no + 1 ;
     this.no_axons = no_axons;
     this.palette = alphabet_palette;
     
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 
 <head>
 
-<title> 2d Potts  Model Like Simulation </title>
+<title> 2d Potts Model Like Simulation </title>
 
 <script src="jquery/jquery-1.9.1.min.js"></script>
 <script src="http://code.jquery.com/ui/1.10.2/jquery-ui.js"></script>
@@ -13,7 +13,6 @@
 </head>
 
 <body onload=start()>
-
  <style type="text/css">
     .fieldset-auto-width {
          display: inline-block;
@@ -72,4 +71,4 @@
 <script src="Init.js"></script>
 
 </body>
-</html>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -96,4 +96,4 @@ function start()`
`96`	`96`	`}, 0);`
`97`	`97`	`}`
`98`	`98`	`});`
`99`		`- }`
	`99`	`+ }`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,9 @@ Simulation.prototype.Draw = function()`
`53`	`53`	`for(var i = 0; i < this.x; i++)`
`54`	`54`	`{`
`55`	`55`	`// Select the colors from the pallette`
`56`		`- if (this.grid[j][i] >this.palette.length -1 )`
	`56`	`+ if (this.grid[j][i] > this.palette.length - 1 )`
`57`	`57`	`{`
`58`		`- this.ctx.fillStyle =this.palette[0];`
	`58`	`+ this.ctx.fillStyle = this.palette[0];`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
`@@ -90,7 +90,7 @@ Simulation.prototype.Flip = function(i,j)`
`90`	`90`	`}`
`91`	`91`	`else`
`92`	`92`	`{`
`93`		`- this.grid[i][j] = 1;`
	`93`	`+ this.grid[i][j] = 1;`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function Target( width, height, no_axons, sim_no)`
`11`	`11`	`{`
`12`	`12`	`// Call super constructor.`
`13`	`13`	`Simulation.call( this, width, height );`
`14`		`- this.sim_no = sim_no ;`
	`14`	`+ this.sim_no = sim_no + 1 ;`
`15`	`15`	`this.no_axons = no_axons;`
`16`	`16`	`this.palette = alphabet_palette;`
`17`	`17`