work

Computer-Kurzweil · Dec 14, 2022 · fd42988 · fd42988
1 parent ebaa0a8
commit fd42988
Show file tree

Hide file tree

Showing 16 changed files with 267 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke.computer.kurzweil</groupId>
     <artifactId>simulatedevolution</artifactId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.0.2</version>
     <packaging>jar</packaging>
 
     <name>Simulated Evolution</name>
@@ -16,7 +16,7 @@
         <url>https://github.com/Computer-Kurzweil/simulated-evolution.git</url>
         <connection>scm:git:git@github.com:Computer-Kurzweil/simulated-evolution.git</connection>
         <developerConnection>scm:git:git@github.com:Computer-Kurzweil/simulated-evolution.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>simulatedevolution-3.0.2</tag>
     </scm>
 
     <issueManagement>
@@ -351,12 +351,6 @@
                 </exclusions>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${version.junit5}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>
                 <artifactId>jackson-dataformat-yaml</artifactId>
@@ -666,11 +660,6 @@
             </exclusions>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
@@ -1002,10 +991,38 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <includes>
+                        <include>**/*Tests.java</include>
+                        <include>**/*Test.java</include>
+                        <include>**/*UnitTest.java</include>
+                        <include>**/*UT.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <includes>
+                        <include>**/*IT.java</include>
+                        <include>**/*IntegrationTest.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -1119,6 +1136,8 @@
                     <includes>
                         <include>**/*Tests.java</include>
                         <include>**/*Test.java</include>
+                        <include>**/*UnitTest.java</include>
+                        <include>**/*UT.java</include>
                     </includes>
                     <excludes>
                         <exclude>**/Abstract*.java</exclude>
@@ -1133,15 +1152,18 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <skipTests>${skipTests}</skipTests>
+                    <includes>
+                        <include>**/*IT.java</include>
+                        <include>**/*IntegrationTest.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                    </excludes>
                     <systemPropertyVariables>
                         <skipIntegrationTests>${skipTests}</skipIntegrationTests>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
@@ -1150,6 +1172,10 @@
                     <skipSurefireReport>${skipTests}</skipSurefireReport>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
         </plugins>
     </reporting>
 

diff --git a/...urzweil/simulation/evolution/AppTest.java → ...simulation/evolution/ApplicationTest.java b/...urzweil/simulation/evolution/AppTest.java → ...simulation/evolution/ApplicationTest.java
@@ -19,7 +19,7 @@
  * @see <a href="https://java.woehlke.org/simulated-evolution/">Maven Project Repository</a>
  */
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class AppTest {
+public class ApplicationTest {
 
     /**
      * Rigourous Test :-)

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -0,0 +1,178 @@
+allinone:
+  lattice:
+    width: 640
+    height: 400
+  view:
+    title: 'Computer Kurzweil'
+    subtitle: 'Scientific Imfotainment'
+    copyright: '(c) 2020 Thomas Woehlke'
+    borderPaddingX: 5
+    borderPaddingY: 5
+    titleHeight: 60
+    startStopp: 'Start / Stop'
+    start: 'Start'
+    stop: 'Stop'
+    info: 'Info'
+mandelbrot:
+  view:
+    title: 'Mandelbrot Set'
+    subtitle: 'Fractal Mandelbrot Set drawn by a Turing Machine'
+    buttonsZoom: 'Zoom In'
+    buttonsZoomOut: 'Zoom Out'
+    buttonsSwitch: 'Mandelbrot Set <-> Julia Set'
+    buttonsZoomLabel: 'Zoom'
+    buttonsLabel: 'Choose Mouse Click Mode'
+  control:
+    threadSleepTime: 50
+simulatedevolution:
+  view:
+    title: 'Simulated Evolution'
+    subtitle: 'Artificial Life Simulation of Bacteria Motion depending on DNA'
+  control:
+    threadSleepTime: 100
+    exitStatus: 0
+    queueMaxLength: 1000
+  cellConf:
+    fatMax: 2000
+    fatHungerMax: 1000
+    fatMinimumForSex: 800
+    fatAtBirth: 500
+    fatPerFood: 25
+    ageOfAdulthood: 200
+    ageOld: 800
+    ageMax: 1000
+  population:
+    initialPopulation: 20
+    panelPopulationStatistics: 'Statistics'
+    youngCellsLabel: 'young'
+    youngAndFatCellsLabel: 'fat'
+    fullAgeCellsLabel: 'adult'
+    hungryCellsLabel: 'hungry'
+    oldCellsLabel: 'old'
+    populationLabel: 'all'
+    generationOldestLabel: 'oldest Generation'
+    generationYoungestLabel: 'youngest Generation'
+  food:
+    foodPerDay: 20
+    foodPerDayFieldColumns: 3
+    foodPerDayLabel: 'Food per Day:'
+    foodPerDayBorderLabel: 'Food per Day:'
+    buttonFoodPerDayIncrease: '+'
+    buttonFoodPerDayDecrease: '-'
+    panelFood: 'Food'
+  gardenOfEden:
+    panelGardenOfEden: 'Garden of Eden'
+    gardenOfEdenEnabled: true
+    gardenOfEdenEnabledString: 'enabled'
+    gardenOfEdenEnabledToggleButton: 'Change'
+    foodPerDay: 80
+    gardenOfEdenLatticeDivisor: 5
+    gardenOfEdenLatticeDivisorPadding: 2
+cca:
+  view:
+    title: 'Cyclic Cellular Automaton'
+    subtitle: 'Cyclic Cellular Automaton'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 100
+randomwalk:
+  view:
+    title: 'Random Walk'
+    subtitle: 'Brownian Motion by Fractal Random Walk'
+  control:
+    threadSleepTime: 100
+dla:
+  view:
+    title: 'Diffusion Limited Aggregation'
+    subtitle: 'Fractal Random Walk due to Brownian Motion Cluster'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+kochsnowflake:
+  view:
+    title: 'Koch Snowflake'
+    subtitle: 'Fractal Koch Snowflake'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+samegame:
+  view:
+    title: 'Same Game'
+    subtitle: 'Play the Same Game'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+sierpinskitriangle:
+  view:
+    title: 'Sierpinski Triangle'
+    subtitle: 'Fractal Sierpinski Triangle'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+tetris:
+  view:
+    title: 'Tetris'
+    subtitle: 'Play Tetris'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+turmite:
+  view:
+    title: 'Turmite'
+    subtitle: 'Termites as Turing Machines with 2D Tape'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+wator:
+  view:
+    title: 'WaTor'
+    subtitle: 'Population Dynamics on Planet Water Torus'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
+gameoflive:
+  view:
+    title: 'Conways Game of Life'
+    subtitle: 'Conways Game of Life Cellular Automaton'
+    neighborhood:
+      title: 'Neighborhood'
+      typeVonNeumann: 'Von Neumann'
+      typeMoore: 'Moore'
+      typeWoehlke: 'Woehlke'
+  control:
+    threadSleepTime: 50
+    numberOfParticles: 30000
diff --git a/src/test/resources/img/Class_Model.jpg b/src/test/resources/img/Class_Model.jpg
diff --git a/src/test/resources/img/black.png b/src/test/resources/img/black.png
diff --git a/src/test/resources/img/blue.png b/src/test/resources/img/blue.png
diff --git a/src/test/resources/img/dark_gray.png b/src/test/resources/img/dark_gray.png
diff --git a/src/test/resources/img/green.png b/src/test/resources/img/green.png
diff --git a/src/test/resources/img/light_gray.png b/src/test/resources/img/light_gray.png
diff --git a/src/test/resources/img/phasenraum_logo.gif b/src/test/resources/img/phasenraum_logo.gif
diff --git a/src/test/resources/img/red.png b/src/test/resources/img/red.png
diff --git a/src/test/resources/img/screen.png b/src/test/resources/img/screen.png
diff --git a/src/test/resources/img/screen1.png b/src/test/resources/img/screen1.png
diff --git a/src/test/resources/img/screen2.png b/src/test/resources/img/screen2.png
diff --git a/src/test/resources/img/yellow.png b/src/test/resources/img/yellow.png
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+        <RollingFileAppender name="LogFile" fileName="kurzweil.log" append="true">
+            <PatternLayout>
+                <Pattern>%d %p %class{1.} [%t] %location %m %ex%n</Pattern>
+            </PatternLayout>
+        </RollingFileAppender>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.cca" level="info" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.dla" level="warn" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.simulatedevolution" level="info" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.mandelbrot" level="warn" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.randomwalk" level="warn" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.config" level="info" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.commons" level="info" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.commons.model" level="info" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="org.woehlke.computer.kurzweil.simulated.evolution.commons.widgets" level="info" includeLocation="true">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Root level="info">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>