From 1424c5bfbdcd0eb13f563e7fd70a4656058114cc Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 19 Dec 2018 12:30:02 +0100
Subject: [PATCH] Slightly increase optimized section.

---
 2018/loc.svg      | 38 +++++++++++++++++++-------------------
 2018/src/day19.rs |  8 +++-----
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/2018/loc.svg b/2018/loc.svg
index 43fe4f8..97c11fc 100644
--- a/2018/loc.svg
+++ b/2018/loc.svg
@@ -32,10 +32,10 @@ z
       <defs>
        <path d="M 0 0 
 L 0 3.5 
-" id="m6ad9c1a3cf" style="stroke:#000000;stroke-width:0.8;"/>
+" id="m949f39278e" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="60.305455" xlink:href="#m6ad9c1a3cf" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="60.305455" xlink:href="#m949f39278e" y="307.584"/>
       </g>
      </g>
      <g id="text_1">
@@ -71,7 +71,7 @@ z
     <g id="xtick_2">
      <g id="line2d_2">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="127.941818" xlink:href="#m6ad9c1a3cf" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="127.941818" xlink:href="#m949f39278e" y="307.584"/>
       </g>
      </g>
      <g id="text_2">
@@ -110,7 +110,7 @@ z
     <g id="xtick_3">
      <g id="line2d_3">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="195.578182" xlink:href="#m6ad9c1a3cf" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="195.578182" xlink:href="#m949f39278e" y="307.584"/>
       </g>
      </g>
      <g id="text_3">
@@ -139,7 +139,7 @@ z
     <g id="xtick_4">
      <g id="line2d_4">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="263.214545" xlink:href="#m6ad9c1a3cf" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="263.214545" xlink:href="#m949f39278e" y="307.584"/>
       </g>
      </g>
      <g id="text_4">
@@ -153,7 +153,7 @@ z
     <g id="xtick_5">
      <g id="line2d_5">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="330.850909" xlink:href="#m6ad9c1a3cf" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="330.850909" xlink:href="#m949f39278e" y="307.584"/>
       </g>
      </g>
      <g id="text_5">
@@ -193,7 +193,7 @@ z
     <g id="xtick_6">
      <g id="line2d_6">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="398.487273" xlink:href="#m6ad9c1a3cf" y="307.584"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="398.487273" xlink:href="#m949f39278e" y="307.584"/>
       </g>
      </g>
      <g id="text_6">
@@ -286,10 +286,10 @@ z
       <defs>
        <path d="M 0 0 
 L -3.5 0 
-" id="ma681a2b43a" style="stroke:#000000;stroke-width:0.8;"/>
+" id="med6d0249be" style="stroke:#000000;stroke-width:0.8;"/>
       </defs>
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma681a2b43a" y="295.488"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#med6d0249be" y="295.488"/>
       </g>
      </g>
      <g id="text_8">
@@ -302,7 +302,7 @@ L -3.5 0
     <g id="ytick_2">
      <g id="line2d_8">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma681a2b43a" y="247.488"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#med6d0249be" y="247.488"/>
       </g>
      </g>
      <g id="text_9">
@@ -316,7 +316,7 @@ L -3.5 0
     <g id="ytick_3">
      <g id="line2d_9">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma681a2b43a" y="199.488"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#med6d0249be" y="199.488"/>
       </g>
      </g>
      <g id="text_10">
@@ -331,7 +331,7 @@ L -3.5 0
     <g id="ytick_4">
      <g id="line2d_10">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma681a2b43a" y="151.488"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#med6d0249be" y="151.488"/>
       </g>
      </g>
      <g id="text_11">
@@ -346,7 +346,7 @@ L -3.5 0
     <g id="ytick_5">
      <g id="line2d_11">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma681a2b43a" y="103.488"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#med6d0249be" y="103.488"/>
       </g>
      </g>
      <g id="text_12">
@@ -361,7 +361,7 @@ L -3.5 0
     <g id="ytick_6">
      <g id="line2d_12">
       <g>
-       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#ma681a2b43a" y="55.488"/>
+       <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#med6d0249be" y="55.488"/>
       </g>
      </g>
      <g id="text_13">
@@ -577,7 +577,7 @@ z
     </g>
    </g>
    <g id="line2d_13">
-    <path clip-path="url(#p7bdb0fff69)" d="M 73.832727 282.048 
+    <path clip-path="url(#p419d591334)" d="M 73.832727 282.048 
 L 87.36 277.248 
 L 100.887273 270.528 
 L 114.414545 269.568 
@@ -605,7 +605,7 @@ L 398.487273 289.728
 " style="fill:none;stroke:#1f77b4;stroke-linecap:square;stroke-width:1.5;"/>
    </g>
    <g id="line2d_14">
-    <path clip-path="url(#p7bdb0fff69)" d="M 73.832727 295.488 
+    <path clip-path="url(#p419d591334)" d="M 73.832727 295.488 
 L 87.36 293.568 
 L 100.887273 295.488 
 L 114.414545 295.488 
@@ -633,7 +633,7 @@ L 398.487273 295.488
 " style="fill:none;stroke:#ff7f0e;stroke-linecap:square;stroke-width:1.5;"/>
    </g>
    <g id="line2d_15">
-    <path clip-path="url(#p7bdb0fff69)" d="M 73.832727 232.128 
+    <path clip-path="url(#p419d591334)" d="M 73.832727 232.128 
 L 87.36 218.688 
 L 100.887273 208.128 
 L 114.414545 191.808 
@@ -651,7 +651,7 @@ L 263.214545 53.568
 L 276.741818 167.808 
 L 290.269091 176.448 
 L 303.796364 143.808 
-L 317.323636 223.488 
+L 317.323636 225.408 
 L 330.850909 277.248 
 L 344.378182 277.248 
 L 357.905455 277.248 
@@ -870,7 +870,7 @@ L 348.72625 83.926688
   </g>
  </g>
  <defs>
-  <clipPath id="p7bdb0fff69">
+  <clipPath id="p419d591334">
    <rect height="266.112" width="357.12" x="57.6" y="41.472"/>
   </clipPath>
  </defs>
diff --git a/2018/src/day19.rs b/2018/src/day19.rs
index 0aec606..c35de73 100644
--- a/2018/src/day19.rs
+++ b/2018/src/day19.rs
@@ -63,12 +63,10 @@ impl Solution for Day19 {
         assert_eq!(self.ip, 3);
 
         while (cpu.registers[3] as usize) < self.program.len() {
-            if cpu.registers[3] == 3 {
+            if cpu.registers[3] == 1 {
                 let reg = &mut cpu.registers;
-                if reg[5] % reg[1] == 0 {
-                    reg[0] += reg[1];
-                }
-                reg[3] = 12;
+                reg[0] = (1..=reg[5]).filter(|&x| reg[5] % x == 0).sum();
+                reg[3] = 16;
             }
             let (opcode, operands) = &self.program[cpu.registers[self.ip] as usize];
             cpu.execute(*opcode, operands).unwrap();