GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

data: Commented out debugging output, but leaving it there

Browse source
This commit is contained in:
Paul Beckingham 2016-04-29 00:05:19 -04:00
parent b697515b6f
commit 09f3f56544
1 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/data.cpp
View file

@ -29,7 +29,9 @@
#include <Datetime.h> #include <Datetime.h>
#include <Duration.h> #include <Duration.h>
#include <timew.h> #include <timew.h>
/*
#include <iostream> // TODO Remove. #include <iostream> // TODO Remove.
*/
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// A filter is just another interval, containing start, end and tags. // A filter is just another interval, containing start, end and tags.
@ -193,8 +195,10 @@ Interval getFilter (const CLI& cli)
} }
filter.range = range; filter.range = range;
/*
std::cout << "# getFilter:\n"; std::cout << "# getFilter:\n";
std::cout << "# " << filter.dump () << "\n"; std::cout << "# " << filter.dump () << "\n";
*/
return filter; return filter;
} }
@ -218,9 +222,11 @@ std::vector <Range> getHolidays (const Rules& rules)
} }
} }
/*
std::cout << "# getHolidays:\n"; std::cout << "# getHolidays:\n";
for (auto& h : results) for (auto& h : results)
std::cout << "# " << h.dump () << "\n"; std::cout << "# " << h.dump () << "\n";
*/
return results; return results;
} }
@ -277,12 +283,14 @@ std::vector <Range> getAllExclusions (
for (auto& r : exclusion.ranges (range)) for (auto& r : exclusion.ranges (range))
exclusionRanges.push_back (r); exclusionRanges.push_back (r);
/*
auto all = addRanges (range, results, exclusionRanges); auto all = addRanges (range, results, exclusionRanges);
std::cout << "# getAllExclusions:\n"; std::cout << "# getAllExclusions:\n";
for (auto& r : all) for (auto& r : all)
std::cout << "# " << r.dump () << "\n"; std::cout << "# " << r.dump () << "\n";
return all; return all;
// return addRanges (range, results, exclusionRanges); */
return addRanges (range, results, exclusionRanges);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -293,9 +301,11 @@ std::vector <Exclusion> getExclusions (const Rules& rules)
for (auto& name : rules.all ("exclusions.")) for (auto& name : rules.all ("exclusions."))
all.push_back (Exclusion (lowerCase (name), rules.get (name))); all.push_back (Exclusion (lowerCase (name), rules.get (name)));
/*
std::cout << "# getExclusions:\n"; std::cout << "# getExclusions:\n";
for (auto& e : all) for (auto& e : all)
std::cout << "# " << e.dump () << "\n"; std::cout << "# " << e.dump () << "\n";
*/
return all; return all;
} }
@ -310,9 +320,11 @@ std::vector <Interval> getAllInclusions (Database& database)
all.push_back (i); all.push_back (i);
} }
/*
std::cout << "# getAllInclusions:\n"; std::cout << "# getAllInclusions:\n";
for (auto& i : all) for (auto& i : all)
std::cout << "# " << i.dump () << "\n"; std::cout << "# " << i.dump () << "\n";
*/
return all; return all;
} }
@ -326,9 +338,11 @@ std::vector <Interval> subset (
if (matchesFilter (interval, filter)) if (matchesFilter (interval, filter))
all.push_back (interval); all.push_back (interval);
/*
std::cout << "# subset (filter intervals):\n"; std::cout << "# subset (filter intervals):\n";
for (auto& i : all) for (auto& i : all)
std::cout << "# " << i.dump () << "\n"; std::cout << "# " << i.dump () << "\n";
*/
return all; return all;
} }
@ -342,9 +356,11 @@ std::vector <Range> subset (
if (range.overlap (r)) if (range.overlap (r))
all.push_back (r); all.push_back (r);
/*
std::cout << "# subset (ranges):\n"; std::cout << "# subset (ranges):\n";
for (auto& r : all) for (auto& r : all)
std::cout << "# " << r.dump () << "\n"; std::cout << "# " << r.dump () << "\n";
*/
return all; return all;
} }
@ -358,9 +374,11 @@ std::vector <Interval> subset (
if (range.overlap (interval.range)) if (range.overlap (interval.range))
all.push_back (interval); all.push_back (interval);
/*
std::cout << "# subset (intervals):\n"; std::cout << "# subset (intervals):\n";
for (auto& i : all) for (auto& i : all)
std::cout << "# " << i.dump () << "\n"; std::cout << "# " << i.dump () << "\n";
*/
return all; return all;
} }
@ -402,9 +420,11 @@ std::vector <Interval> collapse (
for (auto& piece : pieces) for (auto& piece : pieces)
all.push_back (clip (interval, piece)); all.push_back (clip (interval, piece));
/*
std::cout << "# results:\n"; std::cout << "# results:\n";
for (auto& i : all) for (auto& i : all)
std::cout << "# " << i.dump () << "\n"; std::cout << "# " << i.dump () << "\n";
*/
return all; return all;
} }
@ -425,9 +445,11 @@ std::vector <Range> addRanges (
if (limits.overlap (addition)) if (limits.overlap (addition))
results.push_back (addition); results.push_back (addition);
/*
std::cout << "# addRange:\n"; std::cout << "# addRange:\n";
for (auto& result : results) for (auto& result : results)
std::cout << "# " << result.dump () << "\n"; std::cout << "# " << result.dump () << "\n";
*/
return results; return results;
} }
@ -448,9 +470,11 @@ std::vector <Range> subtractRanges (
for (auto& r3 : r1.subtract (r2)) for (auto& r3 : r1.subtract (r2))
results.push_back (limits.intersect (r3)); results.push_back (limits.intersect (r3));
/*
std::cout << "# addRange:\n"; std::cout << "# addRange:\n";
for (auto& result : results) for (auto& result : results)
std::cout << "# " << result.dump () << "\n"; std::cout << "# " << result.dump () << "\n";
*/
return results; return results;
} }
@ -476,7 +500,9 @@ Range outerRange (const std::vector <Interval>& intervals)
outer.end = Datetime (); outer.end = Datetime ();
} }
/*
std::cout << "# outerRange " << outer.dump () << "\n"; std::cout << "# outerRange " << outer.dump () << "\n";
*/
return outer; return outer;
} }