Commit 854b595e authored by Vladislav Kiselev's avatar Vladislav Kiselev

Исправлены ошибки со сборкой.

parent 5ebf5fe0
.PHONY: Conversion.jar
out_dir = temp out_dir = temp
Conversion.jar: src/inport/**/*.java src/constraints/*.mzn Conversion.jar:
mkdir -p $(out_dir) mkdir -p $(out_dir)
javac -d $(out_dir) -encoding UTF-8 -classpath annotations-java8.jar src/inport/*.java src/inport/ConversionUtils/*.java javac -d $(out_dir) -encoding UTF-8 -cp annotations-java8.jar -cp org.sat4j.core.jar -cp org.sat4j.pb.jar src/inport/*.java src/inport/ConversionUtils/*.java
jar cfe Conversion.jar inport.Main -C $(out_dir) inport -C src constraints jar cfe Conversion.jar inport.Main org.sat4j.core.jar org.sat4j.pb.jar -C $(out_dir) inport -C src constraints
rm -r -f $(out_dir) rm -r -f $(out_dir)
package inport.ConversionUtils; package inport.ConversionUtils;
import inport.*; import inport.*;
import org.jetbrains.annotations.NotNull;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
...@@ -56,7 +55,7 @@ public class Task { ...@@ -56,7 +55,7 @@ public class Task {
} }
@Override @Override
public int compareTo(@NotNull StorageSectionId id) { public int compareTo(StorageSectionId id) {
if (isRealStorage != id.isRealStorage) { if (isRealStorage != id.isRealStorage) {
return (isRealStorage ? 1 : -1); return (isRealStorage ? 1 : -1);
} }
...@@ -1046,7 +1045,7 @@ public class Task { ...@@ -1046,7 +1045,7 @@ public class Task {
} }
@Override @Override
public int compareTo(@NotNull OperationData o) { public int compareTo(OperationData o) {
if (opId != o.opId) { if (opId != o.opId) {
return Integer.compare(opId, o.opId); return Integer.compare(opId, o.opId);
} }
......
This diff is collapsed.
...@@ -61,7 +61,13 @@ public class Storage { ...@@ -61,7 +61,13 @@ public class Storage {
this.id = id; this.id = id;
} }
public Storage(int id, String name, double volume, ArrayList<Pair<Cargo, Double>> storageSections) { public Storage(int id, String name, double volume, Cargo cargo) {
this.id = id;
this.name = name;
storageSections.add(new Pair<>(cargo, volume));
}
public Storage(int id, String name, ArrayList<Pair<Cargo, Double>> storageSections) {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.storageSections = storageSections; this.storageSections = storageSections;
......
...@@ -24,8 +24,13 @@ public class TransportShip extends MovingObject { ...@@ -24,8 +24,13 @@ public class TransportShip extends MovingObject {
public void setStorageSections(ArrayList<Pair<Cargo, Double>> storageSections) { public void setStorageSections(ArrayList<Pair<Cargo, Double>> storageSections) {
this.storageSections = storageSections; this.storageSections = storageSections;
} }
public TransportShip(int id, String name, double volume, Cargo cargo) {
super(id, name);
storageSections.add(new Pair<>(cargo, volume));
}
public TransportShip(int id, String name, ArrayList<Pair<Cargo, Double>> storageSections) { public TransportShip(int id, String name, ArrayList<Pair<Cargo, Double>> storageSections) {
super(id, name); super(id, name);
this.storageSections = storageSections; this.storageSections = storageSections;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment