From 0c283bc2ee048bbce62180ce510ad7f99c91510d Mon Sep 17 00:00:00 2001
From: Thomas Weise <tweise@hfuu.edu.cn>
Date: Tue, 7 Jan 2020 08:30:29 +0800
Subject: [PATCH] minor fixes and Maven plugin version stepping

---
 README.md                                     |  4 ++--
 pom.xml                                       | 22 +++++++++----------
 .../algorithms/bitstrings/Greedy2p1GAmod.java |  6 ++++-
 .../bitstrings/Greedy2p1GAmodFFA.java         |  6 ++++-
 .../SelfAdjustingOpLcLGAmodFFA.java           |  2 +-
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index a71d684..7d16f33 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ First, you need to add the following repository, which is a repository that can
 ```
 
 Than you can add the dependency on our `aitoa-code` repository into your `dependencies` section.
-Here, `0.8.20` is the current version of  `aitoa-code`.
+Here, `0.8.21` is the current version of  `aitoa-code`.
 Notice that you may have more dependencies in your `dependencies` section, say on `junit`, but here I just put the one for `aitoa-code` as example.
 
 ```xml
@@ -49,7 +49,7 @@ Notice that you may have more dependencies in your `dependencies` section, say o
   <dependency>
     <groupId>com.github.thomasWeise</groupId>
     <artifactId>aitoa-code</artifactId>
-    <version>0.8.20</version>
+    <version>0.8.21</version>
   </dependency>
 </dependencies>
 ```
diff --git a/pom.xml b/pom.xml
index e033f65..5b4d3d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>aitoa</groupId>
 	<artifactId>aitoa-code</artifactId>
-	<version>0.8.20</version>
+	<version>0.8.21</version>
 	<packaging>jar</packaging>
 	<name>aitoa-code</name>
 	<description>Example Source Codes from the Book "Introduction to Optimization Algorithms"</description>
@@ -43,9 +43,9 @@
 		<project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 		<java.source.version>1.8</java.source.version>
-		<junit.version>4.12</junit.version>
-		<oshi.version>4.2.1</oshi.version>
-		<slf4j.version>1.7.29</slf4j.version>
+		<junit.version>4.13</junit.version>
+		<oshi.version>4.3.0</oshi.version>
+		<slf4j.version>1.7.30</slf4j.version>
 		<project.mainClass>aitoa.examples.jssp.JSSPExperiment</project.mainClass>
 	</properties>
 
@@ -125,7 +125,7 @@
 				<!-- The Maven Java Compiler plugin. -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.8.1</version>
 				<configuration>
 					<source>${java.source.version}</source>
 					<target>${java.source.version}</target>
@@ -139,14 +139,14 @@
 				<!-- The plugin for running the tests. -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M3</version>
+				<version>3.0.0-M4</version>
 			</plugin>
 
 			<plugin>
 				<!-- The JavaDoc generating and packaging plugin. -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.1.0 </version>
+				<version>3.1.1 </version>
 				<configuration>
 					<show>private</show>
 					<detectLinks>true</detectLinks>
@@ -168,7 +168,7 @@
 				<!-- A plugin for generating a source jar. -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.2.0</version>
 				<configuration>
 					<includePom>true</includePom>
 					<useDefaultExcludes>true</useDefaultExcludes>
@@ -188,7 +188,7 @@
 				<!-- The plugin for generating the actual jar archive. -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.1.1</version>
+				<version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -203,7 +203,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -262,7 +262,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>3.0.0-M3</version>
+				<version>3.0.0-M5</version>
 			</plugin>
 		</plugins>
 	</reporting>
diff --git a/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmod.java b/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmod.java
index 0df5e7f..a1051bc 100644
--- a/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmod.java
+++ b/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmod.java
@@ -260,7 +260,11 @@ public Greedy2p1GAmod(final int _m) {
   /** {@inheritDoc} */
   @Override
   public String toString() {
-    return "Greedy(2+1)GAmod" + this.m; //$NON-NLS-1$
+    final String s = "Greedy(2+1)GAmod"; //$NON-NLS-1$
+    if (this.m != 1) {
+      return s + this.m;
+    }
+    return s;
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmodFFA.java b/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmodFFA.java
index d922c82..ed1c7fd 100644
--- a/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmodFFA.java
+++ b/src/main/java/aitoa/algorithms/bitstrings/Greedy2p1GAmodFFA.java
@@ -282,7 +282,11 @@ public Greedy2p1GAmodFFA(final int _m, final int _UB) {
   /** {@inheritDoc} */
   @Override
   public String toString() {
-    return "Greedy(2+1)GAmodFFA" + this.m; //$NON-NLS-1$
+    final String s = "Greedy(2+1)GAmodFFA"; //$NON-NLS-1$
+    if (this.m != 1) {
+      return s + this.m;
+    }
+    return s;
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/java/aitoa/algorithms/bitstrings/SelfAdjustingOpLcLGAmodFFA.java b/src/main/java/aitoa/algorithms/bitstrings/SelfAdjustingOpLcLGAmodFFA.java
index c41ac95..8b28f68 100644
--- a/src/main/java/aitoa/algorithms/bitstrings/SelfAdjustingOpLcLGAmodFFA.java
+++ b/src/main/java/aitoa/algorithms/bitstrings/SelfAdjustingOpLcLGAmodFFA.java
@@ -302,7 +302,7 @@ public SelfAdjustingOpLcLGAmodFFA(final int _UB) {
   /** {@inheritDoc} */
   @Override
   public String toString() {
-    return "SelfAdjusting(1+(LcL))GAmod"; //$NON-NLS-1$
+    return "SelfAdjusting(1+(LcL))GAmodFFA"; //$NON-NLS-1$
   }
 
   /** {@inheritDoc} */