cem 0.1.4 → 0.1.5

data/examples/aoc2018/inputs/day9_input.txt

@@ -0,0 +1 @@
+428 players; last marble is worth 70825 points

data/lib/cem.rb

@@ -1,10 +1,4 @@
 
 require "cem/version"
 require "cem/ccommon"
-require "cem/cflame"
 require "cem/cruzzles"
-
-module Cem
-  class Error < StandardError; end
-  # Your code goes here...
-end

data/lib/cem/ccommon.rb

@@ -11,6 +11,28 @@ rescue LoadError
   require requireName
 end
 
+#
+# Puts+eql? == peql
+# Performs a equal comparison and outputs the result to console in the form
+#
+# "#{msg}: Expected #{expected}, but got #{actual}"
+#
+# expected may be kept empty, in which case the msg is adjusted
+#
+def peql(actual, expected=:unknown_peql_token, msg=nil)
+  
+  if expected == :unknown_peql_token
+    puts "#{msg}: Didn't know what to expect and got '#{actual}'"
+  else  
+    if actual == expected
+      puts "#{msg}: Expected '#{expected}' and got it!"
+    else
+      puts "#{msg}: Expected '#{expected}', but got '#{actual}!"
+    end
+  end
+  
+end
+
 class File
 
   # Returns the first match of the given files
@@ -24,6 +46,29 @@ class File
   end
 end
 
+class Module
+
+  # Append only the given methods from the given mod(ule)
+  # Adapted from: https://www.ruby-forum.com/t/partial-append-features/66728/12
+  # Why? Enumerable has too many methods to include at once.
+  def append_from( module_to_append_from, *methods_to_keep )
+    methods_to_keep.map! { |m| m.to_sym }
+    
+    methods_to_remove = module_to_append_from.instance_methods(false) - methods_to_keep
+        
+    new_mod = Module.new
+    new_mod.module_eval do
+      include module_to_append_from
+      methods_to_remove.each { |meth| undef_method meth }
+    end
+    
+    # Sanity check:
+    check = methods_to_keep - new_mod.instance_methods(true)
+    raise "The following methods are not in the given module: #{check.inspect}" if !check.empty?
+    
+    include new_mod
+  end
+end
 
 
 class Array

data/lib/cem/cruzzles.rb

@@ -128,29 +128,57 @@ Point2D = Struct.new("Point2D", :x, :y) {
     [array.reduce { |min, o| min.min(o) }, array.reduce { |max, o| max.max(o) } ]
   end
   
+  def add!(other)
+    self.x += other.x
+    self.y += other.y
+    return self
+  end
+  
   def left 
-    return self + Dir2D.LEFT
+    self + Dir2D::LEFT
   end
   
   def left!
-    x += Dir2D.LEFT.x
-    y += Dir2D.LEFT.y
-    return self
+    add!(Dir2D::LEFT)
   end
 
+  def right 
+    self + Dir2D::RIGHT
+  end
+  
+  def right!
+    add!(Dir2D::RIGHT)
+  end
+  
+  def up
+    self + Dir2D::UP
+  end
+  
+  def up!
+    add!(Dir2D::UP)
+  end
+  
+  def down
+    self + Dir2D::DOWN
+  end
   
+  def down!
+    add!(Dir2D::DOWN)
+  end
+    
   def to_dir_bitmask 
   
-    if x == 0 && y == -1
+    case self
+    when Dir2D::N
       return 1
-    elsif x == 1 && y == 0
+    when Dir2D::E
       return 2
-    elsif x == 0 && y == 1
+    when Dir2D::S
       return 4
-    elsif x == -1 && y == 0
+    when Dir2D::W
       return 8
     else
-      raise self.p
+      raise "Only Dir2Ds can be converted to direction bitmask: #{self.inspect}"
     end
   end
       
@@ -158,16 +186,16 @@ Point2D = Struct.new("Point2D", :x, :y) {
   
     result = []
     if v & 1 > 0
-      result << Point2D.new(0, -1)
+      result << Dir2D::N
     end
     if v & 2 > 0
-      result << Point2D.new(1, 0)
+      result << Dir2D::E
     end
     if v & 4 > 0
-      result << Point2D.new(0, 1)
+      result << Dir2D::S
     end
     if v & 8 > 0
-      result << Point2D.new(-1, 0)
+      result << Dir2D::W
     end
     return result
   end
@@ -205,14 +233,14 @@ Seg2D = Struct.new("Seg2D", :p1, :p2) {
   
 }
 
-Dirs2D = [Point2D.new(0, -1), Point2D.new(1, 0), Point2D.new(0, 1), Point2D.new(-1, 0)]
-
 class Dir2D < Point2D
 
-  N = UP    = Dir2D.new( 0, -1)
-  E = RIGHT = Dir2D.new( 1,  0)
-  S = DOWN  = Dir2D.new( 0,  1)
-  W = LEFT  = Dir2D.new(-1,  0)
+  N = UP    = Dir2D.new( 0, -1).freeze
+  E = RIGHT = Dir2D.new( 1,  0).freeze
+  S = DOWN  = Dir2D.new( 0,  1).freeze
+  W = LEFT  = Dir2D.new(-1,  0).freeze
+  
+  All = [N, E, S, W]
   
   #
   # Dir2D * Range = array of Dir2D
@@ -237,13 +265,13 @@ class Dir2D < Point2D
   def self.x(length=1)
     return vert(length) + hori(length)
   end
-
 end
-  
+
+Dirs2D = Dir2D::All
 
 class Grid
 
-  attr_reader :data
+  attr_accessor :data
 
   def initialize(x, y, default=0, &block)
     
@@ -323,6 +351,12 @@ class Grid
     return result
   end
   
+  # Mixin all methods which make sense:
+  #  - Searching if all/any/none/one value matches something
+  append_from(Enumerable, :any?, :all?, :include?, :member?, :none?, :one?, :tally, :count)
+  
+  
+  # Finds the top-left (min), bottom-right (max) coordinates of this Grid using the given value 'null' as an indicator for an empty field.
   def minmax(null=nil)
     min = nil
     max = nil
@@ -374,10 +408,11 @@ class Grid
     return @data[y][x] = assign
   end
   
-  def to_a
+  # Returns the underlying 2D array as a flattened array
+  def flatten
     return @data.flatten
-  end  
-  
+  end
+    
   #
   # Returns the Point2Ds in the directions NSEW as an array (no diagonals, see adja_index for this)
   #
@@ -437,7 +472,7 @@ class Grid
         result << Point2D.new(x-1,y-1)
       end
       result << Point2D.new(x-1,y)
-      if y + 1 < @data.size - 1
+      if y + 1 < @data.size
         result << Point2D.new(x-1, y+1)
       end
     end
@@ -447,15 +482,15 @@ class Grid
     
     # result << Point2D.new(x,y)
     
-    if y + 1 < @data.size - 1
+    if y + 1 < @data.size
       result << Point2D.new(x, y+1)
     end
-    if x + 1 < @data[0].size - 1
+    if x + 1 < @data[0].size
       if y > 0
         result << Point2D.new(x+1,y-1)
       end
       result << Point2D.new(x+1,y)
-      if y + 1 < @data.size - 1
+      if y + 1 < @data.size
         result << Point2D.new(x+1, y+1)
       end
     end
@@ -466,13 +501,13 @@ class Grid
     printBoard()
   end
     
-  #
   # returns a copy of the underlying 2D array, with linking to the content (rather than dup the content also)
-  #
   def to_a
     @data.map { |row| row.dup }
   end
   
+  # Returns access to the underlying 2D array. 
+  # Caution: This is not a duplicate. Use to_a for this.
   def data
     @data
   end
@@ -482,24 +517,30 @@ class Grid
   #
   # If block has...
   #  - one parameter, passes the cell value
-  #  - two parameters, passes y and x
+  #  - two parameters, passes the coordinates as a Point2D and the cell value
   #  - three parameteres, passes y, x and the cell value
   #
+  # If the block returns nil, the original value is kept.
+  #
   def map_a(&block)
   
     case block.arity
       when 1 
-        @data.map { |row| row.map { |value| block.call(value) } }
+        @data.map { |row| row.map { |value| block.call(value) || value } }
       when 2 
-        @data.each_with_index.map { |row, y| row.each_index.map { |x| block.call(y,x) } }
+        @data.each_with_index.map { |row, y| row.each_with_index.map { |value, x| block.call(Point2D.new(x, y), value) || value } }
       when 3      
-        @data.each_with_index.map { |row, y| row.each_with_index.map { |cell, x| block.call(y,x,cell) } }
+        @data.each_with_index.map { |row, y| row.each_with_index.map { |value, x| block.call(y, x, value) || value} }
       else
         raise
     end
   
   end
   
+  def map_a!(&block)
+    @data = map_a(&block)
+  end
+  
   def each(&block)
     @data.each { |row|
       row.each { |cell|
@@ -603,7 +644,21 @@ Point3D = Struct.new("Point3D", :x, :y, :z) {
     end
   end 
 }
-    
-    
 
-    
+Point4D = Struct.new("Point4D", :x, :y, :z, :w) {
+
+  def manhattan(other=nil)
+    if other != nil
+      return (self - other).manhattan
+    end
+    return x.abs + y.abs + z.abs + w.abs
+  end
+  
+  def -(other)
+    Point4D.new(x - other.x, y - other.y, z - other.z, w - other.w)
+  end
+  
+  def to_s
+    "#{x}, #{y}, #{z}, #{w}"
+  end
+}

data/lib/cem/version.rb

@@ -1,3 +1,3 @@
 module Cem
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Christopher Özbek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,9 +83,31 @@ files:
 - bin/console
 - bin/setup
 - cem.gemspec
+- examples/aoc2018/.gitignore
 - examples/aoc2018/day1.rb
+- examples/aoc2018/day10.rb
+- examples/aoc2018/day11.rb
+- examples/aoc2018/day12.rb
+- examples/aoc2018/day13.rb
+- examples/aoc2018/day14.rb
+- examples/aoc2018/day14_2.rb
+- examples/aoc2018/day15.rb
+- examples/aoc2018/day16.rb
+- examples/aoc2018/day17.rb
+- examples/aoc2018/day18.rb
+- examples/aoc2018/day18_rspec.rb
+- examples/aoc2018/day19.rb
 - examples/aoc2018/day1_part2.rb
 - examples/aoc2018/day2.rb
+- examples/aoc2018/day20.rb
+- examples/aoc2018/day21.rb
+- examples/aoc2018/day21_v2.rb
+- examples/aoc2018/day21_v3.rb
+- examples/aoc2018/day21_v4.rb
+- examples/aoc2018/day22.rb
+- examples/aoc2018/day23.rb
+- examples/aoc2018/day24.rb
+- examples/aoc2018/day25.rb
 - examples/aoc2018/day2_2.rb
 - examples/aoc2018/day3.rb
 - examples/aoc2018/day4.rb
@@ -95,7 +117,44 @@ files:
 - examples/aoc2018/day7.rb
 - examples/aoc2018/day8.rb
 - examples/aoc2018/day8_part2.rb
+- examples/aoc2018/day9.rb
+- examples/aoc2018/day9_circular.rb
+- examples/aoc2018/inputs/day10_input.txt
+- examples/aoc2018/inputs/day11_input.txt
+- examples/aoc2018/inputs/day12_input.txt
+- examples/aoc2018/inputs/day12_input2.txt
+- examples/aoc2018/inputs/day13_input.txt
+- examples/aoc2018/inputs/day13_test.txt
+- examples/aoc2018/inputs/day14_input.txt
+- examples/aoc2018/inputs/day15_input.txt
+- examples/aoc2018/inputs/day15_input10.txt
+- examples/aoc2018/inputs/day15_input11.txt
+- examples/aoc2018/inputs/day15_input12.txt
+- examples/aoc2018/inputs/day15_input13.txt
+- examples/aoc2018/inputs/day15_input14.txt
+- examples/aoc2018/inputs/day15_input2.txt
+- examples/aoc2018/inputs/day15_input3.txt
+- examples/aoc2018/inputs/day15_input4.txt
+- examples/aoc2018/inputs/day15_input5.txt
+- examples/aoc2018/inputs/day15_input6.txt
+- examples/aoc2018/inputs/day15_input7.txt
+- examples/aoc2018/inputs/day15_input8.txt
+- examples/aoc2018/inputs/day15_input9.txt
+- examples/aoc2018/inputs/day15_test.txt
+- examples/aoc2018/inputs/day16_input.txt
+- examples/aoc2018/inputs/day17_input.txt
+- examples/aoc2018/inputs/day17_input_test.txt
+- examples/aoc2018/inputs/day18_input.txt
+- examples/aoc2018/inputs/day18_test.txt
+- examples/aoc2018/inputs/day19_input.txt
 - examples/aoc2018/inputs/day1_input.txt
+- examples/aoc2018/inputs/day20_input.txt
+- examples/aoc2018/inputs/day21_input.txt
+- examples/aoc2018/inputs/day22_input.txt
+- examples/aoc2018/inputs/day23_input.txt
+- examples/aoc2018/inputs/day23_input2.txt
+- examples/aoc2018/inputs/day24_input.txt
+- examples/aoc2018/inputs/day25_input.txt
 - examples/aoc2018/inputs/day2_input.txt
 - examples/aoc2018/inputs/day3_input.txt
 - examples/aoc2018/inputs/day4_input.txt
@@ -103,6 +162,7 @@ files:
 - examples/aoc2018/inputs/day6_input.txt
 - examples/aoc2018/inputs/day7_input.txt
 - examples/aoc2018/inputs/day8_input.txt
+- examples/aoc2018/inputs/day9_input.txt
 - lib/cem.rb
 - lib/cem/ccommon.rb
 - lib/cem/cflame.rb