logic_tools 0.2.4 → 0.3.0

data/lib/logic_tools/simplify_es.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+#########################################################################
+#      Simplifies a logic expression using the ESPRESSO algorithm       #
+#########################################################################
+
+
+# For building logic trees
+require "logic_tools/logictree.rb"
+
+# For parsing the inputs
+require "logic_tools/logicparse.rb"
+
+# For simplifying with the ESPRESSO method.
+require "logic_tools/logicsimplify_es.rb"
+
+# For the command line interface
+require "logic_tools/logicinput.rb"
+
+include LogicTools
+
+
+
+
+
+############################
+# The main program
+
+# 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

data/lib/logic_tools/simplify_qm.rb

@@ -10,11 +10,8 @@ require "logic_tools/logictree.rb"
 # For parsing the inputs
 require "logic_tools/logicparse.rb"
 
-# For simplifying
-require "logic_tools/logicsimplify.rb"
-
-# For the command line interface
-require "logic_tools/logicinput.rb"
+# For simplifying with the Quine Mc Cluskey method.
+require "logic_tools/logicsimplify_qm.rb"
 
 # For the command line interface
 require "logic_tools/logicinput.rb"
@@ -28,19 +25,6 @@ include LogicTools
 ############################
 # The main program
 
-## 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|

data/lib/logic_tools/test_logic_tools.rb

@@ -0,0 +1,161 @@
+######################################################################
+#                   The test program for logic tools                 #
+#                                                                    #
+#               NOTE: This still a very imcomplete work!             #
+######################################################################
+
+# require 'minitest/autorun'
+require "logic_tools/logicsimplify_es.rb"
+require "logic_tools/logicgenerator.rb"
+
+include LogicTools
+
+## Class for testing the implementation of the ESPRESSO algorithm.
+class TestEspresso # < MiniTest::Unit::TestCase
+
+    ## Creates the tester with a +seed+ for random generation, a
+    #  +deadline+ for the simplify steps and a +volume+ before splitting
+    #  the cover.
+    def initialize(seed = 0, deadline = Float::INFINITY,
+                               volume = Float::INFINITY)
+        @seed = seed
+        @deadline = deadline
+        @volume = volume
+    end
+
+    ## Checks if a +cover+ is a tautology by generating its truth table.
+    def truth_tautology(cover)
+        ## Generate each possible input and test it on the cover.
+        (2**(cover.width)).times do |i|
+            return false unless cover.eval(i)
+        end
+        return true
+    end
+
+    ## Tests the tautology check on covers generated by a random +generator+.
+    #
+    #  NOTE: ends when a tautology is actually found.
+    def test_tautology_random(generator)
+        # Create the cover.
+        cover = Cover.new(*generator.each_variable)
+        # Tautology results.
+        taut0, taut1 = false, false
+        # Add random cubes to the cover until a tautology is met while.
+        begin
+            # Add a random cube.
+            cover << generator.random_cube
+            print "Tautology check on cover=[#{cover.to_s}]...\n"
+            # Check if the cover is a tautology using the standard approach.
+            taut0 = cover.is_tautology?
+            print "Through is_tautology?: #{taut0}; "
+            # Check it again with a truth table.
+            taut1 = truth_tautology(cover)
+            print "through truth table: #{taut1}\n"
+            raise "Test failure" unless taut0 == taut1
+        end while (!taut0)
+        return true
+    end
+
+    ## Tests randomly +number+ tautology cases on a +dimensions+ boolean
+    #  space.
+    def test_tautologies_random(number = 1024, dimensions = 4)
+        # Create the variables.
+        base = "`"
+        variables = dimensions.times.map { |i| base.next!.clone }
+        # Create the generator.
+        generator = Generator.new(*variables)
+        generator.seed = @seed
+        # Performs the tests.
+        number.times do |i|
+            print "Test #{i}: "
+            return false unless test_tautology_random(generator)
+        end
+        return true
+    end
+
+
+    ## Checks if covers have the same truth table.
+    def same_truth_table?(cover0,cover1)
+        return false unless cover0.width == cover1.width
+        # Check for each entry.
+        (2**cover0.width).times do |i|
+            return false unless cover0.eval(i) == cover1.eval(i)
+        end
+        return true
+    end
+
+
+    ## Tests espresso on a given +cover+.
+    def test_espresso(cover)
+        print "ESPRESSO on cover=[#{cover.to_s}]...\n"
+        simple = cover.simplify(@deadline,@volume)
+        print "result: [#{simple}]\n"
+        check0 = (cover + simple.complement).is_tautology?
+        # check0 = same_truth_table?(cover,simple)
+        # assert_equal(true,check0)
+        print "check 0 = #{check0}\n"
+        raise "Test failure" unless check0
+        check1 = (cover.complement + simple).is_tautology?
+        # assert_equal(true,check1)
+        print "check 1 = #{check1}\n"
+        raise "Test failure" unless check1
+        return true
+    end
+
+    ## Tests the implementation of the espresso algorithm on each
+    #  possible 1-cube cover of 4 variables.
+    #
+    #  Test only on cover if a +test+ number is given.
+    def test_espresso_all(test = nil)
+        generator = Generator.new("a","b","c","d")
+        generator.seed = @seed
+        if test then
+            test = test.to_i
+            print "Test #{test}: "
+            return test_espresso(generator.make_1cover(test))
+        else
+            generator.each_1cover.with_index do |cover,i|
+                print "Test #{i}: "
+                return false unless test_espresso(cover)
+            end
+            return true
+        end
+    end
+
+    ## Tests ESPRESSO on a cover generated by a random +generator+.
+    def test_espresso_random(generator)
+        # Genrate a random cover.
+        cover = generator.random_cover
+        # Test it.
+        return false unless test_espresso(cover)
+        return true
+    end
+
+    ## Tests ESPRESSO on randomly +number+ cover cases on a +dimensions+ boolean
+    #  space, including at most +max+ cubes.
+    def test_espressos_random(number = 1024, dimensions = 4, max = nil)
+        # Create the variables.
+        base = "`"
+        variables = dimensions.times.map { |i| base.next!.clone }
+        # Create the generator.
+        generator = Generator.new(*variables)
+        generator.seed = @seed
+        generator.max = max if max
+        # Ensures a rate of "-" large enough to have a high probability of
+        # an interesting cover (i.e., which is actually simplifiable).
+        # This rate +r+ is obainted as the solution of the followings:
+        # max/2 * 2**(r*dimensions) >= 2**dimensions
+        # NOTE: max/2 is the average size of the cover.
+        generator.rate = Math::log2(2**(dimensions+1)/max.to_f)/dimensions
+        # Ensures the rate is not too small though.
+        generator.rate = 0.3 unless generator.rate >= 0.3
+        print "rate=#{generator.rate}\n"
+        # Performs the tests.
+        number.times do |i|
+            print "Test #{i}: "
+            return false unless test_espresso_random(generator)
+        end
+        return true
+    end
+
+end

data/lib/logic_tools/traces.rb

@@ -0,0 +1,116 @@
+require 'logger.rb'
+
+
+module LogicTools
+
+    ## Small class for indenting
+    class Indenter
+        ## Creates a new indenter.
+        def initialize
+            @indent = 0
+        end
+
+        ## Increase the indent level by +value+.
+        #
+        #  NOTE:
+        #  * the indent level cannot be bellow 0.
+        #  * the value can be negative.
+        def inc(value = 1)
+            @indent += value.to_i
+            @indent = 0 if @indent < 0
+        end
+
+        ## Decreases the indent level by +value+.
+        #
+        #  NOTE: 
+        #  * the indent level cannot be bellow 0.
+        #  * the value can be negative.
+        def dec(value = 1)
+            @indent -= value.to_i
+            @indent = 0 if @indent < 0
+        end
+
+        ## Converts to a string (generates the indent.)
+        def to_s
+            return " " * @indent
+        end
+    end
+
+
+    module Traces
+
+        # Add traces support to the logic tools.
+
+
+        ## The logger used for displaying the traces.
+        TRACES = Logger.new(STDOUT)
+
+        ## The indent for the traces.
+        TRACES_INDENT = Indenter.new
+
+        # Format the traces
+        TRACES.formatter = proc do |severity, datetime, progname, msg|
+              "[#{severity}] #{datetime}: #{TRACES_INDENT.to_s}#{msg}\n"
+        end
+        TRACES.datetime_format = '%H:%M:%S'
+
+        # By default the trace level is set warn.
+        TRACES.level = Logger::WARN
+
+
+        ## Sets the trace level to error.
+        def traces_error
+            TRACES.level = Logger::ERROR
+        end
+
+        ## Sets the trace level to warn.
+        def traces_warn
+            TRACES.level = Logger::WARN
+        end
+
+        ## Sets the trace level to info.
+        def traces_info
+            TRACES.level = Logger::INFO
+        end
+
+        ## Sets the trace level to debug
+        def traces_debug
+            TRACES.level = Logger::DEBUG
+        end
+
+
+        ## Sends an error-level trace.
+        def error(&blk)
+            TRACES.error(&blk)
+        end
+
+        ## Sends a warn-level trace.
+        def warn(&blk)
+            TRACES.warn(&blk)
+        end
+
+        ## Sends an info-level trace.
+        def info(&blk)
+            TRACES.info(&blk)
+        end
+
+        ## Sends a debug-level trace.
+        def debug(&blk)
+            TRACES.debug(&blk)
+        end
+
+
+        ## Increases the indent level by +value+.
+        def inc_indent(value = 1)
+            TRACES_INDENT.inc(value)
+        end
+
+        ## Deacreases the indent level by +value+.
+        def dec_indent(value = 1)
+            TRACES_INDENT.dec(value)
+        end
+
+
+    end
+
+end

data/lib/logic_tools/truth_tbl.rb

@@ -39,7 +39,7 @@ include LogicTools
 # $parsed = string2logic($expr)
 # 
 # # Display the variables
-# $vars = $parsed.getVariables
+# $vars = $parsed.get_variables
 # $vars.each { |var| print "#{var} " }
 # print "\n"
 # 
@@ -55,7 +55,7 @@ each_input do |expr|
     parsed = string2logic(expr)
 
     # Display the variables
-    vars = parsed.getVariables
+    vars = parsed.get_variables
     vars.each { |var| print "#{var} " }
     print "\n"
 

data/lib/logic_tools/version.rb

@@ -1,3 +1,3 @@
 module LogicTools
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logic_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,8 @@ description: "LogicTools is a set of command-line tools for processing logic exp
 email:
 - lovic@ariake-nct.ac.jp
 executables:
+- is_tautology
+- simplify_es
 - simplify_qm
 - std_conj
 - std_dij
@@ -89,19 +91,30 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/is_tautology
+- exe/simplify_es
 - exe/simplify_qm
 - exe/std_conj
 - exe/std_dij
 - exe/truth_tbl
 - lib/logic_tools.rb
+- lib/logic_tools/is_tautology.rb
+- lib/logic_tools/logicconvert.rb
+- lib/logic_tools/logiccover.rb
+- lib/logic_tools/logicgenerator.rb
 - lib/logic_tools/logicinput.rb
 - lib/logic_tools/logicparse.rb
-- lib/logic_tools/logicsimplify.rb
+- lib/logic_tools/logicsimplify_es.rb
+- lib/logic_tools/logicsimplify_qm.rb
 - lib/logic_tools/logictree.rb
+- lib/logic_tools/minimal_column_covers.rb
 - lib/logic_tools/simplify_bug.txt
+- lib/logic_tools/simplify_es.rb
 - lib/logic_tools/simplify_qm.rb
 - lib/logic_tools/std_conj.rb
 - lib/logic_tools/std_dij.rb
+- lib/logic_tools/test_logic_tools.rb
+- lib/logic_tools/traces.rb
 - lib/logic_tools/truth_tbl.rb
 - lib/logic_tools/version.rb
 - logic_tools.gemspec