diff --git a/build/CMakeFiles/HLlib.dir/src/HiddenLines.cpp.o b/build/CMakeFiles/HLlib.dir/src/HiddenLines.cpp.o index 7017456..6e6a2df 100644 Binary files a/build/CMakeFiles/HLlib.dir/src/HiddenLines.cpp.o and b/build/CMakeFiles/HLlib.dir/src/HiddenLines.cpp.o differ diff --git a/build/CMakeFiles/main.dir/src/main.cpp.o b/build/CMakeFiles/main.dir/src/main.cpp.o index 56c18ed..b05c52c 100644 Binary files a/build/CMakeFiles/main.dir/src/main.cpp.o and b/build/CMakeFiles/main.dir/src/main.cpp.o differ diff --git a/build/libHLlib.a b/build/libHLlib.a index 6ae4fa4..f0257c0 100644 Binary files a/build/libHLlib.a and b/build/libHLlib.a differ diff --git a/build/main b/build/main index 0fc03d5..f797fad 100755 Binary files a/build/main and b/build/main differ diff --git a/src/HiddenLines.cpp b/src/HiddenLines.cpp index 8f6f6d5..40d7ab5 100644 --- a/src/HiddenLines.cpp +++ b/src/HiddenLines.cpp @@ -18,6 +18,7 @@ HL::HL() void HL::print_sol() { + auto sol = get_sol(); for(auto itr = sol.begin(); itr != sol.end(); itr++) std::cout << "Line ID " << std::get<0>(*itr) << " visible in range (" << std::get<0>(std::get<1>(*itr)) << @@ -85,8 +86,8 @@ std::set HL::gen_sol(std::set& ls){ } //return sol; - std::set dummy; - return dummy; + //std::set dummy; + //return dummy; } std::set HL::construct_HWprob(){ @@ -156,8 +157,6 @@ std::set HL::get_lines() const{ return lines; } -std::set HL::get_sol() const{ - std::set dummy; - return dummy; - //return sol; +std::set>> HL::get_sol() const{ + return sol; } \ No newline at end of file diff --git a/src/HiddenLines.h b/src/HiddenLines.h index a681777..bf72af8 100644 --- a/src/HiddenLines.h +++ b/src/HiddenLines.h @@ -14,7 +14,7 @@ class HL std::set construct_HWprob(); std::set get_lines() const; - std::set get_sol() const; + std::set>> get_sol() const; private: //Solution is in form (Line ID, (vis_start, vis_end)) diff --git a/src/main.cpp b/src/main.cpp index 5aa686c..4bc7928 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,9 @@ int main(int argc, char *argv[]) << " and a y-intercept of " << line.get_ycept() << std::endl; } - std::set line_sol = inst.gen_sol(lines); + std::cout << "Generating Solution." << std::endl; + inst.gen_sol(lines); + std::cout << "Solution is: " << std::endl; + inst.print_sol(); }