conflict-calendars 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdbd2d218e9911e722d49725d42aaed358e7f85
-  data.tar.gz: e10c5cc4822beeb5b7bbe0fba43b2c3b96d7bc40
+  metadata.gz: 5a81e8553db9741c2e5ce3381161455abe8ef749
+  data.tar.gz: 07d51fbbf8d040eb3ba3d42656e635df7b2664c7
 SHA512:
-  metadata.gz: cd2b529868cf1b5a31f877e1f34af3adf17698295e50e72401a4b2dbee0c7f3be93a05d38ff3e09166e82aeeeed091971d1f3843a58728ab084c2a99945bec8d
-  data.tar.gz: 57338143d9a35e18c13d019ad9e46a2e02393f60fe26a53841e293d9fc3d157c515dcf25ca39b08d414c9e39c18a969b80930a5c165c3668a7a62f2ad61dc6e8
+  metadata.gz: 429b6819ff883c49bc229bc6f6388f0bb29d771fb742f532349ad92b5359113366009bc0e68a83af91269547738eac6288f93e8a43d8249753998644fff531bb
+  data.tar.gz: 0fa9e1a671588fb30eeae259acaa236edea41fbcab025df05b10d107d5a4bebcdfa08cf7ea689c574b296e303cb9f86d01416cf40cce286cfa769e3a7bf557a6

data/README.md

@@ -1,6 +1,9 @@
-# conflict-calendars
+# Conflict Calendars
 
-The gem help you find the conflict-calendars from calendars
+The gem help people find the conflicting calendars from given calendars
+
+## Welcome for PR
+The gem need extend and raise, if you have any interests, welocome pull request.
 
 ## Installation
 
@@ -19,41 +22,47 @@ Or install it yourself as:
     $ gem install conflict-calendars
 
 ## Usage
-First you should require the library
+Require the library first
 
 ```ruby
 require "conflict/calendars"
 ```
 
-Then you can create Ccs::Calendar object by this way
+Create calendar object by this way, you can type the name of calendar or not.
 
 ```ruby
-calendar_A = Ccs::Calendar.new("enter the name of calendar",Time.new(2016,12,10,8,0),Time.new(2016,12,10,13,0)
-#=> #<Ccs::Calendar:0x007f9892be85e8 @name="enter the name of calendar", @start_time=2016-12-10 08:00:00 +0800, @end_time=2016-12-10 13:00:00 +0800>
+calendar_A = Ccs::Calendar.new("enter the name of calendar", ,"2016-12-10 08:00", "2016-12-10 13:00")
+calendar_B = Ccs::Calendar.new("2016-12-10 09:00", "2016-12-10 10:30")
+calendar_C = Ccs::Calendar.new("2016-12-10 10:00", "2016-12-10 12:30")
+calendar_D = Ccs::Calendar.new("2016-12-10 15:00", "2016-12-10 17:30")
+calendar_E = Ccs::Calendar.new("2016-12-10 15:20", "2016-12-10 16:30")
 ```
+Over here we have five calendars, we wanna know who are conflicting? 
+So we just do that :
+
 ```ruby
-calendar_B = Ccs::Calendar.new(Time.new(2016,12,10,9,0),Time.new(2016,12,10,10,30))
-#=> #<Ccs::Calendar:0x007fa36c55bf38 @name=nil, @start_time=2016-12-10 09:00:00 +0800, @end_time=2016-12-10 10:30:00 +0800>
+conflicts = Ccs::Conflicts.new(calendar_A,calendar_B,calendar_C,calendar_D,calendar_E)
+
+p conflicts #=> <Ccs::Conflict:0x007fba211e9d20 {2}>
+
+puts conflicts.size #=> 2
 ```
-Then you can find the conflicts by this way
+
+Now, you know there are exist two conflicting sets.
+Then you can get each information of calendar by this way :
 
 ```ruby
-conflicts = Ccs::Conflicts.new(calendar_A,calendar_B)
-conflicts.size #=> 1
 conflicts.each do |conflict|
-  p conflict #=> #<Set: {#<Ccs::Calendar:0x007fb..>, #<Ccs::Calendar:0x007fc..>} >
+  p conflict #=> <Set: {#<Ccs::Calendar:0x007fb..>, #<Ccs::Calendar:0x007fc..>} >
+  conflict.each do |calendar|
+  	p calendar #=> <Ccs::Calendar>
+  	puts calendar.calendarname #=> "calendarname"
+  	puts calendar.stime #=> 2016-12-10 09:00
+  	puts calendar.etime #=> 2016-12-10 10:30
+  end
 end
 ```
-Now, you know there are exist two calendars that conflict in the same set. So, you can get each information of calendar by this way :
 
-```ruby
-conflict.each do |calendar|
-  p calendar #=> #<Ccs::Calendar:0x007fb..>
-  p calendar.name #=> "enter the name of calendar"
-  p calendar.start_time #=> "2016-12-10 08:00:00 +0800"
-  p calendar.end_time #=> "2016-12-10 13:00:00 +0800"
-end
-```
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/conflict-calendars.gemspec

@@ -5,7 +5,7 @@ require 'conflict/calendars/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "conflict-calendars"
-  spec.version       = Conflict::Calendars::VERSION
+  spec.version       = Ccs::VERSION
   spec.authors       = ["Tsao"]
   spec.email         = ["tsaohucn@gmail.com"]
 

data/lib/conflict/calendars.rb

@@ -1,100 +1,9 @@
 require "conflict/calendars/version"
+require "conflict/calendars/graph"
+require "conflict/calendars/calendar"
+require "conflict/calendars/conflicts"
+require "time"
 require "set"
 
 module Ccs
-
-	class Calendar
-
-		attr_reader :name, :start_time, :end_time
-
-		def initialize(cname = nil,start_time,end_time)
-			@name = cname
-			@start_time = start_time
-			@end_time = end_time
-		end
-
-	end
-
-  class Conflicts
-
-  	include Enumerable
-
-		def initialize(*calendars)
-			@calendars = calendars
-			compute!
-		end
-
-	  def inspect
-	    "#<Ccs::Conflict:#{'0x00%x' % (object_id << 1)} {#{@conflicts.size}}>"
-	  end	
-
-		def compute!
-			result = @calendars.combination(2).to_a.map do |comb|
-				calendar_first = comb.first
-				calendar_last = comb.last
-				comb if overlaps(calendar_first.start_time,calendar_first.end_time,calendar_last.start_time,calendar_last.end_time)
-			end.compact
-			@conflicts = Graph.new(result).find_maximum_cliques
-		end
-
-	  def each(&block)                      
-	    @conflicts.each(&block)       
-	  end
-
-	  def size
-	  	@conflicts.size
-	  end
-
-		private
-
-		def overlaps(t1_start,t1_end,t2_start,t2_end)
-		  if (t1_start - t2_end) * (t2_start - t1_end) >= 0
-		    return true
-		  else
-		    return false
-		  end
-		end
-
-  end
-
-	class Graph
-
-	  def initialize(edges)
-	    @edges = edges
-	  end
-
-	  def find_maximum_cliques
-	    @cliques ||= []
-	    bron_kerbosch(Set.new, nodes, Set.new) if @cliques.empty?
-
-	    @cliques
-	  end
-
-	  private
-
-	  def nodes
-	    @nodes ||= @edges.flatten.uniq
-	  end
-
-	  def neighbours
-	    @neighbours ||= nodes.map do |node|
-	      node_neighbours =
-	        @edges.select { |edge| edge.include? node }.flatten - [node]
-
-	      [node, node_neighbours]
-	    end.to_h
-	  end
-
-	  def bron_kerbosch(re, pe, xe)
-	    @cliques << re if pe.empty? && xe.empty?
-
-	    pe.each do |ve|
-	      bron_kerbosch(re | [ve], pe & neighbours[ve], xe & neighbours[ve])
-	      pe -= [ve]
-	      xe |= [ve]
-	    end
-	  end
-	  
-	end 
-
-end
+end

data/lib/conflict/calendars/calendar.rb

@@ -0,0 +1,15 @@
+module Ccs
+
+  class Calendar
+
+    attr_reader :calendarname, :stime, :etime
+
+    def initialize(calendarname = nil, stime, etime)
+      @calendarname = calendarname
+      @stime = Time.parse(stime)
+      @etime = Time.parse(etime)
+    end
+
+  end
+
+end

data/lib/conflict/calendars/conflicts.rb

@@ -0,0 +1,45 @@
+module Ccs
+
+  class Conflicts
+
+    include Enumerable
+
+    def initialize(*calendars)
+      @calendars = calendars
+      compute!
+    end
+
+    def inspect
+      "#<Ccs::Conflict:#{'0x00%x' % (object_id << 1)} {#{@conflicts.size}}>"
+    end 
+
+    def compute!
+      result = @calendars.combination(2).to_a.map do |comb|
+        calendar_first = comb.first
+        calendar_last = comb.last
+        comb if overlaps(calendar_first.stime, calendar_first.etime, calendar_last.stime, calendar_last.etime)
+      end.compact
+      @conflicts = Ccs::Graph.new(result).find_maximum_cliques
+    end
+
+    def each(&block)                      
+      @conflicts.each(&block)       
+    end
+
+    def size
+      @conflicts.size
+    end
+
+    private
+
+    def overlaps(t1_start,t1_end,t2_start,t2_end)
+      if (t1_start - t2_end) * (t2_start - t1_end) >= 0
+        return true
+      else
+        return false
+      end
+    end
+
+  end
+
+end

data/lib/conflict/calendars/graph.rb

@@ -0,0 +1,43 @@
+module Ccs
+
+  class Graph
+
+    def initialize(edges)
+      @edges = edges
+    end
+
+    def find_maximum_cliques
+      @cliques ||= []
+      bron_kerbosch(Set.new, nodes, Set.new) if @cliques.empty?
+      
+      @cliques
+    end
+
+    private
+
+    def nodes
+      @nodes ||= @edges.flatten.uniq
+    end
+
+    def neighbours
+      @neighbours ||= nodes.map do |node|
+        node_neighbours =
+          @edges.select { |edge| edge.include? node }.flatten - [node]
+
+        [node, node_neighbours]
+      end.to_h
+    end
+
+    def bron_kerbosch(re, pe, xe)
+      @cliques << re if pe.empty? && xe.empty?
+
+      pe.each do |ve|
+        bron_kerbosch(re | [ve], pe & neighbours[ve], xe & neighbours[ve])
+        pe -= [ve]
+        xe |= [ve]
+      end
+    end
+    
+  end
+
+end

data/lib/conflict/calendars/version.rb

@@ -1,5 +1,3 @@
-module Conflict
-  module Calendars
-    VERSION = "0.1.5"
-  end
+module Ccs
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conflict-calendars
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Tsao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,9 @@ files:
 - bin/setup
 - conflict-calendars.gemspec
 - lib/conflict/calendars.rb
+- lib/conflict/calendars/calendar.rb
+- lib/conflict/calendars/conflicts.rb
+- lib/conflict/calendars/graph.rb
 - lib/conflict/calendars/version.rb
 homepage: https://github.com/tsaohucn/conflict-calendars.git
 licenses: