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: Renamed 'collapse' to 'flatten', for accuracy

Browse source
This commit is contained in:
Paul Beckingham 2016-05-10 19:57:45 -04:00
parent bd5121e2c8
commit 86ff9189bd
5 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/CmdStart.cpp
View file

@ -52,7 +52,7 @@ int CmdStart (
// Update database.
database.deleteInterval (latest);
for (auto& interval : collapse (modified, exclusions))
for (auto& interval : flatten (modified, exclusions))
database.addInterval (interval);
// TODO intervalSummarїze needs to operate on a vector of similar intervals.

2
src/commands/CmdTrack.cpp
View file

@ -45,7 +45,7 @@ int CmdTrack (
auto holidays = subset (filter.range, getHolidays (rules));
auto exclusions = getAllExclusions (rules, filter.range);
for (auto& interval : collapse (filter, exclusions))
for (auto& interval : flatten (filter, exclusions))
database.addInterval (interval);
if (rules.getBoolean ("verbose"))

4
src/data.cpp
View file

@ -404,7 +404,7 @@ std::vector <Interval> subset (
}
////////////////////////////////////////////////////////////////////////////////
std::vector <Interval> collapse (
std::vector <Interval> flatten (
const Interval& interval,
const std::vector <Range>& exclusions)
{
@ -639,7 +639,7 @@ std::vector <Interval> getTrackedIntervals (
std::vector <Interval> intervals;
for (auto& inclusion : subset (filter, inclusions))
for (auto& interval : collapse (clip (inclusion, filter.range), exclusions))
for (auto& interval : flatten (clip (inclusion, filter.range), exclusions))
intervals.push_back (interval);
return intervals;

2
src/timew.h
View file

@ -45,7 +45,7 @@ std::vector <Interval> getAllInclusions (Database&);
std::vector <Interval> subset (const Interval&, const std::vector <Interval>&);
std::vector <Range> subset (const Range&, const std::vector <Range>&);
std::vector <Interval> subset (const Range&, const std::vector <Interval>&);
std::vector <Interval> collapse (const Interval&, const std::vector <Range>&);
std::vector <Interval> flatten (const Interval&, const std::vector <Range>&);
std::vector <Range> addRanges (const Range&, const std::vector <Range>&, const std::vector <Range>&);
std::vector <Range> subtractRanges (const Range&, const std::vector <Range>&, const std::vector <Range>&);
Range outerRange (const std::vector <Interval>&);

41
test/data.t.cpp
View file

@ -31,9 +31,9 @@
////////////////////////////////////////////////////////////////////////////////
int main (int, char**)
{
UnitTest t (45);
UnitTest t (50);
// std::vector <Interval> collapse (const Interval&, std::vector <Range>&);
// std::vector <Interval> flatten (const Interval&, std::vector <Range>&);
Interval i1;
i1.range = Range (Datetime ("20160427T000000Z"), Datetime ("20160428T000000Z"));
i1.tag ("foo");
@ -42,23 +42,27 @@ int main (int, char**)
Range (Datetime ("20160427T120000Z"), Datetime ("20160427T130000Z")),
Range (Datetime ("20160427T173000Z"), Datetime ("20160428T000000Z"))};
auto results = collapse (i1, exclusions);
t.ok (results.size () == 2, "collapse i1 --> 2 fragments");
t.is (results[0].range.start.toISO (), "20160427T000000Z", "collapse i1 --> results[0].range.start 20160427T000000Z");
t.is (results[0].range.end.toISO (), "20160427T120000Z", "collapse i1 --> results[0].range.end 20160427T120000Z");
t.is (results[1].range.start.toISO (), "20160427T130000Z", "collapse i1 --> results[1].range.start 20160427T130000Z");
t.is (results[1].range.end.toISO (), "20160428T000000Z", "collapse i1 --> results[1].range.end 20160428T000000Z");
auto results = flatten (i1, exclusions);
t.ok (results.size () == 2, "flatten i1 --> 2 fragments");
t.is (results[0].range.start.toISO (), "20160427T080000Z", "flatten i1 --> results[0].range.start 20160427T080000Z");
t.is (results[0].range.end.toISO (), "20160427T120000Z", "flatten i1 --> results[0].range.end 20160427T120000Z");
t.ok (results[0].hasTag ("foo"), "flatten i1 --> results[0].hasTag foo");
t.is (results[1].range.start.toISO (), "20160427T130000Z", "flatten i1 --> results[1].range.start 20160427T130000Z");
t.is (results[1].range.end.toISO (), "20160427T173000Z", "flatten i1 --> results[1].range.end 20160428T173000Z");
t.ok (results[1].hasTag ("foo"), "flatten i1 --> results[1].hasTag foo");
Interval i2;
i2.range = Range (Datetime ("20160427T115500Z"), Datetime ("20160427T130500Z"));
i2.tag ("foo");
results = collapse (i2, exclusions);
t.ok (results.size () == 2, "collapse i2 --> 2 fragments");
t.is (results[0].range.start.toISO (), "20160427T115500Z", "collapse i2 --> results[0].range.start 20160427T115500Z");
t.is (results[0].range.end.toISO (), "20160427T120000Z", "collapse i2 --> results[0].range.end 20160427T120000Z");
t.is (results[1].range.start.toISO (), "20160427T130000Z", "collapse i2 --> results[1].range.start 20160427T130000Z");
t.is (results[1].range.end.toISO (), "20160427T130500Z", "collapse i2 --> results[1].range.end 20160427T130500Z");
results = flatten (i2, exclusions);
t.ok (results.size () == 2, "flatten i2 --> 2 fragments");
t.is (results[0].range.start.toISO (), "20160427T115500Z", "flatten i2 --> results[0].range.start 20160427T115500Z");
t.is (results[0].range.end.toISO (), "20160427T120000Z", "flatten i2 --> results[0].range.end 20160427T120000Z");
t.ok (results[0].hasTag ("foo"), "flatten i2 --> results[0].hasTag foo");
t.is (results[1].range.start.toISO (), "20160427T130000Z", "flatten i2 --> results[1].range.start 20160427T130000Z");
t.is (results[1].range.end.toISO (), "20160427T130500Z", "flatten i2 --> results[1].range.end 20160427T130500Z");
t.ok (results[1].hasTag ("foo"), "flatten i2 --> results[1].hasTag foo");
Interval i3;
i3.range = Range (Datetime ("20160427T160000Z"), Datetime (0));
@ -66,10 +70,11 @@ int main (int, char**)
t.ok (i3.range.started (), "i3 range started");
t.notok (i3.range.ended (), "i3 range not ended");
results = collapse (i3, exclusions);
t.ok (results.size () == 2, "collapse i3 --> 2 fragments");
t.ok (results[0].range.start.toISO () == "20160427T160000Z", "collapse i3 --> results[0].range.start 20160427T160000Z");
t.ok (results[0].range.end.toEpoch () == 0, "collapse i3 --> results[0].range.end -");
results = flatten (i3, exclusions);
t.ok (results.size () == 1, "flatten i3 --> 1 fragment");
t.ok (results[0].range.start.toISO () == "20160427T160000Z", "flatten i3 --> results[0].range.start 20160427T160000Z");
t.ok (results[0].range.end.toEpoch () == 0, "flatten i3 --> results[0].range.end -");
t.ok (results[0].hasTag ("foo"), "flatten i3 --> results[0].hasTag foo");
// bool matchesFilter (const Interval& interval, const Interval& filter);
Interval refOpen;