Merge branch 'rc3.1' into 'master'

Rc3.1 See merge request melodic/melodic-upperware!14

Merge branch 'rc3.1' into 'master'
Rc3.1 See merge request melodic/melodic-upperware!14
7710e143 · Alicja Reniewicz · 6b78216f · ba1fa74e · 7710e143 · 7710e143
Commit 7710e143 authored Apr 06, 2021 by Alicja Reniewicz
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/PTSolverCoordinator.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/PTSolverCoordinator.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/WebSecurity.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/WebSecurity.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/PTSolver.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/PTSolver.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTEvaluation.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTEvaluation.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTMover.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTMover.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTNeighbourhood.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTNeighbourhood.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTObjective.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTObjective.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTRandomGenerator.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTRandomGenerator.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTSolution.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTSolution.java
--- a/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/ptcp_wrapper/PTCPWrapper.java
+++ b/zpp-solver/pt-solver/src/main/java/eu/melodic/upperware/pt_solver/pt_solver/ptcp_wrapper/PTCPWrapper.java
--- a/zpp-solver/pt-solver/src/test/java/PTSolverTest.java
+++ b/zpp-solver/pt-solver/src/test/java/PTSolverTest.java
--- a/zpp-solver/pt-solver/src/test/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTMoverTest.java
+++ b/zpp-solver/pt-solver/src/test/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTMoverTest.java
--- a/zpp-solver/pt-solver/src/test/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTSolutionTest.java
+++ b/zpp-solver/pt-solver/src/test/java/eu/melodic/upperware/pt_solver/pt_solver/components/PTSolutionTest.java