logic_tools 0.2.2 → 0.2.3

data/lib/logic_tools/simplify_bug.txt

@@ -1,6 +1,17 @@
-*     ~a~b~c~d+~a~bc+~ac~d+b~cd+a~b~c~d+a~bd
-got:  ~ac~d+~b~c~d+~bcd+b~cd
-good: ~ac~d+a~bd+~b~c~d+~bcd+b~cd
-FIXED!
-
+= Known bugs
+---
+=== Bug 1
+    $ simplify_qm "~a~b~c~d+~a~bc+~ac~d+b~cd+a~b~c~d+a~bd"
+    
+    -> got:       ~ac~d+~b~c~d+~bcd+b~cd
+       expecting: ~ac~d+a~bd+~b~c~d+~bcd+b~cd
+    
+*FIXED*
 
+---
+=== Bug 2
+    $ simplify_qm "~~~a"
+    
+    -> Crashes
+    
+*FIXED*

data/lib/logic_tools/simplify_qm.rb

@@ -13,6 +13,12 @@ require "logic_tools/logicparse.rb"
 # For simplifying
 require "logic_tools/logicsimplify.rb"
 
+# For the command line interface
+require "logic_tools/logicinput.rb"
+
+# For the command line interface
+require "logic_tools/logicinput.rb"
+
 include LogicTools
 
 
@@ -22,25 +28,29 @@ include LogicTools
 ############################
 # The main program
 
-# First gets the expression to treat
-$expr = nil
-# Is it in the arguments?
-unless $*.empty? then
-    # Yes, get the expression from them
-    $expr = $*.join
-else
-    # Get the expression from standard input
-    print "Please enter your expression and end with ^D:\n"
-    $expr = ARGF.read
+## Now use the common command line interface
+# # First gets the expression to treat
+# $expr = nil
+# # Is it in the arguments?
+# unless $*.empty? then
+#     # Yes, get the expression from them
+#     $expr = $*.join
+# else
+#     # Get the expression from standard input
+#     print "Please enter your expression and end with ^D:\n"
+#     $expr = ARGF.read
+# end
+# 
+
+# Iterrate on each expression
+each_input do |expr|
+    # Parse the expression
+    parsed = string2logic(expr)
+
+    # Simplify it
+    simple = parsed.simplify
+    # print "Computation done\n"
+ 
+    # Display the result
+    print simple.to_s, "\n"
 end
-
-# Parse the expression
-$parsed = string2logic($expr)
-
-# Simplify it
-$simple = $parsed.simplify
-
-# print "Computation done\n"
-
-# Display the result
-print $simple.to_s, "\n"

data/lib/logic_tools/std_conj.rb

@@ -10,6 +10,9 @@ require "logic_tools/logictree.rb"
 # For parsing the inputs
 require "logic_tools/logicparse.rb"
 
+# For the command line interface
+require "logic_tools/logicinput.rb"
+
 include LogicTools
 
 
@@ -19,25 +22,41 @@ include LogicTools
 ############################
 # The main program
 
-# First gets the expression to treat
-$expr = nil
-# Is it in the arguments?
-unless $*.empty? then
-    # Yes, get the expression from them
-    $expr = $*.join
-else
-    # Get the expression from standard input
-    print "Please enter your expression and end with ^D:\n"
-    $expr = ARGF.read
+## Now use the common command line interface
+# # First gets the expression to treat
+# $expr = nil
+# # Is it in the arguments?
+# unless $*.empty? then
+#     # Yes, get the expression from them
+#     $expr = $*.join
+# else
+#     # Get the expression from standard input
+#     print "Please enter your expression and end with ^D:\n"
+#     $expr = ARGF.read
+# end
+# 
+# # Parse the expression
+# $parsed = string2logic($expr)
+# 
+# # Generates its conjunctive normal form
+# $conj = $parsed.to_std_conjunctive
+# 
+# # print "Computation done\n"
+# 
+# # Display the result
+# print $conj.to_s, "\n"
+
+
+# Iterrate on each expression
+each_input do |expr|
+    # Parse the expression
+    parsed = string2logic(expr)
+
+    # Generates its conjunctive normal form
+    conj = parsed.to_std_conjunctive
+
+    # print "Computation done\n"
+
+    # Display the result
+    print conj.to_s, "\n"
 end
-
-# Parse the expression
-$parsed = string2logic($expr)
-
-# Generates its conjunctive normal form
-$conj = $parsed.to_std_conjunctive
-
-# print "Computation done\n"
-
-# Display the result
-print $conj.to_s, "\n"

data/lib/logic_tools/std_dij.rb

@@ -10,6 +10,9 @@ require "logic_tools/logictree.rb"
 # For parsing the inputs
 require "logic_tools/logicparse.rb"
 
+# For the command line interface
+require "logic_tools/logicinput.rb"
+
 include LogicTools
 
 
@@ -19,25 +22,41 @@ include LogicTools
 ############################
 # The main program
 
-# First gets the expression to treat
-$expr = nil
-# Is it in the arguments?
-unless $*.empty? then
-    # Yes, get the expression from them
-    $expr = $*.join
-else
-    # Get the expression from standard input
-    print "Please enter your expression and end with ^D:\n"
-    $expr = ARGF.read
+## Now use the common command line interface
+# # First gets the expression to treat
+# $expr = nil
+# # Is it in the arguments?
+# unless $*.empty? then
+#     # Yes, get the expression from them
+#     $expr = $*.join
+# else
+#     # Get the expression from standard input
+#     print "Please enter your expression and end with ^D:\n"
+#     $expr = ARGF.read
+# end
+# 
+# # Parse the expression
+# $parsed = string2logic($expr)
+# 
+# # Generates its disjunctive normal form
+# $dij = $parsed.to_std_disjunctive
+# 
+# # print "Computation done\n"
+# 
+# # Display the result
+# print $dij.to_s, "\n"
+
+
+# Iterrate on each expression
+each_input do |expr|
+    # Parse the expression
+    parsed = string2logic(expr)
+
+    # Generates its disjunctive normal form
+    dij = parsed.to_std_disjunctive
+
+    # print "Computation done\n"
+
+    # Display the result
+    print dij.to_s, "\n"
 end
-
-# Parse the expression
-$parsed = string2logic($expr)
-
-# Generates its disjonctive normal form
-$dij = $parsed.to_std_disjonctive
-
-# print "Computation done\n"
-
-# Display the result
-print $dij.to_s, "\n"

data/lib/logic_tools/truth_tbl.rb

@@ -10,6 +10,9 @@ require "logic_tools/logictree.rb"
 # For parsing the inputs
 require "logic_tools/logicparse.rb"
 
+# For the command line interface
+require "logic_tools/logicinput.rb"
+
 include LogicTools
 
 
@@ -19,29 +22,47 @@ include LogicTools
 ############################
 # The main program
 
-# First gets the expression to treat
-$expr = nil
-# Is it in the arguments?
-unless $*.empty? then
-    # Yes, get the expression from them
-    $expr = $*.join
-else
-    # Get the expression from standard input
-    print "Please enter your expression and end with ^D:\n"
-    $expr = ARGF.read
-end
+## Now use the common command line interface
+# # First gets the expression to treat
+# $expr = nil
+# # Is it in the arguments?
+# unless $*.empty? then
+#     # Yes, get the expression from them
+#     $expr = $*.join
+# else
+#     # Get the expression from standard input
+#     print "Please enter your expression and end with ^D:\n"
+#     $expr = ARGF.read
+# end
+# 
+# # Parse the expression
+# $parsed = string2logic($expr)
+# 
+# # Display the variables
+# $vars = $parsed.getVariables
+# $vars.each { |var| print "#{var} " }
+# print "\n"
+# 
+# # Display the values
+# $parsed.each_line do |vars,val|
+#     vars.each { |var| print "#{var.value ? 1 : 0} " }
+#     print "#{val ? 1: 0}\n"
+# end
 
-# Parse the expression
-$parsed = string2logic($expr)
+# Iterrate on each expression
+each_input do |expr|
+    # Parse the expression
+    parsed = string2logic(expr)
 
-# Display the variables
-$vars = $parsed.getVariables
-$vars.each { |var| print "#{var} " }
-print "\n"
+    # Display the variables
+    vars = parsed.getVariables
+    vars.each { |var| print "#{var} " }
+    print "\n"
 
-# Display the values
-$parsed.each_line do |vars,val|
-    vars.each { |var| print "#{var.value ? 1 : 0} " }
-    print "#{val ? 1: 0}\n"
+    # Display the values
+    parsed.each_line do |vars,val|
+        vars.each { |var| print "#{var.value ? 1 : 0} " }
+        print "#{val ? 1: 0}\n"
+    end
+    print "\n"
 end
-

data/lib/logic_tools/version.rb

@@ -1,3 +1,3 @@
 module LogicTools
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logic_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - exe/std_dij
 - exe/truth_tbl
 - lib/logic_tools.rb
+- lib/logic_tools/logicinput.rb
 - lib/logic_tools/logicparse.rb
 - lib/logic_tools/logicsimplify.rb
 - lib/logic_tools/logictree.rb