Skip to content

Fix uninitialized variables and compiler warnings #38

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
braktar merged 2 commits into from
Feb 4, 2022
Merged

Fix uninitialized variables and compiler warnings #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee551d
Fix compiler warnings and uninitialized variables
senhalil Feb 3, 2022
a71c37d
Deactivate Warray-bounds until protobuf is updated
senhalil Feb 3, 2022
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ RUN wget -qO- $ORTOOLS_URL | tar xz --strip-components=1 -C /srv/or-tools
ADD . /srv/optimizer-ortools

WORKDIR /srv/optimizer-ortools
RUN make -j3 tsp_simple
RUN make tsp_simple
18 changes: 14 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,28 @@ OR_TOOLS_TOP=../or-tools

TUTORIAL=resources

CFLAGS := -std=c++14 -I $(OR_TOOLS_TOP)/include
# -isystem prevents most of the warnings rooted in or-tools library appearing in our compilation
CFLAGS := -std=c++14 -isystem$(OR_TOOLS_TOP)/include

# During development uncomment the next line to have debug checks and other verifications
# DEVELOPMENT = true
ifeq ($(DEVELOPMENT), true)
# -isystem prevents warnings rooted in or-tools library appearing in our compilation
CFLAGS := $(CFLAGS) -O0 -DDEBUG -ggdb3 -fsanitize=address -fkeep-inline-functions -fno-inline-small-functions -Wall -Wextra -Wshadow -Wunreachable-code -Winit-self -Wmissing-include-dirs -Wswitch-enum -Wfloat-equal -Wundef -isystem$(OR_TOOLS_TOP)/. -isystem$(OR_TOOLS_TOP)/include
CXX := LSAN_OPTION=verbosity=1:log_threads=1 $(CXX)
CFLAGS := $(CFLAGS) -O0 -DDEBUG -ggdb3 -fsanitize=address -fkeep-inline-functions -fno-inline-small-functions
CXX := LSAN_OPTION=verbosity=1:log_threads=1 $(CXX) # adress sanitizer works only if the executable launched without gdb
else
CFLAGS := $(CFLAGS) -O3 -DNDEBUG
endif

# Activate warnings
CFLAGS := $(CFLAGS) -Wall -Wextra -Wshadow -Wmissing-include-dirs -Wswitch-enum -Wfloat-equal -Wundef

# The following is to supress a warning due to a protobuf that is fixed at v3.14.
# It can be removed when or-tools is upgraded to v8.1+ (where the protobuf dependency is upgraded to v3.14).
PROTOBUF_VERSION := $(shell $(OR_TOOLS_TOP)/bin/protoc --version | cut -d" " -f2)
ifeq ($(shell dpkg --compare-versions $(PROTOBUF_VERSION) 'lt' '3.14' && echo true), true)
CFLAGS := $(CFLAGS) -Wno-array-bounds
endif

.PHONY: all local_clean

all: $(EXE)
Expand Down
8 changes: 3 additions & 5 deletions limits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ class NoImprovementLimit : public SearchLimit {
best_result_ = kint64min;
}

DCHECK_NOTNULL(objective_var);
prototype_->AddObjective(objective_var);
prototype_->AddObjective(DCHECK_NOTNULL(objective_var));
}

virtual void Init() {
Expand Down Expand Up @@ -145,7 +144,7 @@ class NoImprovementLimit : public SearchLimit {

virtual void Copy(const SearchLimit* const limit) {
const NoImprovementLimit* const copy_limit =
reinterpret_cast<const NoImprovementLimit* const>(limit);
reinterpret_cast<const NoImprovementLimit*>(limit);

best_result_ = copy_limit->best_result_;
solution_nbr_tolerance_ = copy_limit->solution_nbr_tolerance_;
Expand Down Expand Up @@ -597,8 +596,7 @@ class LoggerMonitor : public SearchMonitor {
}

virtual void Copy(const SearchLimit* const limit) {
const LoggerMonitor* const copy_limit =
reinterpret_cast<const LoggerMonitor* const>(limit);
const LoggerMonitor* const copy_limit = reinterpret_cast<const LoggerMonitor*>(limit);

best_result_ = copy_limit->best_result_;
cleaned_cost_ = copy_limit->cleaned_cost_;
Expand Down
4 changes: 2 additions & 2 deletions tsp_simple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ RestBuilder(const TSPTWDataDT& data, RoutingModel& routing, const int64 horizon)
}

void RelationBuilder(const TSPTWDataDT& data, RoutingModel& routing,
RoutingIndexManager& manager, bool& has_overall_duration) {
bool& has_overall_duration) {
Solver* solver = routing.solver();
// const int size_vehicles = data.Vehicles().size();

Expand Down Expand Up @@ -1520,7 +1520,7 @@ const ortools_result::Result* TSPTWSolver(const TSPTWDataDT& data,
min_start);
std::vector<std::vector<IntervalVar*>> stored_rests =
RestBuilder(data, routing, horizon);
RelationBuilder(data, routing, manager, has_overall_duration);
RelationBuilder(data, routing, has_overall_duration);
RoutingSearchParameters parameters = DefaultRoutingSearchParameters();

CHECK(google::protobuf::TextFormat::MergeFromString(
Expand Down
104 changes: 55 additions & 49 deletions tsptw_data_dt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,29 @@ namespace operations_research {

class TSPTWDataDT {
public:
explicit TSPTWDataDT(const std::string& filename) { LoadInstance(filename); }
explicit TSPTWDataDT(const std::string& filename)
: size_problem_(0)
, size_(0)
, size_matrix_(0)
, size_missions_(0)
, size_rest_(0)
, deliveries_counter_(0)
, horizon_(0)
, max_distance_(0)
, max_distance_cost_(0)
, max_rest_(0)
, max_service_(0)
, max_time_(0)
, max_time_cost_(0)
, max_value_(0)
, max_value_cost_(0)
, multiple_tws_counter_(0)
, sum_max_time_(0)
, tws_counter_(0)
, max_coef_service_(0)
, max_coef_setup_(0) {
LoadInstance(filename);
}

void LoadInstance(const std::string& filename);

Expand Down Expand Up @@ -185,7 +207,7 @@ class TSPTWDataDT {
}

bool AllServicesHaveEnd() const {
for (int i = 0; i < tsptw_clients_.size(); i++) {
for (std::size_t i = 0; i < tsptw_clients_.size(); i++) {
if (tsptw_clients_[i].due_time.size() == 0)
return false;
}
Expand Down Expand Up @@ -274,7 +296,7 @@ class TSPTWDataDT {

std::vector<int64> MaxTimes(const ortools_vrp::Matrix& matrix) const {
int64 max_row;
int32 size_matrix = sqrt(matrix.time_size());
int32 size_matrix = sqrt(matrix.time_size());
std::vector<int64> max_times;
for (int32 i = 0; i < size_matrix; i++) {
max_row = 0;
Expand Down Expand Up @@ -571,7 +593,7 @@ class TSPTWDataDT {
}

bool AllVehiclesHaveEnd() {
for (int v = 0; v < tsptw_vehicles_.size(); v++) {
for (std::size_t v = 0; v < tsptw_vehicles_.size(); v++) {
if (!VehicleHasEnd(v))
return false;
}
Expand Down Expand Up @@ -702,11 +724,26 @@ class TSPTWDataDT {
bool is_break;
};

uint32 size_problem_;
int32 size_;
int32 size_missions_;
int32 size_matrix_;
int32 size_missions_;
int32 size_rest_;
uint32 size_problem_;
int64 deliveries_counter_;
int64 horizon_;
int64 max_distance_;
int64 max_distance_cost_;
int64 max_rest_;
int64 max_service_;
int64 max_time_;
int64 max_time_cost_;
int64 max_value_;
int64 max_value_cost_;
int64 multiple_tws_counter_;
int64 sum_max_time_;
int64 tws_counter_;
float max_coef_service_;
float max_coef_setup_;
std::vector<int32> tws_size_;
std::vector<Vehicle> tsptw_vehicles_;
std::vector<Relation> tsptw_relations_;
Expand All @@ -719,21 +756,6 @@ class TSPTWDataDT {
std::vector<int> vehicles_day_;
std::vector<int64> service_times_;
std::string details_;
int64 horizon_;
int64 max_time_;
int64 sum_max_time_;
int64 max_distance_;
int64 max_value_;
int64 max_time_cost_;
int64 max_distance_cost_;
int64 max_value_cost_;
float max_coef_service_;
float max_coef_setup_;
int64 max_service_;
int64 max_rest_;
int64 tws_counter_;
int64 deliveries_counter_;
int64 multiple_tws_counter_;
std::map<std::string, int64> ids_map_;
std::map<std::string, int64> vehicle_ids_map_;
std::map<int64, int64> day_index_to_vehicle_index_;
Expand All @@ -751,12 +773,8 @@ void TSPTWDataDT::LoadInstance(const std::string& filename) {
}
}

int32 node_index = 0;
tws_counter_ = 0;
multiple_tws_counter_ = 0;
deliveries_counter_ = 0;
int32 matrix_index = 0;
size_problem_ = 0;
int32 node_index = 0;
int32 matrix_index = 0;
std::vector<int64> matrix_indices;
for (const ortools_vrp::Service& service : problem.services()) {
if (!alternative_size_map_.count(service.problem_index()))
Expand Down Expand Up @@ -877,7 +895,6 @@ void TSPTWDataDT::LoadInstance(const std::string& filename) {
++matrix_index;
}

size_rest_ = 0;
for (const ortools_vrp::Vehicle& vehicle : problem.vehicles()) {
service_times_.push_back(0);
service_times_.push_back(0);
Expand All @@ -888,14 +905,6 @@ void TSPTWDataDT::LoadInstance(const std::string& filename) {
size_missions_ = node_index;
size_ = node_index + 2;

max_time_ = 0;
max_distance_ = 0;
max_value_ = 0;
max_time_cost_ = 0;
max_distance_cost_ = 0;
max_value_cost_ = 0;
sum_max_time_ = 0;

for (const ortools_vrp::Matrix& matrix : problem.matrices()) {
// + 2 In case vehicles have no depots
int32 problem_size =
Expand All @@ -922,9 +931,9 @@ void TSPTWDataDT::LoadInstance(const std::string& filename) {

// Estimate necessary horizon due to time matrix
std::vector<int64> max_times(MaxTimes(matrix));
int64 matrix_sum_time = 0;
int64 matrix_sum_time = 0;
if (sqrt(matrix.time_size()) > 0) {
for (int64 i = 0; i < matrix_indices.size(); i++) {
for (std::size_t i = 0; i < matrix_indices.size(); i++) {
matrix_sum_time += max_times.at(matrix_indices[i]);
}
}
Expand Down Expand Up @@ -1112,29 +1121,26 @@ void TSPTWDataDT::LoadInstance(const std::string& filename) {
}

// Compute horizon
horizon_ = 0;
max_service_ = 0;
max_rest_ = 0;
int64 rest_duration;
for (int32 v = 0; v < tsptw_vehicles_.size(); v++) {
for (std::size_t v = 0; v < tsptw_vehicles_.size(); v++) {
rest_duration = 0;
for (int32 r = 0; r < tsptw_vehicles_[v].Rests().size(); r++) {
for (std::size_t r = 0; r < tsptw_vehicles_[v].Rests().size(); r++) {
rest_duration += tsptw_vehicles_[v].Rests()[r].duration;
}
max_rest_ = std::max(max_rest_, rest_duration);
}
if (AllVehiclesHaveEnd()) {
for (int32 v = 0; v < tsptw_vehicles_.size(); v++) {
for (std::size_t v = 0; v < tsptw_vehicles_.size(); v++) {
horizon_ = std::max(horizon_, tsptw_vehicles_[v].time_end +
tsptw_vehicles_[v].time_maximum_lateness);
}
} else if (AllServicesHaveEnd()) {
for (int32 i = 0; i < tsptw_clients_.size(); i++) {
for (std::size_t i = 0; i < tsptw_clients_.size(); i++) {
horizon_ = std::max(horizon_, tsptw_clients_[i].due_time.back() +
tsptw_clients_[i].maximum_lateness.back());
}
for (int32 v = 0; v < tsptw_vehicles_.size(); v++) {
for (int32 r = 0; r < tsptw_vehicles_[v].Rests().size(); r++) {
for (std::size_t v = 0; v < tsptw_vehicles_.size(); v++) {
for (std::size_t r = 0; r < tsptw_vehicles_[v].Rests().size(); r++) {
horizon_ = std::max(horizon_, tsptw_vehicles_[v].Rests()[r].due_time);
}
}
Expand All @@ -1150,10 +1156,10 @@ void TSPTWDataDT::LoadInstance(const std::string& filename) {
latest_start = std::max(latest_start, tsptw_clients_[i].ready_time.back());
}
}
for (int32 v = 0; v < tsptw_vehicles_.size(); v++) {
for (std::size_t v = 0; v < tsptw_vehicles_.size(); v++) {
latest_start = std::max(latest_start, tsptw_vehicles_[v].time_start);

for (int32 r = 0; r < tsptw_vehicles_[v].Rests().size(); r++) {
for (std::size_t r = 0; r < tsptw_vehicles_[v].Rests().size(); r++) {
latest_rest_end =
std::max(latest_rest_end, tsptw_vehicles_[v].Rests()[r].due_time);
}
Expand Down