Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
Conversion
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Vladislav Kiselev
Conversion
Commits
854b595e
Commit
854b595e
authored
Jul 11, 2019
by
Vladislav Kiselev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправлены ошибки со сборкой.
parent
5ebf5fe0
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
43 deletions
+57
-43
Makefile
Makefile
+5
-3
src/inport/ConversionUtils/Task.java
src/inport/ConversionUtils/Task.java
+2
-3
src/inport/InPort.java
src/inport/InPort.java
+36
-34
src/inport/Storage.java
src/inport/Storage.java
+7
-1
src/inport/TransportShip.java
src/inport/TransportShip.java
+7
-2
No files found.
Makefile
View file @
854b595e
.PHONY
:
Conversion.jar
out_dir
=
temp
Conversion.jar
:
src/inport/**/*.java src/constraints/*.mzn
Conversion.jar
:
mkdir
-p
$(out_dir)
javac
-d
$(out_dir)
-encoding
UTF-8
-c
lasspath
annotations-java8
.jar src/inport/
*
.java src/inport/ConversionUtils/
*
.java
jar cfe Conversion.jar inport.Main
-C
$(out_dir)
inport
-C
src constraints
javac
-d
$(out_dir)
-encoding
UTF-8
-c
p
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
org.sat4j.core.jar org.sat4j.pb.jar
-C
$(out_dir)
inport
-C
src constraints
rm
-r
-f
$(out_dir)
src/inport/ConversionUtils/Task.java
View file @
854b595e
package
inport.ConversionUtils
;
import
inport.*
;
import
org.jetbrains.annotations.NotNull
;
import
java.io.FileWriter
;
import
java.io.IOException
;
...
...
@@ -56,7 +55,7 @@ public class Task {
}
@Override
public
int
compareTo
(
@NotNull
StorageSectionId
id
)
{
public
int
compareTo
(
StorageSectionId
id
)
{
if
(
isRealStorage
!=
id
.
isRealStorage
)
{
return
(
isRealStorage
?
1
:
-
1
);
}
...
...
@@ -1046,7 +1045,7 @@ public class Task {
}
@Override
public
int
compareTo
(
@NotNull
OperationData
o
)
{
public
int
compareTo
(
OperationData
o
)
{
if
(
opId
!=
o
.
opId
)
{
return
Integer
.
compare
(
opId
,
o
.
opId
);
}
...
...
src/inport/InPort.java
View file @
854b595e
This diff is collapsed.
Click to expand it.
src/inport/Storage.java
View file @
854b595e
...
...
@@ -61,7 +61,13 @@ public class Storage {
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
.
name
=
name
;
this
.
storageSections
=
storageSections
;
...
...
src/inport/TransportShip.java
View file @
854b595e
...
...
@@ -26,6 +26,11 @@ public class TransportShip extends MovingObject {
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
)
{
super
(
id
,
name
);
this
.
storageSections
=
storageSections
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment