Skip to content

Commit

Permalink
quilt.cpp: implement aspect expansion
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcraveiro
mcraveiro committed Sep 26, 2016
1 parent 85bc2c5 commit de79995
Show file tree
Hide file tree
Showing 8 changed files with 321 additions and 84 deletions.
114 changes: 57 additions & 57 deletions diagrams/quilt.cpp.dia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32188,13 +32188,13 @@ and element.#</dia:string>
</dia:object>
<dia:object type="UML - Class" version="0" id="O257">
<dia:attribute name="obj_pos">
<dia:point val="51,58"/>
<dia:point val="58,58"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="50.95,57.95;76.575,64.85"/>
<dia:rectangle val="57.95,57.95;83.575,64.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="51,58"/>
<dia:point val="58,58"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="25.524999999999999"/>
Expand Down Expand Up @@ -33494,7 +33494,7 @@ and element.#</dia:string>
</dia:object>
<dia:object type="UML - Association" version="2" id="O266">
<dia:attribute name="name">
<dia:string>#&lt; transforms yarn model using#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="1"/>
Expand Down Expand Up @@ -33533,16 +33533,16 @@ and element.#</dia:string>
<dia:point val="63.755,49.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="50.95,49.05;64.505,58.8"/>
<dia:rectangle val="57.95,49.05;64.505,58.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="63.755,49.8"/>
<dia:point val="63.755,54"/>
<dia:point val="51,54"/>
<dia:point val="51,58"/>
<dia:point val="58,54"/>
<dia:point val="58,58"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
Expand Down Expand Up @@ -33638,13 +33638,13 @@ and element.#</dia:string>
</dia:object>
<dia:object type="UML - Class" version="0" id="O268">
<dia:attribute name="obj_pos">
<dia:point val="97,43"/>
<dia:point val="103,43"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="96.95,42.95;117.955,47.45"/>
<dia:rectangle val="102.95,42.95;123.955,47.45"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="97,43"/>
<dia:point val="103,43"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="20.905000000000001"/>
Expand Down Expand Up @@ -34260,17 +34260,17 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="161.52,58"/>
<dia:point val="151.26,58"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="160.77,32.35;190.535,58.8"/>
<dia:rectangle val="150.51,32.35;190.535,58.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="161.52,58"/>
<dia:point val="161.52,53"/>
<dia:point val="151.26,58"/>
<dia:point val="151.26,53"/>
<dia:point val="190.335,53"/>
<dia:point val="190.335,32.4"/>
</dia:attribute>
Expand All @@ -34289,7 +34289,7 @@ and element.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O271" connection="2"/>
<dia:connection handle="0" to="O271" connection="1"/>
<dia:connection handle="1" to="O211" connection="6"/>
</dia:connections>
<dia:childnode parent="O0"/>
Expand Down Expand Up @@ -34564,17 +34564,17 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="97,43"/>
<dia:point val="103,43"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="81.4825,33.15;97.75,43.8"/>
<dia:rectangle val="81.4825,33.15;103.75,43.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="97,43"/>
<dia:point val="97,38"/>
<dia:point val="103,43"/>
<dia:point val="103,38"/>
<dia:point val="81.5325,38"/>
<dia:point val="81.5325,33.2"/>
</dia:attribute>
Expand Down Expand Up @@ -34636,27 +34636,27 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="117.905,47.4"/>
<dia:point val="51.3775,49.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="117.155,46.65;141.2,58.8"/>
<dia:rectangle val="50.6275,49.05;151.46,83.05"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="117.905,47.4"/>
<dia:point val="117.905,53.05"/>
<dia:point val="141,53.05"/>
<dia:point val="141,58"/>
<dia:point val="51.3775,49.8"/>
<dia:point val="51.3775,83"/>
<dia:point val="151.26,83"/>
<dia:point val="151.26,62.4"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
<dia:enum val="0"/>
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="orth_autoroute">
<dia:boolean val="true"/>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="text_colour">
<dia:color val="#000000"/>
Expand All @@ -34665,20 +34665,20 @@ and element.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O268" connection="7"/>
<dia:connection handle="1" to="O271" connection="0"/>
<dia:connection handle="0" to="O261" connection="6"/>
<dia:connection handle="1" to="O271" connection="6"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
<dia:object type="UML - Class" version="0" id="O277">
<dia:attribute name="obj_pos">
<dia:point val="100,58"/>
<dia:point val="101,58"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="99.95,57.95;120.57,62.45"/>
<dia:rectangle val="100.95,57.95;121.57,62.45"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="100,58"/>
<dia:point val="101,58"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="20.52"/>
Expand Down Expand Up @@ -34868,19 +34868,19 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="110.26,58"/>
<dia:point val="111.26,58"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="107.403,47.35;111.01,58.8"/>
<dia:rectangle val="110.51,47.35;124.105,58.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="110.26,58"/>
<dia:point val="110.26,54"/>
<dia:point val="107.453,54"/>
<dia:point val="107.453,47.4"/>
<dia:point val="111.26,58"/>
<dia:point val="111.26,54"/>
<dia:point val="123.905,54"/>
<dia:point val="123.905,47.4"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
Expand All @@ -34898,7 +34898,7 @@ and element.#</dia:string>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O277" connection="1"/>
<dia:connection handle="1" to="O268" connection="6"/>
<dia:connection handle="1" to="O268" connection="7"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
Expand Down Expand Up @@ -35012,19 +35012,19 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="97,47.4"/>
<dia:point val="103,47.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="76.475,46.65;97.75,58.8"/>
<dia:rectangle val="83.475,46.65;103.75,58.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="97,47.4"/>
<dia:point val="97,54"/>
<dia:point val="76.525,54"/>
<dia:point val="76.525,58"/>
<dia:point val="103,47.4"/>
<dia:point val="103,54"/>
<dia:point val="83.525,54"/>
<dia:point val="83.525,58"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
Expand All @@ -35048,13 +35048,13 @@ and element.#</dia:string>
</dia:object>
<dia:object type="UML - Class" version="0" id="O281">
<dia:attribute name="obj_pos">
<dia:point val="66,75"/>
<dia:point val="79,75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="65.95,74.95;76.0325,78.05"/>
<dia:rectangle val="78.95,74.95;89.0325,78.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="66,75"/>
<dia:point val="79,75"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="9.9824999999999999"/>
Expand Down Expand Up @@ -35195,19 +35195,19 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="63.7625,64.8"/>
<dia:point val="70.7625,64.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="63.0125,64.05;71.1912,75.8"/>
<dia:rectangle val="70.0125,64.05;84.1912,75.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="63.7625,64.8"/>
<dia:point val="63.7625,71"/>
<dia:point val="70.9912,71"/>
<dia:point val="70.9912,75"/>
<dia:point val="70.7625,64.8"/>
<dia:point val="70.7625,71"/>
<dia:point val="83.9912,71"/>
<dia:point val="83.9912,75"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
Expand Down Expand Up @@ -35861,17 +35861,17 @@ and element.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="117.905,43"/>
<dia:point val="123.905,43"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="117.155,32.35;131.46,44.6"/>
<dia:rectangle val="123.155,32.35;131.46,44.6"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="117.905,43"/>
<dia:point val="117.905,38"/>
<dia:point val="123.905,43"/>
<dia:point val="123.905,38"/>
<dia:point val="131.26,38"/>
<dia:point val="131.26,32.4"/>
</dia:attribute>
Expand Down
8 changes: 4 additions & 4 deletions diagrams/yarn.dia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19281,17 +19281,17 @@ space.#</dia:string>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="-186.863,25.9502"/>
<dia:point val="-186.801,25.9502"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-187.647,20.25;-169.8,26.8"/>
<dia:rectangle val="-187.56,20.25;-169.8,26.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="-186.863,25.9502"/>
<dia:point val="-187.092,21"/>
<dia:point val="-186.801,25.9502"/>
<dia:point val="-186.863,21"/>
<dia:point val="-170,21"/>
<dia:point val="-170,26"/>
</dia:attribute>
Expand Down
47 changes: 27 additions & 20 deletions doc/agile/sprint_backlog_89.org
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,27 @@
** Active

#+begin: clocktable :maxlevel 3 :scope subtree :indent nil :emphasize nil :scope file :narrow 75 :formula %
#+CAPTION: Clock summary at [2016-09-26 Mon 21:24]
#+CAPTION: Clock summary at [2016-09-26 Mon 22:51]
| <75> | | | | |
| Headline | Time | | | % |
|-----------------------------------------------------------------------------+--------+------+------+-------|
| *Total time* | *8:30* | | | 100.0 |
| *Total time* | *9:56* | | | 100.0 |
|-----------------------------------------------------------------------------+--------+------+------+-------|
| Stories | 8:30 | | | 100.0 |
| Active | | 8:30 | | 100.0 |
| STARTED Sprint and product backlog grooming | | | 0:40 | 7.8 |
| COMPLETED Edit release notes for previous sprint | | | 0:07 | 1.4 |
| COMPLETED Generation of formattable is incorrect | | | 2:30 | 29.4 |
| COMPLETED Visitor includes are incorrect | | | 0:20 | 3.9 |
| COMPLETED Add includer to quilt.cpp | | | 1:46 | 20.8 |
| COMPLETED Add reducer to quilt.cpp | | | 0:22 | 4.3 |
| COMPLETED Add new index to formtter container | | | 0:19 | 3.7 |
| COMPLETED Add path expander to quilt.cpp | | | 0:49 | 9.6 |
| COMPLETED Add guard expander to quilt.cpp | | | 0:27 | 5.3 |
| COMPLETED Investigate borked travis build | | | 0:37 | 7.3 |
| COMPLETED Add decoration expander to quilt.cpp | | | 0:23 | 4.5 |
| STARTED Run tests that are passing on windows | | | 0:10 | 2.0 |
| Stories | 9:56 | | | 100.0 |
| Active | | 9:56 | | 100.0 |
| STARTED Sprint and product backlog grooming | | | 0:40 | 6.7 |
| COMPLETED Edit release notes for previous sprint | | | 0:07 | 1.2 |
| COMPLETED Generation of formattable is incorrect | | | 2:30 | 25.2 |
| COMPLETED Visitor includes are incorrect | | | 0:20 | 3.4 |
| COMPLETED Add includer to quilt.cpp | | | 1:46 | 17.8 |
| COMPLETED Add reducer to quilt.cpp | | | 0:22 | 3.7 |
| COMPLETED Add new index to formtter container | | | 0:19 | 3.2 |
| COMPLETED Add path expander to quilt.cpp | | | 0:49 | 8.2 |
| COMPLETED Add guard expander to quilt.cpp | | | 0:27 | 4.5 |
| COMPLETED Investigate borked travis build | | | 0:37 | 6.2 |
| COMPLETED Add decoration expander to quilt.cpp | | | 0:23 | 3.9 |
| COMPLETED Add aspect expander to quilt.cpp | | | 1:26 | 14.4 |
| STARTED Run tests that are passing on windows | | | 0:10 | 1.7 |
#+TBLFM: $5='(org-clock-time% @3$2 $2..$4);%.1f
#+end:

Expand Down Expand Up @@ -253,6 +254,16 @@ builds. We seem to have lost service forward declarations.

Generates the decoration.

*** COMPLETED Add aspect expander to quilt.cpp :story:
CLOSED: [2016-09-26 Mon 22:51]
CLOCK: [2016-09-26 Mon 21:25]--[2016-09-26 Mon 22:51] => 1:26

Generates the aspect configuration.

- first generate a container with aspect annotations.
- then use it to compute aspect configurations; populate those
directly into the formattable.

*** STARTED Run tests that are passing on windows :story:
CLOCK: [2016-09-26 Mon 21:06]--[2016-09-26 Mon 21:16] => 0:10

Expand All @@ -263,10 +274,6 @@ don't regress without noticing.

Look at the stories with errors to determine which tests are passing.

*** Add aspect generator to quilt.cpp :story:

Generates the aspect configuration.

*** Add helper generator to quilt.cpp :story:

Generates the helper configuration.
Expand Down
Loading

0 comments on commit de79995

Please sign in to comment.