Compare commits
2 Commits
de7d671411
...
5e1de21a22
| Author | SHA1 | Date | |
|---|---|---|---|
| 5e1de21a22 | |||
| 11d8f8e757 |
2
main.cpp
2
main.cpp
@ -12,7 +12,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef TEMP_MIN
|
#ifndef TEMP_MIN
|
||||||
#define TEMP_MIN 0.01
|
#define TEMP_MIN 10
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
|
|||||||
3
sa.hpp
3
sa.hpp
@ -65,7 +65,8 @@ class box {
|
|||||||
auto swappable11(box &other, int capacity) -> bool {
|
auto swappable11(box &other, int capacity) -> bool {
|
||||||
long long choice1 = items.top();
|
long long choice1 = items.top();
|
||||||
long long choice2 = other.items.top();
|
long long choice2 = other.items.top();
|
||||||
return choice1 + other.fullness - choice2 <= capacity &&
|
return choice1 != choice2 &&
|
||||||
|
choice1 + other.fullness - choice2 <= capacity &&
|
||||||
choice2 + fullness - choice1 <= capacity;
|
choice2 + fullness - choice1 <= capacity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user