[examples] Fixing the Sierpinski fractal demo.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Apr 11, 2019 · 6aa7827 · 6aa7827
1 parent c9c35d9
commit 6aa7827
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...pinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/agents/AbstractFractal.sarl b/...pinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/agents/AbstractFractal.sarl
@@ -52,7 +52,7 @@ abstract agent AbstractFractal {
 	 * Generate triangle points
 	 */
 	def generatePoints {
-		triangle = new Triangle(
+		this.triangle = new Triangle(
 			screenSurface.bottomLeft,
 			screenSurface.bottomRight,
 			new Vector2D(screenSurface.bottomLeft.x + screenWidth / 2, screenSurface.topLeft.y)
@@ -65,15 +65,15 @@ abstract agent AbstractFractal {
 	 * Multiply itself and create child Fractal
 	 */
 	def multiplication {
-		val screen1 = new Square(triangle.bottomLeft, screenWidth / 2)
+		val screen1 = new Square(this.triangle.bottomLeft, screenWidth / 2)
 		spawnInContext(typeof(ChildFractal), innerContext, screen1, positions)
 
 		val screen2 = new Square(
 			new Vector2D(screenSurface.bottomLeft.x + screenWidth / 4, screenSurface.bottomLeft.y + screenWidth / 2),
 			screenWidth / 2)
 		spawnInContext(typeof(ChildFractal), innerContext, screen2, positions)
 
-		val screen3 = new Square(new Vector2D(triangle.top.x, screenSurface.bottomLeft.y), screenWidth / 2)
+		val screen3 = new Square(new Vector2D(this.triangle.top.x, screenSurface.bottomLeft.y), screenWidth / 2)
 		spawnInContext(typeof(ChildFractal), innerContext, screen3, positions)
 	}
 	/* 

diff --git a/...ierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/agents/ChildFractal.sarl b/...ierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/agents/ChildFractal.sarl
@@ -21,13 +21,13 @@
 
 package io.sarl.demos.sierpinskiFractals.agents
 
-import io.sarl.core.Behaviors
 import io.sarl.core.DefaultContextInteractions
 import io.sarl.core.Initialize
 import io.sarl.demos.sierpinskiFractals.events.Refresh
 import io.sarl.demos.sierpinskiFractals.objects.Positions
 import io.sarl.demos.sierpinskiFractals.objects.Square
 import io.sarl.javafx.FXKillSupportBehavior
+import io.sarl.core.Behaviors
 
 /**
  * Child fractal agent.
@@ -38,7 +38,7 @@ import io.sarl.javafx.FXKillSupportBehavior
  */
 agent ChildFractal extends AbstractFractal {
 
-	uses Behaviors, DefaultContextInteractions
+	uses DefaultContextInteractions, Behaviors
 
 	/* 
 	 * Initialization step for smaller fractals

diff --git a/...-sierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/objects/Positions.sarl b/...-sierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/objects/Positions.sarl
@@ -31,7 +31,7 @@ import java.util.List
  * @author Antoine Bartuccio
  * @author Nicolas Gaud
  */
-public class Positions {
+class Positions {
 
 	val frac = new ArrayList<Triangle>
 
@@ -41,7 +41,7 @@ public class Positions {
 		}
 	}
 
-	public def getTriangles(): List<Triangle>  {
+	def getTriangles(): List<Triangle>  {
 		synchronized(frac) {
 			frac.unmodifiableView
 		}

diff --git a/...mos-sierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/objects/Square.sarl b/...mos-sierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/objects/Square.sarl
@@ -27,7 +27,7 @@ package io.sarl.demos.sierpinskiFractals.objects
  * @author Antoine Bartuccio
  * @author Nicolas Gaud
  */
-public class Square {
+class Square {
 
 	var bottomLeft : Vector2D
 	var topLeft : Vector2D

diff --git a/...s-sierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/objects/Vector2D.sarl b/...s-sierpinskifractals/src/main/sarl/io/sarl/demos/sierpinskiFractals/objects/Vector2D.sarl
@@ -28,7 +28,7 @@ package io.sarl.demos.sierpinskiFractals.objects
  * @author Antoine Bartuccio
  * @author Nicolas Gaud
  */
-public class Vector2D {
+class Vector2D {
 
 	var y: double
 	var x: double