工单

sd-framework/src/main/java/com/sd/framework/util/packing/GA.java

@@ -218,7 +218,7 @@ public class GA {
             for (int j = 0; j < sequence.size(); j++) {
                 initSequence[j] = sequence.get(j);
             }
-            Genome genome = new Genome(width, length, items, isRotateEnable, initSequence.clone());
+            Genome genome = new Genome(length, width, items, isRotateEnable, initSequence.clone());
             genome.updateFitnessAndSolution();
             population.add(genome);
         }
@@ -277,7 +277,7 @@ public class GA {
      * @return 返回拷贝好的基因
      */
     private Genome copyGenome(Genome genome) {
-        Genome copy = new Genome(genome.getWidth(), genome.getLength(), genome.getItems(), genome.isRotateEnable(), genome.getGenomeArray().clone());
+        Genome copy = new Genome(genome.getLength(), genome.getWidth(), genome.getItems(), genome.isRotateEnable(), genome.getGenomeArray().clone());
         copy.setSolution(genome.getSolution());
         copy.setFitness(genome.getFitness());
         return copy;

sd-framework/src/main/java/com/sd/framework/util/packing/model/Genome.java

@@ -9,14 +9,14 @@ import lombok.Setter;
 public class Genome {
 
     /**
-     * 边界的宽
+     * 边界的长
      */
-    private double width;
+    private double length;
 
     /**
-     * 边界的长
+     * 边界的宽
      */
-    private double length;
+    private double width;
 
     /**
      * 矩形数组
@@ -46,13 +46,13 @@ public class Genome {
     /**
      * 基因对象的构造函数
      *
-     * @param width          边界宽度
      * @param length         边界高度
+     * @param width          边界宽度
      * @param items          矩形集合
      * @param isRotateEnable 是否可以旋转
      * @param genomeArray    基因序列
      */
-    public Genome(double width, double length, Item[] items, boolean isRotateEnable, int[] genomeArray) {
+    public Genome(double length, double width, Item[] items, boolean isRotateEnable, int[] genomeArray) {
         this.width = width;
         this.length = length;
         this.items = items;