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

Timeline: verify handling of extreme time offsets

Browse source
This commit is contained in:
Fischlurch 2022-12-16 02:23:20 +01:00
parent 5e595c57ca
commit 77bb156615
4 changed files with 98 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib/time/timevalue.hpp
View file

@ -413,6 +413,14 @@ namespace time {
return Offset(distance);
}
inline Offset
operator- (Offset const& start, Offset const& toSubtract)
{
TimeVar distance(start);
distance -= toSubtract;
return Offset(distance);
}
template<typename INT>
inline Offset
operator* (Offset const& distance, INT factor)
@ -507,7 +515,7 @@ namespace time {
};
//-- support using a Duration to build offsets ---------------
//-- support combining and Durations ---------------
inline Duration
operator+ (Duration const& base, Duration const& toAdd)
@ -515,6 +523,13 @@ namespace time {
return Offset(base) + Offset(toAdd);
}
inline Duration
operator- (Duration const& base, Duration const& toRemove)
{
return base > toRemove? Offset(base) - Offset(toRemove)
: Duration::NIL;
}
template<typename INT>
inline Offset
operator* (INT factor, Duration const& dur)

2
src/stage/model/zoom-window.hpp
View file

@ -401,7 +401,6 @@ namespace model {
setVisibleDuration (Duration duration)
{
mutateDuration (_FSecs(duration));
mutateWindow (TimeSpan{startWin_, afterWin_});
fireChangeNotification();
}
@ -985,6 +984,7 @@ namespace model {
duration = maxSaneWinExtension (px);
Rat changedMetric = Rat(px) / duration;
conformWindowToMetric (changedMetric);
ensureInvariants (px);
}
/** @internal resize window to span the given pixel with,

47
tests/stage/model/zoom-window-test.cpp
View file

@ -664,7 +664,7 @@ namespace test {
/*--Test-4-----------*/
win.setVisiblePos(Time{Time::MIN + TimeValue(13)}); // Test: implicitly provoke poisonous factor through extreme offset
CHECK (win.visible().start() == Time::MIN + TimeValue(13)); // even while this position is far off, window start was alinget to it
CHECK (win.visible().start() == Time::MIN + TimeValue(13)); // even while this position is far off, window start was aligned to it
CHECK (win.visible().end() == win.visible().start() + TimeValue{288});
CHECK (win.visible().duration() == TimeValue{288});
@ -792,6 +792,7 @@ namespace test {
void
safeguard_extremeTimePos()
{
/*--Test-1-----------*/
ZoomWindow win{559, TimeSpan{Time::MAX, Duration{TimeValue(3)}}}; // setup a very small window clinging to Time::MAX
CHECK (win.visible().duration() == TimeValue(280)); // duration expanded due to MAX_ZOOM limit
CHECK (win.visible().start() == TimeValue(307445734561825580)); // and properly oriented and aligned within domain
@ -800,15 +801,43 @@ namespace test {
CHECK (win.visible() == win.overallSpan());
CHECK (win.px_per_sec() == 559_r/280*Time::SCALE);
CHECK (win.px_per_sec() == 13975000_r/7);
CHECK (win.pxWidth() == 559);
CHECK (win.pxWidth() == 559);
// SHOW_EXPR(win.overallSpan());
// SHOW_EXPR(_raw(win.overallSpan().duration()));
// SHOW_EXPR(_raw(win.visible().duration()));
// SHOW_EXPR(_raw(win.visible().start()));
// SHOW_EXPR(_raw(win.visible().end()));
// SHOW_EXPR(win.px_per_sec());
// SHOW_EXPR(win.pxWidth());
/*--Test-2-----------*/
Time anchorPos{15_r/16 * Offset(Time::MIN)};
win.setVisiblePos (anchorPos); // scroll to a target position extremely far off
CHECK (win.visible().duration() == TimeValue(280)); // window dimensions retained
CHECK (win.px_per_sec() == 13975000_r/7);
CHECK (win.pxWidth() == 559);
CHECK (win.visible().start() > Time::MIN);
CHECK (win.visible().start() == anchorPos); // window now at desired position
CHECK (win.visible().end() > anchorPos);
CHECK (win.visible().start() == TimeValue(-288230376151711744));
CHECK (win.visible().end() == TimeValue(-288230376151711464));
CHECK (win.overallSpan().start() == win.visible().start()); // canvas expanded accordingly
CHECK (win.overallSpan().end() == Time::MAX);
/*--Test-3-----------*/
win.setOverallDuration(Duration::MAX); // now use maximally expanded canvas
Duration targetDur{99_r/100 * Duration::MAX};
win.setVisibleDuration(targetDur); // and demand the duration be expanded to 99%
CHECK (win.visible().duration() > targetDur); // actual duration slightly more than requested,
CHECK (win.visible().duration() < Duration::MAX);
CHECK (win.visible().start() == Time::MIN); // expansion was anchored at previous position
CHECK (win.visible().start() < Time::MAX); // and thus the window now clings to the lower end
CHECK (win.visible().end() == TimeValue(301415533658088775));
CHECK (win.px_per_sec() == 2019_r/2199023255552); // effective zoom metric has been sanitised numerically
CHECK (win.pxWidth() == 559); // but pixel count is matched precisely
/*--Test-4-----------*/
win.setVisiblePos(Rat{std::numeric_limits<int64_t>::max()-23});
SHOW_EXPR(_raw(win.overallSpan().duration()));
SHOW_EXPR(_raw(win.visible().duration()));
SHOW_EXPR(_raw(win.visible().start()));
SHOW_EXPR(_raw(win.visible().end()));
SHOW_EXPR(win.px_per_sec());
SHOW_EXPR(win.pxWidth());
}

49
wiki/thinkPad.ichthyo.mm
View file

@ -41249,11 +41249,22 @@
<node COLOR="#338800" CREATED="1670982930768" ID="ID_1528129980" MODIFIED="1670982944610" TEXT="erzeugen mit Start-Pos == Time::MAX">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1669475536331" ID="ID_486161883" MODIFIED="1670982947517" TEXT="setVisiblePos mit extremer Time">
<icon BUILTIN="flag-yellow"/>
<node COLOR="#338800" CREATED="1669475536331" ID="ID_486161883" MODIFIED="1671153173786" TEXT="setVisiblePos mit extremer Time">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1669475549345" ID="ID_234786683" MODIFIED="1670982949932" TEXT="setVisiblePos mit extremem Faktor">
<icon BUILTIN="flag-yellow"/>
<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1671153443706" ID="ID_43785368" MODIFIED="1671153469830" TEXT="Rechnung sieht plausibel aus, aber das Ergebnis ist falsch">
<icon BUILTIN="flag-pink"/>
<node CREATED="1671153472181" ID="ID_1963137458" MODIFIED="1671153492750" TEXT="Offset wird auf MAX_DURATION gekappt (korrekt)"/>
<node CREATED="1671153500329" ID="ID_983458362" MODIFIED="1671153514062" TEXT="als relativer Pox-Faktor kommt 1 raus (korrekt)"/>
<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1671153518751" ID="ID_180845154" MODIFIED="1671153548737" TEXT="auch partBeforeAnchor wird anscheinend korrekt berechnet?">
<icon BUILTIN="help"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1671153550626" ID="ID_1354877877" MODIFIED="1671153588403" TEXT="aber visible().end() ist dann nicht Time::MAX">
<icon BUILTIN="broken-line"/>
</node>
</node>
</node>
<node CREATED="1669479474484" ID="ID_1657847338" MODIFIED="1669479489366" TEXT="alle Mutatoren, die conformWindowToMetric() verwenden">
<node CREATED="1670520100834" ID="ID_636101408" MODIFIED="1670520114018" TEXT="das sind nicht viele (&#xfc;berraschenderweise)">
@ -41263,13 +41274,39 @@
</node>
<node CREATED="1670520153513" ID="ID_574049062" MODIFIED="1670520170810" TEXT="wozu? weil dort das Window anteilig neu positioniert wird"/>
<node CREATED="1670520176781" ID="ID_171252675" MODIFIED="1670520196129" TEXT="&#x27f9; gef&#xe4;hrlich wenn die bestehende Window-Pos gef&#xe4;hrlich ist"/>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1670520232861" ID="ID_1248431637" MODIFIED="1670982957635" TEXT="Szenario">
<icon BUILTIN="flag-yellow"/>
<node COLOR="#338800" CREATED="1670520232861" ID="ID_1248431637" MODIFIED="1671153193486" TEXT="Szenario">
<icon BUILTIN="button_ok"/>
<node COLOR="#338800" CREATED="1670520238693" ID="ID_1734279608" MODIFIED="1670982961594" TEXT="sehr kleines Fenster">
<icon BUILTIN="button_ok"/>
</node>
<node CREATED="1670520245444" ID="ID_428615363" MODIFIED="1670520257330" TEXT="fast aber nicht ganz an Time::MIN"/>
<node CREATED="1670520259018" ID="ID_591142628" MODIFIED="1670520301032" TEXT="vergr&#xf6;&#xdf;ern auf Duration::MAX - aWeng"/>
<node COLOR="#338800" CREATED="1670520245444" ID="ID_428615363" MODIFIED="1671153194914" TEXT="fast aber nicht ganz an Time::MIN">
<icon BUILTIN="button_ok"/>
</node>
<node COLOR="#338800" CREATED="1670520259018" ID="ID_591142628" MODIFIED="1671153197781" TEXT="vergr&#xf6;&#xdf;ern auf Duration::MAX - aWeng">
<icon BUILTIN="button_ok"/>
<node CREATED="1671153207589" ID="ID_1801258827" MODIFIED="1671153210390" TEXT="so lala"/>
<node CREATED="1671153211145" ID="ID_779131227" MODIFIED="1671153241103" TEXT="man bekommt nicht exakt die gesetzte Duration"/>
<node CREATED="1671153242324" ID="ID_1578460487" MODIFIED="1671153708063" TEXT="geht aber nicht besser, da Zahlen maximal giftig">
<richcontent TYPE="NOTE"><html>
<head>
</head>
<body>
<p>
wir rechnen von der Duration auf eine Metrik um, weil wir den Mechanismus zur relativen Positionierung haben wollen. Dieser mu&#223; aber detox() verwenden, weil sonst die Division mit der Pixel-Zahl einen numeric-wrap machen w&#252;rde....
</p>
</body>
</html></richcontent>
<node BACKGROUND_COLOR="#f0d5c5" COLOR="#990033" CREATED="1671153715708" ID="ID_293245647" MODIFIED="1671153722052" TEXT="wirklich nicht?">
<icon BUILTIN="help"/>
<node CREATED="1671153746581" ID="ID_965916539" MODIFIED="1671153758123" TEXT="wir brauchen doch nur die relative Positionierung"/>
<node CREATED="1671153758879" ID="ID_318897179" MODIFIED="1671153783226" TEXT="die trickreiche Limitierung und quantisierung ist &#xfc;berfl&#xfc;ssig..."/>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1671153783923" ID="ID_1591963678" MODIFIED="1671153799214" TEXT="...weil wir ja schon eine Duration haben!">
<icon BUILTIN="idea"/>
</node>
</node>
</node>
</node>
</node>
</node>
</node>