diff --git a/Sda2/Ref/Fig/concurrentOptimistic.svg b/Sda2/Ref/Fig/concurrentOptimistic.svg
index 3d077a669f1490166adf3aebe052d32785126340..c57d3a70157bf277e9585be9cdec1d62103956a9 100644
--- a/Sda2/Ref/Fig/concurrentOptimistic.svg
+++ b/Sda2/Ref/Fig/concurrentOptimistic.svg
@@ -24,7 +24,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.3643056"
- inkscape:cx="197.49696"
+ inkscape:cx="238.64055"
inkscape:cy="141.53026"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
@@ -613,13 +613,6 @@
width="136.03505"
id="view50-5"
style="fill:#f2f2f2;stroke:none" />
- <rect
- y="542.71747"
- x="330.26273"
- height="219.77139"
- width="136.03505"
- id="view50"
- style="fill:none;stroke:#ffff00" />
<rect
transform="translate(0,502.36221)"
y="40"
@@ -1296,53 +1289,144 @@
d="m 119.60006,773.96791 375,0"
id="path7379"
inkscape:connector-curvature="0" />
- <rect
- style="fill:none;stroke:#ffff00;stroke-width:0.70866141999999999;stroke-miterlimit:4;stroke-dasharray:none"
- id="view10"
- width="125"
- height="40"
- x="8.96875"
- y="25.000002"
- transform="translate(36.03125,542.36221)" />
- <rect
- style="fill:none;stroke:#ffff00;stroke-width:0.70866143999999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
- id="view20"
- width="180"
- height="205"
- x="-1.03125"
- y="1.3574219e-06"
- transform="translate(36.03125,542.36221)"
- inkscape:label="#view20" />
- <rect
- style="fill:none;stroke:#ffff00;stroke-width:0.99921260000000001;stroke-miterlimit:4;stroke-dasharray:none"
- id="view30"
- width="150"
- height="40"
- x="98.96875"
- y="165"
- transform="translate(36.03125,542.36221)">
- <title
- id="title4592">Client side change</title>
- </rect>
- <rect
- style="fill:none;stroke:#ffff00;stroke-width:0.99921262000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
- id="view40"
- width="85"
- height="175"
- x="293.96875"
- y="25.000002"
- transform="translate(36.03125,542.36221)" />
- <rect
- transform="translate(36.03125,542.36221)"
- y="1.3574219e-06"
- x="-1.03125"
- height="245"
- width="480"
- id="view05"
- style="fill:none;stroke:#ffff00;stroke-width:0.99921262000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0">
- <title
- id="title4622">Occ</title>
- </rect>
+ <g
+ id="group10">
+ <rect
+ transform="translate(36.03125,542.36221)"
+ y="25.000002"
+ x="8.96875"
+ height="40"
+ width="125"
+ id="view10"
+ style="fill:none;stroke:#0000ff;stroke-width:0.70866141999999999;stroke-miterlimit:4;stroke-dasharray:none" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text6782"
+ y="577.36218"
+ x="110"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#0000ff;font-family:Sans;stroke-width:1.06299213;stroke-miterlimit:4;stroke-dasharray:none"
+ xml:space="preserve"><tspan
+ y="577.36218"
+ x="110"
+ id="tspan6784"
+ sodipodi:role="line">10</tspan></text>
+ </g>
+ <g
+ id="group05"
+ transform="translate(-3.2479553,-0.08120905)">
+ <rect
+ style="fill:none;stroke:#0000ff;stroke-width:0.99921262;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="view05"
+ width="480"
+ height="245"
+ x="35"
+ y="542.36218">
+ <title
+ id="title4622">Occ</title>
+ </rect>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#0000ff;stroke-width:0.35433072;stroke-miterlimit:4;stroke-dasharray:none;font-family:Sans"
+ x="493.24796"
+ y="557.44342"
+ id="text7223"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7225"
+ x="493.24796"
+ y="557.44342">05</tspan></text>
+ </g>
+ <g
+ transform="translate(0,2.8740234e-5)"
+ id="group20">
+ <rect
+ inkscape:label="#view20"
+ y="542.36224"
+ x="35"
+ height="205"
+ width="180"
+ id="view20"
+ style="fill:none;stroke:#0000ff;stroke-width:0.70866144;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans"
+ x="200"
+ y="582.36218"
+ id="text8119"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan8121"
+ x="200"
+ y="582.36218">20</tspan></text>
+ </g>
+ <g
+ id="group30">
+ <rect
+ transform="translate(36.03125,542.36221)"
+ y="165"
+ x="98.96875"
+ height="40"
+ width="150"
+ id="view30"
+ style="fill:none;stroke:#0000ff;stroke-width:0.99921260000000001;stroke-miterlimit:4;stroke-dasharray:none">
+ <title
+ id="title4592">Client side change</title>
+ </rect>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans"
+ x="265"
+ y="707.36218"
+ id="text8123"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan8125"
+ x="265"
+ y="707.36218">30</tspan></text>
+ </g>
+ <g
+ id="group40">
+ <rect
+ transform="translate(36.03125,542.36221)"
+ y="25.000002"
+ x="293.96875"
+ height="175"
+ width="85"
+ id="view40"
+ style="fill:none;stroke:#0000ff;stroke-width:0.99921262000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans"
+ x="400"
+ y="577.36218"
+ id="text8127"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan8129"
+ x="400"
+ y="577.36218">40</tspan></text>
+ </g>
+ <g
+ id="group50">
+ <rect
+ style="fill:none;stroke:#0000ff"
+ id="view50"
+ width="136.03505"
+ height="219.77139"
+ x="330.26273"
+ y="542.71747" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans"
+ x="450"
+ y="552.36218"
+ id="text8131"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan8133"
+ x="450"
+ y="552.36218">50</tspan></text>
+ </g>
</g>
<script
id="sozi-script"
@@ -1366,9 +1450,9 @@
ns1:hide="true"
ns1:sequence="2"
ns1:title="Persistent database object"
- ns1:refid="view10" />
+ ns1:refid="group10" />
<ns1:frame
- ns1:refid="view20"
+ ns1:refid="group20"
ns1:title="Copy to client side"
ns1:sequence="3"
ns1:hide="true"
@@ -1394,9 +1478,9 @@
ns1:hide="true"
ns1:sequence="4"
ns1:title="Modify on client side"
- ns1:refid="view30" />
+ ns1:refid="group30" />
<ns1:frame
- ns1:refid="view40"
+ ns1:refid="group40"
ns1:title="Re-read from database"
ns1:sequence="5"
ns1:hide="true"
@@ -1422,7 +1506,7 @@
ns1:hide="true"
ns1:sequence="6"
ns1:title="Commit or abort"
- ns1:refid="view50" />
+ ns1:refid="group50" />
<ns1:frame
id="view05Frame"
ns1:transition-path-hide="true"
@@ -1436,9 +1520,9 @@
ns1:hide="true"
ns1:sequence="1"
ns1:title="Occ"
- ns1:refid="view05" />
+ ns1:refid="group05" />
<ns1:frame
- id="frame4863"
+ id="group05Frame2"
ns1:transition-path-hide="true"
ns1:transition-profile="linear"
ns1:transition-zoom-percent="0.0"
@@ -1450,5 +1534,5 @@
ns1:hide="true"
ns1:sequence="7"
ns1:title="Occ"
- ns1:refid="view05" />
+ ns1:refid="group05" />
</svg>