Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
genetic-algorithms
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lennart Eichhorn
genetic-algorithms
Commits
1adfa885
Commit
1adfa885
authored
5 years ago
by
Lennart Eichhorn
Browse files
Options
Downloads
Patches
Plain Diff
Fixed generation counter.
parent
fb251c9d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/MainClasses/GeneticAlgorithm.java
+5
-12
5 additions, 12 deletions
src/main/java/MainClasses/GeneticAlgorithm.java
src/main/java/Visualization/Visualizers/BestFoldingsToVideo.java
+1
-1
1 addition, 1 deletion
...n/java/Visualization/Visualizers/BestFoldingsToVideo.java
with
6 additions
and
13 deletions
src/main/java/MainClasses/GeneticAlgorithm.java
+
5
−
12
View file @
1adfa885
...
...
@@ -71,14 +71,7 @@ public class GeneticAlgorithm {
// Settings that are dependant on encoding
if
(
config
.
getEncodingVariant
().
equals
(
"NESW"
))
{
int
nullCount
=
0
;
/*for (int i = 0; i < config.getVisualizers().length; i++) {
if (!config.getVisualizers()[i].equals(VisualizerMethods.Console)
&& !config.getVisualizers()[i].equals(VisualizerMethods.Image)) {
nullCount++;
}
}*/
this
.
visualizers
=
new
Visualizer
[
config
.
getVisualizers
().
length
-
nullCount
];
this
.
visualizers
=
new
Visualizer
[
config
.
getVisualizers
().
length
];
int
j
=
0
;
for
(
VisualizerMethods
vm
:
config
.
getVisualizers
())
{
if
(
vm
.
equals
(
VisualizerMethods
.
Console
))
{
...
...
@@ -135,17 +128,17 @@ public class GeneticAlgorithm {
}
public
void
simulateGenerations
()
{
for
(
int
gen
=
0
;
gen
<
config
.
getTotalGenerations
()-
1
;
gen
++)
{
evaluateGeneration
();
for
(
int
gen
=
0
;
gen
<
config
.
getTotalGenerations
();
gen
++)
{
//TODO Remove with the new Generation class
generation
=
gen
;
evaluateGeneration
();
visualizeGeneration
();
filterGeneration
();
mutateGeneration
();
evaluateGeneration
();
}
evaluateGeneration
();
visualizeGeneration
();
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/Visualization/Visualizers/BestFoldingsToVideo.java
+
1
−
1
View file @
1adfa885
...
...
@@ -53,7 +53,7 @@ public class BestFoldingsToVideo implements Visualizer {
@Override
public
void
drawProtein
(
Candidate
[]
generation
,
GeneticAlgorithm
geneticAlgorithm
)
{
//TODO Only render video for the last generation
if
(
geneticAlgorithm
.
generation
==
config
.
getTotalGenerations
()-
2
){
if
(
geneticAlgorithm
.
generation
==
config
.
getTotalGenerations
()-
1
){
String
filename
=
config
.
getLogfileDirectory
()
+
"/"
+
config
.
getJobName
()
+
".mp4"
;
createVideo
(
config
.
getImageSequenceDirectory
(),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment