GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 19:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Urgency: Replace 'next' coefficient with configuration entry

Browse source
This commit is contained in:
Tomas Babej 2015-09-01 22:13:42 +02:00 • committed by Paul Beckingham
parent a9b7d1b533
commit 6b83945a21
6 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Config.cpp
View file

@ -140,7 +140,7 @@ std::string Config::_defaults =
"dependency.confirmation=on # Should dependency chain repair be confirmed?\n" "dependency.confirmation=on # Should dependency chain repair be confirmed?\n"
"\n" "\n"
"# Urgency Coefficients\n" "# Urgency Coefficients\n"
"urgency.next.coefficient=15.0 # Urgency coefficient for 'next' special tag\n" "urgency.user.tag.next.coefficient=15.0 # Urgency coefficient for 'next' special tag\n"
"urgency.due.coefficient=12.0 # Urgency coefficient for due dates\n" "urgency.due.coefficient=12.0 # Urgency coefficient for due dates\n"
"urgency.blocking.coefficient=8.0 # Urgency coefficient for blocking tasks\n" "urgency.blocking.coefficient=8.0 # Urgency coefficient for blocking tasks\n"
"urgency.active.coefficient=4.0 # Urgency coefficient for active tasks\n" "urgency.active.coefficient=4.0 # Urgency coefficient for active tasks\n"

1
src/Context.cpp
View file

@ -658,7 +658,6 @@ void Context::staticInitialization ()
Task::urgencyBlockedCoefficient = config.getReal ("urgency.blocked.coefficient"); Task::urgencyBlockedCoefficient = config.getReal ("urgency.blocked.coefficient");
Task::urgencyAnnotationsCoefficient = config.getReal ("urgency.annotations.coefficient"); Task::urgencyAnnotationsCoefficient = config.getReal ("urgency.annotations.coefficient");
Task::urgencyTagsCoefficient = config.getReal ("urgency.tags.coefficient"); Task::urgencyTagsCoefficient = config.getReal ("urgency.tags.coefficient");
Task::urgencyNextCoefficient = config.getReal ("urgency.next.coefficient");
Task::urgencyDueCoefficient = config.getReal ("urgency.due.coefficient"); Task::urgencyDueCoefficient = config.getReal ("urgency.due.coefficient");
Task::urgencyBlockingCoefficient = config.getReal ("urgency.blocking.coefficient"); Task::urgencyBlockingCoefficient = config.getReal ("urgency.blocking.coefficient");
Task::urgencyAgeCoefficient = config.getReal ("urgency.age.coefficient"); Task::urgencyAgeCoefficient = config.getReal ("urgency.age.coefficient");

11
src/Task.cpp
View file

@ -80,7 +80,6 @@ float Task::urgencyWaitingCoefficient = 0.0;
float Task::urgencyBlockedCoefficient = 0.0; float Task::urgencyBlockedCoefficient = 0.0;
float Task::urgencyAnnotationsCoefficient = 0.0; float Task::urgencyAnnotationsCoefficient = 0.0;
float Task::urgencyTagsCoefficient = 0.0; float Task::urgencyTagsCoefficient = 0.0;
float Task::urgencyNextCoefficient = 0.0;
float Task::urgencyDueCoefficient = 0.0; float Task::urgencyDueCoefficient = 0.0;
float Task::urgencyBlockingCoefficient = 0.0; float Task::urgencyBlockingCoefficient = 0.0;
float Task::urgencyAgeCoefficient = 0.0; float Task::urgencyAgeCoefficient = 0.0;
@ -1715,7 +1714,6 @@ float Task::urgency_c () const
value += fabsf (Task::urgencyBlockedCoefficient) > epsilon ? (urgency_blocked () * Task::urgencyBlockedCoefficient) : 0.0; value += fabsf (Task::urgencyBlockedCoefficient) > epsilon ? (urgency_blocked () * Task::urgencyBlockedCoefficient) : 0.0;
value += fabsf (Task::urgencyAnnotationsCoefficient) > epsilon ? (urgency_annotations () * Task::urgencyAnnotationsCoefficient) : 0.0; value += fabsf (Task::urgencyAnnotationsCoefficient) > epsilon ? (urgency_annotations () * Task::urgencyAnnotationsCoefficient) : 0.0;
value += fabsf (Task::urgencyTagsCoefficient) > epsilon ? (urgency_tags () * Task::urgencyTagsCoefficient) : 0.0; value += fabsf (Task::urgencyTagsCoefficient) > epsilon ? (urgency_tags () * Task::urgencyTagsCoefficient) : 0.0;
value += fabsf (Task::urgencyNextCoefficient) > epsilon ? (urgency_next () * Task::urgencyNextCoefficient) : 0.0;
value += fabsf (Task::urgencyDueCoefficient) > epsilon ? (urgency_due () * Task::urgencyDueCoefficient) : 0.0; value += fabsf (Task::urgencyDueCoefficient) > epsilon ? (urgency_due () * Task::urgencyDueCoefficient) : 0.0;
value += fabsf (Task::urgencyBlockingCoefficient) > epsilon ? (urgency_blocking () * Task::urgencyBlockingCoefficient) : 0.0; value += fabsf (Task::urgencyBlockingCoefficient) > epsilon ? (urgency_blocking () * Task::urgencyBlockingCoefficient) : 0.0;
value += fabsf (Task::urgencyAgeCoefficient) > epsilon ? (urgency_age () * Task::urgencyAgeCoefficient) : 0.0; value += fabsf (Task::urgencyAgeCoefficient) > epsilon ? (urgency_age () * Task::urgencyAgeCoefficient) : 0.0;
@ -1900,15 +1898,6 @@ float Task::urgency_tags () const
} }
} }
////////////////////////////////////////////////////////////////////////////////
float Task::urgency_next () const
{
if (hasTag ("next"))
return 1.0;
return 0.0;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
// Past Present Future // Past Present Future

2
src/Task.h
View file

@ -51,7 +51,6 @@ public:
static float urgencyBlockedCoefficient; static float urgencyBlockedCoefficient;
static float urgencyAnnotationsCoefficient; static float urgencyAnnotationsCoefficient;
static float urgencyTagsCoefficient; static float urgencyTagsCoefficient;
static float urgencyNextCoefficient;
static float urgencyDueCoefficient; static float urgencyDueCoefficient;
static float urgencyBlockingCoefficient; static float urgencyBlockingCoefficient;
static float urgencyAgeCoefficient; static float urgencyAgeCoefficient;
@ -174,7 +173,6 @@ public:
float urgency_inherit () const; float urgency_inherit () const;
float urgency_annotations () const; float urgency_annotations () const;
float urgency_tags () const; float urgency_tags () const;
float urgency_next () const;
float urgency_due () const; float urgency_due () const;
float urgency_blocking () const; float urgency_blocking () const;
float urgency_age () const; float urgency_age () const;

1
src/commands/CmdInfo.cpp
View file

@ -432,7 +432,6 @@ int CmdInfo::execute (std::string& output)
urgencyTerm (urgencyDetails, "blocking", task.urgency_blocking (), Task::urgencyBlockingCoefficient); urgencyTerm (urgencyDetails, "blocking", task.urgency_blocking (), Task::urgencyBlockingCoefficient);
urgencyTerm (urgencyDetails, "annotations", task.urgency_annotations (), Task::urgencyAnnotationsCoefficient); urgencyTerm (urgencyDetails, "annotations", task.urgency_annotations (), Task::urgencyAnnotationsCoefficient);
urgencyTerm (urgencyDetails, "tags", task.urgency_tags (), Task::urgencyTagsCoefficient); urgencyTerm (urgencyDetails, "tags", task.urgency_tags (), Task::urgencyTagsCoefficient);
urgencyTerm (urgencyDetails, "next", task.urgency_next (), Task::urgencyNextCoefficient);
urgencyTerm (urgencyDetails, "due", task.urgency_due (), Task::urgencyDueCoefficient); urgencyTerm (urgencyDetails, "due", task.urgency_due (), Task::urgencyDueCoefficient);
urgencyTerm (urgencyDetails, "age", task.urgency_age (), Task::urgencyAgeCoefficient); urgencyTerm (urgencyDetails, "age", task.urgency_age (), Task::urgencyAgeCoefficient);

2
test/urgency.t
View file

@ -51,7 +51,7 @@ class TestUrgency(TestCase):
cls.t.config("urgency.annotations.coefficient", "10") cls.t.config("urgency.annotations.coefficient", "10")
cls.t.config("urgency.tags.coefficient", "10") cls.t.config("urgency.tags.coefficient", "10")
cls.t.config("urgency.waiting.coefficient", "-10") cls.t.config("urgency.waiting.coefficient", "-10")
cls.t.config("urgency.next.coefficient", "10") cls.t.config("urgency.user.tag.next.coefficient", "10")
cls.t.config("urgency.user.project.PROJECT.coefficient", "10") cls.t.config("urgency.user.project.PROJECT.coefficient", "10")
cls.t.config("urgency.user.tag.TAG.coefficient", "10") cls.t.config("urgency.user.tag.TAG.coefficient", "10")
cls.t.config("confirmation", "off") cls.t.config("confirmation", "off")