Skip to content

fixed some naming issues - conflicts with class names #2

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixed some naming issues - conflicts with class names #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cecf54
fixed some naming issues - conflicts with class names
FilipeGouveia Oct 28, 2024
68371d5
test file
Nov 5, 2024
d698a5e
eliminated test file
Nov 5, 2024
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
14 changes: 7 additions & 7 deletions main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ int main(int argc, char **argv) {
trs->exit_time="";
trs->route=rid;
trs->route_section_id=rid+"#"+sid;
trs->route_path=instance.sectionMap[rid][std::stoi(sid)]->route_pathName;
trs->route_path_str=instance.sectionMap[rid][std::stoi(sid)]->route_pathName;
for (int j = 0; j < instance.train.size(); ++j) {
if(instance.train[j].id.compare(rid)!=0)
continue;
Expand Down Expand Up @@ -520,8 +520,8 @@ void genEncoding(int argc, char **argv) {
printf("0\n");
for (int j = 0; j < instance.train.size(); ++j) {
int s=0;
for(route_path rp: instance.route[instance.train[j].route].route_path) {
for (route_section *rs: rp.route_section) {
for(route_path rp: instance.route[instance.train[j].route].route_paths) {
for (route_section *rs: rp.route_sections) {
PB *p=new PB();
for (int i = minV; i < maxV; ++i) {
timeV++;
Expand Down Expand Up @@ -1494,7 +1494,7 @@ void outputJSONFile(Instance instance) {
writer.Int(j);

writer.Key("route_path");
writer.String(it1->second->route_path.c_str());
writer.String(it1->second->route_path_str.c_str());

writer.Key("section_requirement");
if(it1->second->section_requirement.size()==0)
Expand Down Expand Up @@ -1583,7 +1583,7 @@ Instance readOutputJSONFile(char* local) {
trs->route_section_id=d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j]["route_section_id"].GetString();
else
trs->route_section_id=std::to_string(d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j]["route_section_id"].GetInt());
trs->route_path=d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j]["route_path"].GetString();
trs->route_path_str=d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j]["route_path"].GetString();
if(d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j].HasMember("section_requirement")){
if(!d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j]["section_requirement"].IsNull()){
trs->section_requirement=d["train_runs"].GetArray()[i]["train_run_sections"].GetArray()[j]["section_requirement"].GetString();
Expand Down Expand Up @@ -1944,11 +1944,11 @@ Instance readJSONFile(char* local) {

}

rp.route_section=rsl;
rp.route_sections=rsl;
rpl.push_front(rp);

}
r.route_path=rpl;
r.route_paths=rpl;
r.totalSeq=nSeq;
rr.insert(std::pair<std::string,Route>(r.id,r));
}
Expand Down
2 changes: 1 addition & 1 deletion problem/Route.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Route {
public:
std::string id;
int totalSeq;
std::list<route_path> route_path;
std::list<route_path> route_paths;
};


Expand Down
2 changes: 1 addition & 1 deletion problem/route_path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class route_path {
public:
std::string id;
std::list<route_section*> route_section;
std::list<route_section*> route_sections;

};

Expand Down
4 changes: 2 additions & 2 deletions problem/stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ void stat(Instance instance, int diff){
for (int j = 0; j < instance.train.size(); ++j) {
int s = 0;
res += instance.train[j].t.size();
for (route_path rp: instance.route[instance.train[j].route].route_path) {
for (route_section *rs: rp.route_section) {
for (route_path rp: instance.route[instance.train[j].route].route_paths) {
for (route_section *rs: rp.route_sections) {
sec++;
}
}
Expand Down
2 changes: 1 addition & 1 deletion problem/train_run_sections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class train_run_sections {
std::string exit_time;
std::string route;
std::string route_section_id;
std::string route_path;
std::string route_path_str;
std::string section_requirement;


Expand Down