Skip to content

fixing print bug #23

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
jasonpereira96 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixing print bug #23

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
38 changes: 8 additions & 30 deletions qs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,36 +308,10 @@ vector<int> kSmallest(vector<int>& v, int N, int K)
return kSmallestHeap(v, N, K);
}

void sort_and_print_old(vector<int>& arr, int low, int high, int id)
void print(vector<int>& arr, int id, int lbflag)
{
vector<int> v;

for (int i = low; i <= high; i++) {
v.push_back(arr[i]);
}
insertion_sort(v);

ofstream output_file("output.txt", id == 0 ? std::ios_base::out : std::ios_base::app);
if (output_file.is_open())
{
if (id == 0)
{
output_file << "Sorted data" << endl;
}
for (int i = 0; i < v.size(); i++)
{
output_file << v[i] << endl;
}
output_file.close();
}
}

void sort_and_print(vector<int>& arr, int id, int lbflag)
{
vector<int> v;

insertion_sort(arr);

// my code
ofstream output_file(lbflag ? "Sorted-LB.txt" : "Sorted-No-LB.txt", std::ios_base::app);
if (output_file.is_open())
Expand Down Expand Up @@ -714,6 +688,11 @@ int main(int argc, char** argv)
balanceddata = loadbalancing(N, P, balanceddata, myid);
}


insertion_sort(balanceddata);

end = MPI_Wtime();

int token = 566;

// Sequential token passing that prints all the elements in each processor
Expand All @@ -730,7 +709,7 @@ int main(int argc, char** argv)

if (balanceddata.size() > 0)
{
sort_and_print(balanceddata, myid, lbflag);
print(balanceddata, myid, lbflag);
}

// start sending the token from proc 0
Expand All @@ -744,7 +723,7 @@ int main(int argc, char** argv)
// print out this procs elements

if (balanceddata.size() > 0) {
sort_and_print(balanceddata, myid, lbflag);
print(balanceddata, myid, lbflag);
}
// send the token to the next proc
if (myid < P - 1) {
Expand All @@ -753,7 +732,6 @@ int main(int argc, char** argv)
}
if (myid == 0)
{
end = MPI_Wtime();

string outputFileName = "output/" + std::to_string(N) + "_" + std::to_string(P) + "_" + std::to_string(skew) + "_" + (lbflag?"LB":"noLB") + "_output.txt";

Expand Down