adding 'blickrichtung'

Hattinger04 · Hattinger04 · commit a2b914260adb · 2022-11-08T19:15:19.000+01:00
diff --git a/src/main/java/io/github/Hattinger04/hamster/HamsterController.java b/src/main/java/io/github/Hattinger04/hamster/HamsterController.java
@@ -28,7 +28,6 @@ public class HamsterController {
 	
 	private Workbench wb = Workbench.getWorkbench(); 
 
-	// TODO: Unterordner / nicht nur eine Datei! 
 	/**
 	 * Creates new File and will create a parent folder if not existing
 	 * It also writes the given program into the file
@@ -96,6 +95,6 @@ public ResponseEntity<?> newTerrain(@RequestBody String json) {
 		writeTextToFile(new File(hamsterPath), hamster.getProgram());
 		wb.getJsonObject().clear(); 
 		return new ResponseEntity<>(wb.startProgram(hamsterPath, terrainPath, 
-				wb.new TerrainForm(hamster.getLaenge(), hamster.getBreite(), hamster.getCorn(), hamster.getCornAnzahl(), hamster.getWall(), hamster.getX(), hamster.getY())), HttpStatus.OK);  
+				wb.new TerrainForm(hamster.getLaenge(), hamster.getBreite(), hamster.getCorn(), hamster.getCornAnzahl(), hamster.getWall(), hamster.getX(), hamster.getY(), hamster.getBlickrichtung())), HttpStatus.OK);  
 	}
 }
diff --git a/src/main/java/io/github/Hattinger04/hamster/model/Hamster.java b/src/main/java/io/github/Hattinger04/hamster/model/Hamster.java
@@ -32,7 +32,7 @@ public Hamster(String program, String programName) {
 	private String programName; 
 	private String terrainName;
 	private String program; 
-	private int laenge, breite, x, y;
+	private int laenge, breite, x, y, blickrichtung;
 	private int[] cornAnzahl; 
 	private int[][] corn, wall; 
 }
diff --git a/src/main/java/io/github/Hattinger04/hamsterEvaluation/compiler/controller/CompilerController.java b/src/main/java/io/github/Hattinger04/hamsterEvaluation/compiler/controller/CompilerController.java
@@ -72,10 +72,8 @@ public boolean ensureCompiled(HamsterFile file) {
 		if (!classFile.exists()
 				|| file.lastModified() > classFile.lastModified()) {
 				try {
-					System.out.println("Ensuring Compiled...");
 					return this.compilerModel.compile(file); // dibo 15.11.2010
 				} catch (IOException e) { // dibo 25.10.2011
-					System.out.println("Compiling error! " + e.getMessage());
 				}
 			} 
 		return true;
diff --git a/src/main/java/io/github/Hattinger04/hamsterEvaluation/compiler/model/CompilerModel.java b/src/main/java/io/github/Hattinger04/hamsterEvaluation/compiler/model/CompilerModel.java
@@ -62,7 +62,7 @@ public boolean compile(HamsterFile file) throws IOException {
 			return true;
 		}
 		for(Object o : compilerErrors) {
-			System.out.println("Compiler Error: " + o.toString());
+//			System.out.println("Compiler Error: " + o.toString());
 		}
 		return false;
 	}
diff --git a/src/main/java/io/github/Hattinger04/hamsterEvaluation/simulation/model/Hamster.java b/src/main/java/io/github/Hattinger04/hamsterEvaluation/simulation/model/Hamster.java
@@ -57,8 +57,6 @@ public int getColor() {
 	}
 
 	public void setXY(int x, int y) {
-		int oldX = this.x;
-		int oldY = this.y;
 		this.x = x;
 		this.y = y;
 	}
diff --git a/src/main/java/io/github/Hattinger04/hamsterEvaluation/workbench/Workbench.java b/src/main/java/io/github/Hattinger04/hamsterEvaluation/workbench/Workbench.java
@@ -85,13 +85,13 @@ protected Workbench(boolean simulatorOnly, SimulationModel simModel) {
 		compiler = new CompilerController(model.getCompilerModel(), this);
 		debugger = new DebuggerController(model.getDebuggerModel(), this);
 //		Example of how a program could start: 
-//		startProgram("Programme/data.ham", "Programme/test.ter", new TerrainForm(10,10,new int[][] {{1,2}, {2,3}}, new int[] {1,1}, new int[][] {{0,0}, {1,0}}, 0, 1));
+//		startProgram("Programme/data.ham", "Programme/test.ter", new TerrainForm(10,10,new int[][] {{1,2}, {2,3}}, new int[] {1,1}, new int[][] {{0,0}, {1,0}, 1}, 0, 1));
 	}
 		
 	@Getter @Setter
 	public class TerrainForm {
 		
-		private int laenge, breite, x, y;
+		private int laenge, breite, x, y, blickrichtung;
 		private int[] cornAnzahl; 
 		private int[][] corn, wall;  
 		
@@ -106,14 +106,15 @@ public class TerrainForm {
 		 * @param x
 		 * @param y
 		 */
-		public TerrainForm(int laenge, int breite, int[][] corn, int[] cornAnzahl, int[][] wall, int x, int y) {
+		public TerrainForm(int laenge, int breite, int[][] corn, int[] cornAnzahl, int[][] wall, int x, int y, int blickrichtung) {
 			this.laenge = laenge; 
 			this.breite = breite; 
 			this.corn = corn; 
 			this.cornAnzahl = cornAnzahl; 
 			this.wall = wall; 
 			this.x = x;
 			this.y = y;
+			this.blickrichtung = blickrichtung; 
 		}
 	}
 	
@@ -192,7 +193,6 @@ public Terrain createTerrain(TerrainForm form) {
 				if(j % 2 == 0) {
 					save = form.getCorn()[i][j]; 
 				} else {
-					System.out.println(save + " " + form.getCorn()[i][j] + " " + form.getCornAnzahl()[i]);
 					terrain.setCornCount(save, form.getCorn()[i][j], form.getCornAnzahl()[i]);
 				}
 			}
@@ -203,13 +203,13 @@ public Terrain createTerrain(TerrainForm form) {
 				if(j % 2 == 0) {
 					save = form.getWall()[i][j]; 
 				} else {
-					System.out.println(save + " " + form.getWall()[i][j]);
 					terrain.setWall(save, form.getWall()[i][j], true);
 				}
 				
 			}
 		}
 		terrain.getDefaultHamster().setXY(form.getX(), form.getY());
+		terrain.getDefaultHamster().setDir(form.getBlickrichtung());
 		return terrain; 
 	}
 	
diff --git a/src/main/resources/allLogs.log b/src/main/resources/allLogs.log
@@ -390,3 +390,5 @@ Okt. 31, 2022 7:45:42 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
 Nov. 01, 2022 8:14:49 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Nov. 08, 2022 6:56:47 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
diff --git a/src/main/resources/hamster/admin/compiler.tmp b/src/main/resources/hamster/admin/compiler.tmp
diff --git a/src/main/resources/hamster/admin/test/test.class b/src/main/resources/hamster/admin/test/test.class
diff --git a/src/main/resources/hamster/admin/test/test.ham b/src/main/resources/hamster/admin/test/test.ham
@@ -0,0 +1 @@
+void main() {vor();}
diff --git a/src/main/resources/hamster/admin/test/test.java b/src/main/resources/hamster/admin/test/test.java
@@ -0,0 +1 @@
+import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territorium;import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territory;import io.github.Hattinger04.hamsterEvaluation.model.HamsterException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterInitialisierungsException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterNichtInitialisiertException;import io.github.Hattinger04.hamsterEvaluation.model.KachelLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MauerDaException;import io.github.Hattinger04.hamsterEvaluation.model.MaulLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MouthEmptyException;import io.github.Hattinger04.hamsterEvaluation.model.WallInFrontException;import io.github.Hattinger04.hamsterEvaluation.model.TileEmptyException;public class test extends io.github.Hattinger04.hamsterEvaluation.debugger.model.IHamster implements io.github.Hattinger04.hamsterEvaluation.model.HamsterProgram {public void main() {vor();}}
diff --git a/src/main/resources/hamster/admin/test/testTerrain.ter b/src/main/resources/hamster/admin/test/testTerrain.ter
@@ -0,0 +1,11 @@
+5
+5
+##   
+>    
+  *  
+  *  
+     
+0
+2
+1
+0
diff --git a/syserr.txt b/syserr.txt
@@ -1,4 +0,0 @@
-hamster.MauerDaException (0, 0)
-	at io.github.Hattinger04.hamsterEvaluation.debugger.model.IHamster.vor(IHamster.java:94)
-	at test.main(test.java:1)
-	at io.github.Hattinger04.hamsterEvaluation.debugger.model.RemoteRunner.main(RemoteRunner.java:124)
diff --git a/sysout.txt b/sysout.txt
@@ -1,2 +0,0 @@
-2
-2

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public class HamsterController {`
`28`	`28`
`29`	`29`	`private Workbench wb = Workbench.getWorkbench();`
`30`	`30`
`31`		`- // TODO: Unterordner / nicht nur eine Datei!`
`32`	`31`	`/**`
`33`	`32`	`* Creates new File and will create a parent folder if not existing`
`34`	`33`	`* It also writes the given program into the file`
`@@ -96,6 +95,6 @@ public ResponseEntity<?> newTerrain(@RequestBody String json) {`
`96`	`95`	`writeTextToFile(new File(hamsterPath), hamster.getProgram());`
`97`	`96`	`wb.getJsonObject().clear();`
`98`	`97`	`return new ResponseEntity<>(wb.startProgram(hamsterPath, terrainPath,`
`99`		`- wb.new TerrainForm(hamster.getLaenge(), hamster.getBreite(), hamster.getCorn(), hamster.getCornAnzahl(), hamster.getWall(), hamster.getX(), hamster.getY())), HttpStatus.OK);`
	`98`	`+ wb.new TerrainForm(hamster.getLaenge(), hamster.getBreite(), hamster.getCorn(), hamster.getCornAnzahl(), hamster.getWall(), hamster.getX(), hamster.getY(), hamster.getBlickrichtung())), HttpStatus.OK);`
`100`	`99`	`}`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public Hamster(String program, String programName) {`
`32`	`32`	`private String programName;`
`33`	`33`	`private String terrainName;`
`34`	`34`	`private String program;`
`35`		`- private int laenge, breite, x, y;`
	`35`	`+ private int laenge, breite, x, y, blickrichtung;`
`36`	`36`	`private int[] cornAnzahl;`
`37`	`37`	`private int[][] corn, wall;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,8 @@ public boolean ensureCompiled(HamsterFile file) {`
`72`	`72`	`if (!classFile.exists()`
`73`	`73`	`\|\| file.lastModified() > classFile.lastModified()) {`
`74`	`74`	`try {`
`75`		`- System.out.println("Ensuring Compiled...");`
`76`	`75`	`return this.compilerModel.compile(file); // dibo 15.11.2010`
`77`	`76`	`} catch (IOException e) { // dibo 25.10.2011`
`78`		`- System.out.println("Compiling error! " + e.getMessage());`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public boolean compile(HamsterFile file) throws IOException {`
`62`	`62`	`return true;`
`63`	`63`	`}`
`64`	`64`	`for(Object o : compilerErrors) {`
`65`		`- System.out.println("Compiler Error: " + o.toString());`
	`65`	`+// System.out.println("Compiler Error: " + o.toString());`
`66`	`66`	`}`
`67`	`67`	`return false;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ public int getColor() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public void setXY(int x, int y) {`
`60`		`- int oldX = this.x;`
`61`		`- int oldY = this.y;`
`62`	`60`	`this.x = x;`
`63`	`61`	`this.y = y;`
`64`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,13 @@ protected Workbench(boolean simulatorOnly, SimulationModel simModel) {`
`85`	`85`	`compiler = new CompilerController(model.getCompilerModel(), this);`
`86`	`86`	`debugger = new DebuggerController(model.getDebuggerModel(), this);`
`87`	`87`	`// Example of how a program could start:`
`88`		`-// startProgram("Programme/data.ham", "Programme/test.ter", new TerrainForm(10,10,new int[][] {{1,2}, {2,3}}, new int[] {1,1}, new int[][] {{0,0}, {1,0}}, 0, 1));`
	`88`	`+// startProgram("Programme/data.ham", "Programme/test.ter", new TerrainForm(10,10,new int[][] {{1,2}, {2,3}}, new int[] {1,1}, new int[][] {{0,0}, {1,0}, 1}, 0, 1));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Getter @Setter`
`92`	`92`	`public class TerrainForm {`
`93`	`93`
`94`		`- private int laenge, breite, x, y;`
	`94`	`+ private int laenge, breite, x, y, blickrichtung;`
`95`	`95`	`private int[] cornAnzahl;`
`96`	`96`	`private int[][] corn, wall;`
`97`	`97`
`@@ -106,14 +106,15 @@ public class TerrainForm {`
`106`	`106`	`* @param x`
`107`	`107`	`* @param y`
`108`	`108`	`*/`
`109`		`- public TerrainForm(int laenge, int breite, int[][] corn, int[] cornAnzahl, int[][] wall, int x, int y) {`
	`109`	`+ public TerrainForm(int laenge, int breite, int[][] corn, int[] cornAnzahl, int[][] wall, int x, int y, int blickrichtung) {`
`110`	`110`	`this.laenge = laenge;`
`111`	`111`	`this.breite = breite;`
`112`	`112`	`this.corn = corn;`
`113`	`113`	`this.cornAnzahl = cornAnzahl;`
`114`	`114`	`this.wall = wall;`
`115`	`115`	`this.x = x;`
`116`	`116`	`this.y = y;`
	`117`	`+ this.blickrichtung = blickrichtung;`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`
`@@ -192,7 +193,6 @@ public Terrain createTerrain(TerrainForm form) {`
`192`	`193`	`if(j % 2 == 0) {`
`193`	`194`	`save = form.getCorn()[i][j];`
`194`	`195`	`} else {`
`195`		`- System.out.println(save + " " + form.getCorn()[i][j] + " " + form.getCornAnzahl()[i]);`
`196`	`196`	`terrain.setCornCount(save, form.getCorn()[i][j], form.getCornAnzahl()[i]);`
`197`	`197`	`}`
`198`	`198`	`}`
`@@ -203,13 +203,13 @@ public Terrain createTerrain(TerrainForm form) {`
`203`	`203`	`if(j % 2 == 0) {`
`204`	`204`	`save = form.getWall()[i][j];`
`205`	`205`	`} else {`
`206`		`- System.out.println(save + " " + form.getWall()[i][j]);`
`207`	`206`	`terrain.setWall(save, form.getWall()[i][j], true);`
`208`	`207`	`}`
`209`	`208`
`210`	`209`	`}`
`211`	`210`	`}`
`212`	`211`	`terrain.getDefaultHamster().setXY(form.getX(), form.getY());`
	`212`	`+ terrain.getDefaultHamster().setDir(form.getBlickrichtung());`
`213`	`213`	`return terrain;`
`214`	`214`	`}`
`215`	`215`