Skip to content

feat: accept delta = 0 in local search #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

feat: accept delta = 0 in local search #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ int main(int argc, char *argv[]) {

ASP asp(instance);

Solution s2 = asp.GILS_VND_2(100, 100, 0.05);
Solution s2 = asp.GILS_VND_2(20, 30, 0.05);
s2.print();

Solution s1 = asp.GILS_VND(1, 10, 0);
s1.print();
// Solution s1 = asp.GILS_VND(1, 50, 0);
// s1.print();


return 0;
Expand Down
18 changes: 9 additions & 9 deletions src/neighborhood.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ bool ASP::best_improvement_intra_swap(Solution &solution) {
(prev_start_time - current_flight.get_release_time()) * current_flight.get_delay_penalty();
}

if (penalty < original_penalty && original_penalty - penalty > delta) {
if (penalty < original_penalty && original_penalty - penalty >= delta) {
delta = original_penalty - penalty;
best_i = i;
best_j = j;
Expand All @@ -76,7 +76,7 @@ bool ASP::best_improvement_intra_swap(Solution &solution) {
}

// Apply the best swap found
if (delta > 0) {
if (delta >= 0 && best_i != best_j) {
Runway &best_runway = solution.runways[best_runway_i];

best_runway.sequence[best_i].get().position = best_j;
Expand Down Expand Up @@ -186,7 +186,7 @@ bool ASP::best_improvement_inter_swap(Solution &solution) {
}

if (penalty_i + penalty_j < original_penalty_i + original_penalty_j &&
original_penalty_i + original_penalty_j - (penalty_i + penalty_j) > delta) {
original_penalty_i + original_penalty_j - (penalty_i + penalty_j) >= delta) {
delta = original_penalty_i + original_penalty_j - penalty_i - penalty_j;
best_runway_i = runway_i;
best_runway_j = runway_j;
Expand All @@ -203,7 +203,7 @@ bool ASP::best_improvement_inter_swap(Solution &solution) {
}

// Apply the best swap found
if (delta > 0) {
if (delta >= 0 && best_runway_i != best_runway_j) {
solution.runways[best_runway_i].sequence[best_flight_i].get().position = best_flight_j;
solution.runways[best_runway_i].sequence[best_flight_i].get().runway = best_runway_j;

Expand Down Expand Up @@ -399,7 +399,7 @@ bool ASP::best_improvement_inter_move(Solution &solution) {
}

if (penalty_i + penalty_j < original_penalty_i + original_penalty_j &&
original_penalty_i + original_penalty_j - (penalty_i + penalty_j) > delta) {
original_penalty_i + original_penalty_j - (penalty_i + penalty_j) >= delta) {
delta = original_penalty_i + original_penalty_j - penalty_i - penalty_j;
best_runway_i = runway_i;
best_runway_j = runway_j;
Expand All @@ -412,7 +412,7 @@ bool ASP::best_improvement_inter_move(Solution &solution) {
}

// Apply the best move found
if (delta > 0) {
if (delta >= 0 && best_runway_i != best_runway_j) {
solution.runways[best_runway_i].sequence[best_flight_i].get().position = best_flight_j;
solution.runways[best_runway_i].sequence[best_flight_i].get().runway = best_runway_j;
solution.runways[best_runway_i].prefix_penalty.pop_back();
Expand Down Expand Up @@ -617,7 +617,7 @@ bool ASP::best_improvement_intra_move(Solution &solution) {

const int delta = static_cast<int>(new_penalty) - static_cast<int>(original_penalty);

if (delta < best_delta) {
if (delta <= best_delta) {
best_delta = delta;
best_flight_i = flight_i;
best_flight_j = flight_j;
Expand Down Expand Up @@ -733,7 +733,7 @@ bool ASP::best_improvement_intra_move(Solution &solution) {

const int delta = static_cast<int>(new_penalty) - static_cast<int>(original_penalty);

if (delta < best_delta) {
if (delta <= best_delta) {
best_delta = delta;
best_flight_i = flight_i;
best_flight_j = flight_j;
Expand All @@ -742,7 +742,7 @@ bool ASP::best_improvement_intra_move(Solution &solution) {
}
}
}
if (best_delta < 0) {
if (best_delta <= 0 && best_flight_i != best_flight_j) {
Runway &best_runway = solution.runways[best_runway_i];

if (best_flight_i < best_flight_j) {
Expand Down
Loading