benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change PlanningStepGenerator end-of-sequence logic

Browse source 
basically I've changed my mind to prefer an
infinite JobPlanningSequence, which is just
evaluated partially. This removes the need to
embody the logic of planning chunk generation,
which really is a different concern.
This commit is contained in:
Fischlurch 2013-02-11 03:23:10 +01:00
parent 7ada9ff291
commit 25be40bb4a
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/proc/engine/dispatcher.hpp
View file

@ -94,7 +94,6 @@ namespace engine {
return JobPlanningSequence(
relativeFrameLocation(refPoint_),
nextPlanningAnchor.getStartFrame(),
dispatcher_);
}

1
src/proc/engine/frame-coord.hpp
View file

@ -36,6 +36,7 @@ namespace engine {
using mobject::ModelPort;
using lib::time::TimeVar;
using lib::time::Time;
/**

19
src/proc/engine/job-planning.hpp
View file

@ -304,16 +304,15 @@ namespace engine {
//////////////////////////////////////////TODO duplicated storage of a FrameCoord record
//////////////////////////////////////////TODO nextEvaluation_ is only needed to initialise the "current" sequence
//////////////////////////////////////////TODO within the RecursiveSelfIntegration strategy. Maybe this storage could be collapsed?
mutable JobPlanning nextEvaluation_;
JobPlanning nextEvaluation_;
JobPlanning&
void
use_current_location_as_starting_point_for_planning()
{
JobTicket& processingPlan = locationGenerator_->getJobTicketFor (currentLocation_);
nextEvaluation_ = JobPlanning(processingPlan.startExploration()
,currentLocation_);
return nextEvaluation_;
}
@ -327,7 +326,10 @@ namespace engine {
PlanningStepGenerator(FrameCoord startPoint, FrameLocator& locator)
: locationGenerator_(&locator)
, currentLocation_(startPoint)
{ }
{
REQUIRE (startPoint.isDefined());
use_current_location_as_starting_point_for_planning();
}
// default copyable
@ -343,13 +345,16 @@ namespace engine {
friend JobPlanning&
yield (PlanningStepGenerator const& gen)
{
return unConst(gen).use_current_location_as_starting_point_for_planning();
ENSURE (checkPoint (gen));
return unConst(gen).nextEvaluation_;
}
friend void
iterNext (PlanningStepGenerator & gen)
{
gen.currentLocation_ = gen.locationGenerator_->getNextFrame (gen.currentLocation_);
if (checkPoint (gen))
gen.use_current_location_as_starting_point_for_planning();
}
};
@ -398,10 +403,10 @@ namespace engine {
{
public:
JobPlanningSequence(engine::FrameCoord startPoint, int64_t stopPoint, FrameLocator& locator)
JobPlanningSequence(engine::FrameCoord startPoint, FrameLocator& locator)
: ExpandedPlanningSequence(
JobPlanningChunkStartPoint(
PlanningStepGenerator(startPoint,stopPoint,locator))
PlanningStepGenerator(startPoint,locator))
>>= expandPrerequisites) // "flat map" (monad operation)
{ }