Sample branch figure

3 files changed, 378 insertions, 0 deletions

diff --git a/figures/commits.pdf b/figures/commits.pdf
new file mode 100644
index 0000000..a85b3ee
--- /dev/null
+++ b/figures/commits.pdf
diff --git a/figures/commits.svg b/figures/commits.svg
new file mode 100644
index 0000000..5f7b362
--- /dev/null
+++ b/figures/commits.svg
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="453.5433"
+   height="340.15747"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="New document 2"
+   version="1.0">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;">
+      <path
+         id="path3934"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3928"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.080926"
+     inkscape:cx="253.03258"
+     inkscape:cy="151.47834"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     width="12.8cm"
+     height="9.6cm"
+     units="cm"
+     showgrid="false"
+     grid_units="mm"
+     inkscape:object-paths="false"
+     inkscape:grid-points="true"
+     inkscape:grid-bbox="true"
+     inkscape:guide-points="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       orientation="vertical"
+       position="56.476527"
+       id="guide3573" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="11.035643"
+       id="guide3579" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="24.018753"
+       id="guide3886" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="285.62841"
+       id="guide3988" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="303.15561"
+       id="guide4081" />
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="2mm"
+       spacingy="2mm"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(4.149475e-6,-698.0315)">
+    <rect
+       style="opacity:0.41999996;fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:1.02568734;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2995"
+       width="28.346462"
+       height="28.346434"
+       x="184.25195"
+       y="761.81104" />
+    <rect
+       style="opacity:0.41999996;fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:1.02568805;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2995-7"
+       width="28.346455"
+       height="28.346487"
+       x="134.64566"
+       y="825.59052" />
+    <rect
+       style="opacity:0.41999996;fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:1.04417336;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2995-76"
+       width="28.346455"
+       height="29.377432"
+       x="233.85826"
+       y="825.59052" />
+    <rect
+       style="opacity:0.41999996;fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:1.02568817;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2995-7-2"
+       width="28.346462"
+       height="28.346479"
+       x="184.25195"
+       y="889.37006" />
+    <rect
+       style="opacity:0.41999996;fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:1.02568805;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2995-7-2-0"
+       width="28.346462"
+       height="28.34647"
+       x="184.25195"
+       y="953.1496" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="191.33858"
+       y="785.07086"
+       id="text3826"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3828"
+         x="191.33858"
+         y="785.07086"
+         style="font-size:24px">1</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="141.73227"
+       y="848.8504"
+       id="text3826-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3828-3"
+         x="141.73227"
+         y="848.8504"
+         style="font-size:24px">2</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="240.94489"
+       y="848.8504"
+       id="text3826-2-8"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3828-3-5"
+         x="240.94489"
+         y="848.8504"
+         style="font-size:24px">3</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="191.33858"
+       y="912.62994"
+       id="text3826-2-8-3"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3828-3-5-0"
+         x="191.33858"
+         y="912.62994"
+         style="font-size:24px">4</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="191.33858"
+       y="976.40942"
+       id="text3826-2-8-3-0"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3828-3-5-0-1"
+         x="191.33858"
+         y="976.40942"
+         style="font-size:24px">5</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.83665997000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 198.42519,790.15747 -49.6063,35.43308"
+       id="path4548"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.83665997000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 198.4252,790.15748 49.60629,35.43307"
+       id="path4550"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.83666003000000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 148.81889,853.937 49.6063,35.43307"
+       id="path4552"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.83666015000000005px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 248.03149,853.937 -49.6063,35.43307"
+       id="path4554"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 198.42519,917.71655 0,35.43305"
+       id="path4556"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g5359"
+       transform="translate(2.9211997,-1.9474664)">
+      <rect
+         y="781.448"
+         x="232.72223"
+         height="31.159462"
+         width="135.34892"
+         id="rect5330"
+         style="opacity:0.41999996;fill:#d3d3d3;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5296"
+         y="790.21161"
+         x="235.96642"
+         style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           id="tspan5300"
+           style="font-size:8px;text-align:start;text-anchor:start;stroke:none;font-family:Courier;-inkscape-font-specification:Courier"
+           y="790.21161"
+           x="235.96642"
+           sodipodi:role="line"><tspan
+   id="tspan5306"
+   style="font-weight:bold;text-align:start;text-anchor:start;stroke:none">Brano:</tspan> add plots and update</tspan><tspan
+           id="tspan5304"
+           style="font-size:8px;text-align:start;text-anchor:start;stroke:none;font-family:Courier;-inkscape-font-specification:Courier"
+           y="800.24493"
+           x="235.96642"
+           sodipodi:role="line">discussion in experimental</tspan><tspan
+           id="tspan5328"
+           style="font-size:8px;text-align:start;text-anchor:start;stroke:none;font-family:Courier;-inkscape-font-specification:Courier"
+           y="810.24493"
+           x="235.96642"
+           sodipodi:role="line">section</tspan></text>
+    </g>
+    <g
+       id="g5352"
+       transform="translate(19.474664,5.8423993)">
+      <rect
+         y="775.93018"
+         x="22.882727"
+         height="23.369596"
+         width="124.31328"
+         id="rect5330-3"
+         style="opacity:0.41999996000000001;fill:#d3d3d3;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5308"
+         y="784.3692"
+         x="26.731529"
+         style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:8px;text-align:start;text-anchor:start;font-family:Courier;-inkscape-font-specification:Courier"
+           id="tspan5312"
+           y="784.3692"
+           x="26.731529"
+           sodipodi:role="line"><tspan
+   id="tspan5314"
+   style="font-weight:bold">Smriti:</tspan> discuss datasets</tspan><tspan
+           id="tspan5326"
+           style="font-size:8px;text-align:start;text-anchor:start;font-family:Courier;-inkscape-font-specification:Courier"
+           y="794.40253"
+           x="26.731529"
+           sodipodi:role="line">in experimental section</tspan></text>
+    </g>
+    <g
+       id="g5385"
+       transform="translate(-10.711065,-5.1932439)">
+      <rect
+         transform="translate(-4.149475e-6,698.0315)"
+         y="181.11438"
+         x="242.45958"
+         height="22.395864"
+         width="129.50652"
+         id="rect5383"
+         style="opacity:0.41999996;fill:#d3d3d3;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5367"
+         y="887.5849"
+         x="245.38075"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           id="tspan5375"
+           style="font-size:8px;font-family:Courier;-inkscape-font-specification:Courier"
+           y="887.5849"
+           x="245.38075"
+           sodipodi:role="line"><tspan
+   id="tspan5381"
+   style="font-weight:bold">Stéphane:</tspan> merge notations,</tspan><tspan
+           id="tspan5379"
+           style="font-size:8px;font-family:Courier;-inkscape-font-specification:Courier"
+           y="897.61823"
+           x="245.38075"
+           sodipodi:role="line">small rewriting</tspan></text>
+    </g>
+    <g
+       id="g5414"
+       transform="translate(2.2720442,0.97373322)">
+      <rect
+         transform="translate(-4.149475e-6,698.0315)"
+         y="224.60779"
+         x="215.84419"
+         height="23.045019"
+         width="149.95491"
+         id="rect5412"
+         style="opacity:0.41999996;fill:#d3d3d3;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5392"
+         y="930.75372"
+         x="218.76538"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:8px;font-family:Courier;-inkscape-font-specification:Courier"
+           y="930.75372"
+           x="218.76538"
+           id="tspan5394"
+           sodipodi:role="line"><tspan
+   id="tspan5404"
+   style="font-weight:bold;font-family:Courier New;-inkscape-font-specification:Courier New Bold">Jean:</tspan> just added a small proof</tspan><tspan
+           id="tspan5408"
+           style="font-size:8px;font-family:Courier;-inkscape-font-specification:Courier"
+           y="941.12128"
+           x="218.76538"
+           sodipodi:role="line">for P = NP</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/workshop.tex b/workshop.tex
index c798a16..d09f850 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -48,6 +48,10 @@
 \end{frame}
 
 \begin{frame}
+\includegraphics[width=\textwidth]{figures/commits.pdf}
+\end{frame}
+
+\begin{frame}
 \begin{center}
 \includegraphics[scale=.9]{figures/git-merge-conflict.pdf}
 \end{center}