logic_analyzer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f454e3f8b567810914170b9850e7023993048d27fafa9a83c21be7e7718846
-  data.tar.gz: ebf24d0492a3e4b6c4884ad679e3cffe6a69c93cb5d8c742bbad13fbc4f36f5d
+  metadata.gz: 4bd3488943cd9c9c969fff9828a1ec5a0bfa54a680760ea5ee19af5d65bb22de
+  data.tar.gz: 9a8dd7e28b1531aff083c8214d1ba1b6747d522f4d1b0c08b97a6b2b4ce8d54d
 SHA512:
-  metadata.gz: e0744be2c9a9558fe72a455381e2bca3a0875a23c9741e5eda2cbb4a09137c24e168bca04e5dbec51f2780ebd0d1142f8b3087f36c8e829ec2eb8e727bc782eb
-  data.tar.gz: 9107fb46e8b05a0a3cc8bd84a761a4e805a4bdccbe53f63463046e2674b55844392a3624a088fa46d78ddf411bb6263f4fccf3e7f154946d2323ff24cdd1a6af
+  metadata.gz: b9ed5d6228ebf17f1cbe4ff572c6e660150e1d60bc7bd02876c6bf9b9b1ba1c59dc770ecebc853cf48b2d653547b28f784ded4ab521abd00e337569be24ad201
+  data.tar.gz: def22fbd13228668e7f395a76cd860aeb6498407be58801b746a15e5651b736090bdf1780ff41fa49b9a97148d9f0c86f12982c7b7e2e21bbf37ca30fe8d8e23

data/lib/logic_analyzer.rb

@@ -1,6 +1,50 @@
 require_relative 'logic_analyzer/boolean'
 require_relative 'logic_analyzer/exception'
-require_relative 'logic_analyzer/logic_evaluation'
 require_relative 'logic_analyzer/logical_context'
 require_relative 'logic_analyzer/proposition'
-require_relative 'logic_analyzer/truth_table'
+require_relative 'logic_analyzer/truth_table'
+
+class LogicAnalyzer
+  attr_accessor :sentences, :conclusion, :proposition
+
+  def initialize(*args)
+    self.sentences = []
+
+    unless args.empty?
+      args.each do |sentence|
+        sentences.append("(#{sentence})")
+      end
+    end
+  end
+
+  def add_sentence(sentence)
+    sentences.append("(#{sentence})")
+  end
+
+  def add_conclusion(conclusion)
+    self.conclusion = "(#{conclusion})"
+  end
+
+  def evaluate
+    parse
+
+    prop = Proposition.new(proposition)
+    prop.parse
+
+    prop.evaluate
+  end
+
+  def parse
+    if sentences.empty?
+      raise ArgumentError 'Cannot evaluate with no propositions'
+    elsif sentences.size == 1
+      self.proposition = sentences[0]
+    else
+      self.proposition = if conclusion.nil?
+                           sentences.join(' and ')
+                         else
+                           "(#{sentences.join(' and ')}) then #{conclusion}"
+                         end
+    end
+  end
+end

data/lib/logic_analyzer/proposition.rb

@@ -9,25 +9,23 @@ class Proposition
     @sentence = syntax_sugars(sentence)
 
     @sentence.define_singleton_method(:words) do
-      split(/\W+/)
-    end
-
-    @sentence.define_singleton_method(:operands) do
-      split(/\s|\w|\s/).reject(&:empty?)
+      split(/\W+/).reject(&:empty?)
     end
   end
 
   def syntax_sugars(sentence)
     sugared = sentence.gsub(/and|&&/, '.and')
-                      .gsub(/or|\|\|/, '.or')
-                      .gsub(/then|>/, '.then')
-                      .gsub(/if_and_only_if|<=>/, '.if_and_only_if')
-                      .gsub(/xor|!=/, '.xor')
-                      .gsub(/not/, '!')
+                  .gsub(/or|\|\|/, '.or')
+                  .gsub(/then|>/, '.then')
+                  .gsub(/if_and_only_if|<=>/, '.if_and_only_if')
+                  .gsub(/xor|!=/, '.xor')
+                  .gsub(/not/, '!')
   end
 
   def parse
-    @variables = sentence.words
+    @variables = sentence.words.reject do |var|
+      %w[and or then if_and_only_if xor not].include?(var)
+    end
   end
 
   def evaluate
@@ -52,6 +50,6 @@ class Proposition
   end
 
   def amount_of_variables
-    2**variables.length
+    2 ** variables.length
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logic_analyzer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alejandro Peralta Bazas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies: []
 description: Ruby implementation of a propositional logic parser
 email: 
@@ -19,7 +19,6 @@ files:
 - lib/logic_analyzer.rb
 - lib/logic_analyzer/boolean.rb
 - lib/logic_analyzer/exception.rb
-- lib/logic_analyzer/logic_evaluation.rb
 - lib/logic_analyzer/logical_context.rb
 - lib/logic_analyzer/proposition.rb
 - lib/logic_analyzer/truth_table.rb

data/lib/logic_analyzer/logic_evaluation.rb

@@ -1,14 +0,0 @@
-require_relative 'proposition'
-
-module LogicEvaluation
-  def logic_value
-    prop = Proposition.new(self)
-    prop.parse
-
-    prop.evaluate
-  end
-end
-
-class String
-  include LogicEvaluation
-end