Skip to content

Commit fd42988

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent ebaa0a8 commit fd42988

16 files changed

+267
-18
lines changed

‎pom.xml

+43-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke.computer.kurzweil</groupId>
66
<artifactId>simulatedevolution</artifactId>
7-
<version>3.0.2-SNAPSHOT</version>
7+
<version>3.0.2</version>
88
<packaging>jar</packaging>
99

1010
<name>Simulated Evolution</name>
@@ -16,7 +16,7 @@
1616
<url>https://github.com/Computer-Kurzweil/simulated-evolution.git</url>
1717
<connection>scm:git:[email protected]:Computer-Kurzweil/simulated-evolution.git</connection>
1818
<developerConnection>scm:git:[email protected]:Computer-Kurzweil/simulated-evolution.git</developerConnection>
19-
<tag>HEAD</tag>
19+
<tag>simulatedevolution-3.0.2</tag>
2020
</scm>
2121

2222
<issueManagement>
@@ -351,12 +351,6 @@
351351
</exclusions>
352352
<scope>test</scope>
353353
</dependency>
354-
<dependency>
355-
<groupId>org.junit.jupiter</groupId>
356-
<artifactId>junit-jupiter-engine</artifactId>
357-
<version>${version.junit5}</version>
358-
<scope>test</scope>
359-
</dependency>
360354
<dependency>
361355
<groupId>com.fasterxml.jackson.dataformat</groupId>
362356
<artifactId>jackson-dataformat-yaml</artifactId>
@@ -666,11 +660,6 @@
666660
</exclusions>
667661
<scope>test</scope>
668662
</dependency>
669-
<dependency>
670-
<groupId>org.junit.jupiter</groupId>
671-
<artifactId>junit-jupiter-engine</artifactId>
672-
<scope>test</scope>
673-
</dependency>
674663
<dependency>
675664
<groupId>com.fasterxml.jackson.dataformat</groupId>
676665
<artifactId>jackson-dataformat-yaml</artifactId>
@@ -1002,10 +991,38 @@
1002991
<plugin>
1003992
<groupId>org.apache.maven.plugins</groupId>
1004993
<artifactId>maven-surefire-plugin</artifactId>
994+
<configuration>
995+
<skipTests>${skipTests}</skipTests>
996+
<includes>
997+
<include>**/*Tests.java</include>
998+
<include>**/*Test.java</include>
999+
<include>**/*UnitTest.java</include>
1000+
<include>**/*UT.java</include>
1001+
</includes>
1002+
<excludes>
1003+
<exclude>**/Abstract*.java</exclude>
1004+
</excludes>
1005+
<systemPropertyVariables>
1006+
<skipIntegrationTests>${skipTests}</skipIntegrationTests>
1007+
</systemPropertyVariables>
1008+
</configuration>
10051009
</plugin>
10061010
<plugin>
10071011
<groupId>org.apache.maven.plugins</groupId>
10081012
<artifactId>maven-failsafe-plugin</artifactId>
1013+
<configuration>
1014+
<skipTests>${skipTests}</skipTests>
1015+
<includes>
1016+
<include>**/*IT.java</include>
1017+
<include>**/*IntegrationTest.java</include>
1018+
</includes>
1019+
<excludes>
1020+
<exclude>**/Abstract*.java</exclude>
1021+
</excludes>
1022+
<systemPropertyVariables>
1023+
<skipIntegrationTests>${skipTests}</skipIntegrationTests>
1024+
</systemPropertyVariables>
1025+
</configuration>
10091026
</plugin>
10101027
<plugin>
10111028
<groupId>org.apache.maven.plugins</groupId>
@@ -1119,6 +1136,8 @@
11191136
<includes>
11201137
<include>**/*Tests.java</include>
11211138
<include>**/*Test.java</include>
1139+
<include>**/*UnitTest.java</include>
1140+
<include>**/*UT.java</include>
11221141
</includes>
11231142
<excludes>
11241143
<exclude>**/Abstract*.java</exclude>
@@ -1133,15 +1152,18 @@
11331152
<artifactId>maven-failsafe-plugin</artifactId>
11341153
<configuration>
11351154
<skipTests>${skipTests}</skipTests>
1155+
<includes>
1156+
<include>**/*IT.java</include>
1157+
<include>**/*IntegrationTest.java</include>
1158+
</includes>
1159+
<excludes>
1160+
<exclude>**/Abstract*.java</exclude>
1161+
</excludes>
11361162
<systemPropertyVariables>
11371163
<skipIntegrationTests>${skipTests}</skipIntegrationTests>
11381164
</systemPropertyVariables>
11391165
</configuration>
11401166
</plugin>
1141-
<plugin>
1142-
<groupId>org.apache.maven.plugins</groupId>
1143-
<artifactId>maven-site-plugin</artifactId>
1144-
</plugin>
11451167
<plugin>
11461168
<groupId>org.apache.maven.plugins</groupId>
11471169
<artifactId>maven-surefire-report-plugin</artifactId>
@@ -1150,6 +1172,10 @@
11501172
<skipSurefireReport>${skipTests}</skipSurefireReport>
11511173
</configuration>
11521174
</plugin>
1175+
<plugin>
1176+
<groupId>org.apache.maven.plugins</groupId>
1177+
<artifactId>maven-site-plugin</artifactId>
1178+
</plugin>
11531179
</plugins>
11541180
</reporting>
11551181

‎src/test/java/org/woehlke/computer/kurzweil/simulation/evolution/AppTest.java ‎src/test/java/org/woehlke/computer/kurzweil/simulation/evolution/ApplicationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* @see <a href="https://java.woehlke.org/simulated-evolution/">Maven Project Repository</a>
2020
*/
2121
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
22-
public class AppTest {
22+
public class ApplicationTest {
2323

2424
/**
2525
* Rigourous Test :-)

‎src/test/resources/application.yml

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
allinone:
2+
lattice:
3+
width: 640
4+
height: 400
5+
view:
6+
title: 'Computer Kurzweil'
7+
subtitle: 'Scientific Imfotainment'
8+
copyright: '(c) 2020 Thomas Woehlke'
9+
borderPaddingX: 5
10+
borderPaddingY: 5
11+
titleHeight: 60
12+
startStopp: 'Start / Stop'
13+
start: 'Start'
14+
stop: 'Stop'
15+
info: 'Info'
16+
mandelbrot:
17+
view:
18+
title: 'Mandelbrot Set'
19+
subtitle: 'Fractal Mandelbrot Set drawn by a Turing Machine'
20+
buttonsZoom: 'Zoom In'
21+
buttonsZoomOut: 'Zoom Out'
22+
buttonsSwitch: 'Mandelbrot Set <-> Julia Set'
23+
buttonsZoomLabel: 'Zoom'
24+
buttonsLabel: 'Choose Mouse Click Mode'
25+
control:
26+
threadSleepTime: 50
27+
simulatedevolution:
28+
view:
29+
title: 'Simulated Evolution'
30+
subtitle: 'Artificial Life Simulation of Bacteria Motion depending on DNA'
31+
control:
32+
threadSleepTime: 100
33+
exitStatus: 0
34+
queueMaxLength: 1000
35+
cellConf:
36+
fatMax: 2000
37+
fatHungerMax: 1000
38+
fatMinimumForSex: 800
39+
fatAtBirth: 500
40+
fatPerFood: 25
41+
ageOfAdulthood: 200
42+
ageOld: 800
43+
ageMax: 1000
44+
population:
45+
initialPopulation: 20
46+
panelPopulationStatistics: 'Statistics'
47+
youngCellsLabel: 'young'
48+
youngAndFatCellsLabel: 'fat'
49+
fullAgeCellsLabel: 'adult'
50+
hungryCellsLabel: 'hungry'
51+
oldCellsLabel: 'old'
52+
populationLabel: 'all'
53+
generationOldestLabel: 'oldest Generation'
54+
generationYoungestLabel: 'youngest Generation'
55+
food:
56+
foodPerDay: 20
57+
foodPerDayFieldColumns: 3
58+
foodPerDayLabel: 'Food per Day:'
59+
foodPerDayBorderLabel: 'Food per Day:'
60+
buttonFoodPerDayIncrease: '+'
61+
buttonFoodPerDayDecrease: '-'
62+
panelFood: 'Food'
63+
gardenOfEden:
64+
panelGardenOfEden: 'Garden of Eden'
65+
gardenOfEdenEnabled: true
66+
gardenOfEdenEnabledString: 'enabled'
67+
gardenOfEdenEnabledToggleButton: 'Change'
68+
foodPerDay: 80
69+
gardenOfEdenLatticeDivisor: 5
70+
gardenOfEdenLatticeDivisorPadding: 2
71+
cca:
72+
view:
73+
title: 'Cyclic Cellular Automaton'
74+
subtitle: 'Cyclic Cellular Automaton'
75+
neighborhood:
76+
title: 'Neighborhood'
77+
typeVonNeumann: 'Von Neumann'
78+
typeMoore: 'Moore'
79+
typeWoehlke: 'Woehlke'
80+
control:
81+
threadSleepTime: 100
82+
randomwalk:
83+
view:
84+
title: 'Random Walk'
85+
subtitle: 'Brownian Motion by Fractal Random Walk'
86+
control:
87+
threadSleepTime: 100
88+
dla:
89+
view:
90+
title: 'Diffusion Limited Aggregation'
91+
subtitle: 'Fractal Random Walk due to Brownian Motion Cluster'
92+
control:
93+
threadSleepTime: 50
94+
numberOfParticles: 30000
95+
kochsnowflake:
96+
view:
97+
title: 'Koch Snowflake'
98+
subtitle: 'Fractal Koch Snowflake'
99+
neighborhood:
100+
title: 'Neighborhood'
101+
typeVonNeumann: 'Von Neumann'
102+
typeMoore: 'Moore'
103+
typeWoehlke: 'Woehlke'
104+
control:
105+
threadSleepTime: 50
106+
numberOfParticles: 30000
107+
samegame:
108+
view:
109+
title: 'Same Game'
110+
subtitle: 'Play the Same Game'
111+
neighborhood:
112+
title: 'Neighborhood'
113+
typeVonNeumann: 'Von Neumann'
114+
typeMoore: 'Moore'
115+
typeWoehlke: 'Woehlke'
116+
control:
117+
threadSleepTime: 50
118+
numberOfParticles: 30000
119+
sierpinskitriangle:
120+
view:
121+
title: 'Sierpinski Triangle'
122+
subtitle: 'Fractal Sierpinski Triangle'
123+
neighborhood:
124+
title: 'Neighborhood'
125+
typeVonNeumann: 'Von Neumann'
126+
typeMoore: 'Moore'
127+
typeWoehlke: 'Woehlke'
128+
control:
129+
threadSleepTime: 50
130+
numberOfParticles: 30000
131+
tetris:
132+
view:
133+
title: 'Tetris'
134+
subtitle: 'Play Tetris'
135+
neighborhood:
136+
title: 'Neighborhood'
137+
typeVonNeumann: 'Von Neumann'
138+
typeMoore: 'Moore'
139+
typeWoehlke: 'Woehlke'
140+
control:
141+
threadSleepTime: 50
142+
numberOfParticles: 30000
143+
turmite:
144+
view:
145+
title: 'Turmite'
146+
subtitle: 'Termites as Turing Machines with 2D Tape'
147+
neighborhood:
148+
title: 'Neighborhood'
149+
typeVonNeumann: 'Von Neumann'
150+
typeMoore: 'Moore'
151+
typeWoehlke: 'Woehlke'
152+
control:
153+
threadSleepTime: 50
154+
numberOfParticles: 30000
155+
wator:
156+
view:
157+
title: 'WaTor'
158+
subtitle: 'Population Dynamics on Planet Water Torus'
159+
neighborhood:
160+
title: 'Neighborhood'
161+
typeVonNeumann: 'Von Neumann'
162+
typeMoore: 'Moore'
163+
typeWoehlke: 'Woehlke'
164+
control:
165+
threadSleepTime: 50
166+
numberOfParticles: 30000
167+
gameoflive:
168+
view:
169+
title: 'Conways Game of Life'
170+
subtitle: 'Conways Game of Life Cellular Automaton'
171+
neighborhood:
172+
title: 'Neighborhood'
173+
typeVonNeumann: 'Von Neumann'
174+
typeMoore: 'Moore'
175+
typeWoehlke: 'Woehlke'
176+
control:
177+
threadSleepTime: 50
178+
numberOfParticles: 30000

‎src/test/resources/img/Class_Model.jpg

273 KB
Loading

‎src/test/resources/img/black.png

159 Bytes
Loading

‎src/test/resources/img/blue.png

174 Bytes
Loading

‎src/test/resources/img/dark_gray.png

175 Bytes
Loading

‎src/test/resources/img/green.png

174 Bytes
Loading

‎src/test/resources/img/light_gray.png

174 Bytes
Loading

‎src/test/resources/img/phasenraum_logo.gif

1.72 KB
Loading

‎src/test/resources/img/red.png

174 Bytes
Loading

‎src/test/resources/img/screen.png

21.8 KB
Loading

‎src/test/resources/img/screen1.png

43 KB
Loading

‎src/test/resources/img/screen2.png

50.2 KB
Loading

‎src/test/resources/img/yellow.png

174 Bytes
Loading

‎src/test/resources/log4j.xml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
6+
</Console>
7+
<RollingFileAppender name="LogFile" fileName="kurzweil.log" append="true">
8+
<PatternLayout>
9+
<Pattern>%d %p %class{1.} [%t] %location %m %ex%n</Pattern>
10+
</PatternLayout>
11+
</RollingFileAppender>
12+
</Appenders>
13+
<Loggers>
14+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.cca" level="info" includeLocation="true">
15+
<AppenderRef ref="Console"/>
16+
</Logger>
17+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.dla" level="warn" includeLocation="true">
18+
<AppenderRef ref="Console"/>
19+
</Logger>
20+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.simulatedevolution" level="info" includeLocation="true">
21+
<AppenderRef ref="Console"/>
22+
</Logger>
23+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.mandelbrot" level="warn" includeLocation="true">
24+
<AppenderRef ref="Console"/>
25+
</Logger>
26+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.tabs.randomwalk" level="warn" includeLocation="true">
27+
<AppenderRef ref="Console"/>
28+
</Logger>
29+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.config" level="info" includeLocation="true">
30+
<AppenderRef ref="Console"/>
31+
</Logger>
32+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.commons" level="info" includeLocation="true">
33+
<AppenderRef ref="Console"/>
34+
</Logger>
35+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.commons.model" level="info" includeLocation="true">
36+
<AppenderRef ref="Console"/>
37+
</Logger>
38+
<Logger name="org.woehlke.computer.kurzweil.simulated.evolution.commons.widgets" level="info" includeLocation="true">
39+
<AppenderRef ref="Console"/>
40+
</Logger>
41+
<Root level="info">
42+
<AppenderRef ref="Console"/>
43+
</Root>
44+
</Loggers>
45+
</Configuration>

0 commit comments

Comments
 (0)