cudd-rb 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 0.0.1 / FIX ME
+# 0.0.2 / 2012-10-16
+
+* Add optional parameter to BDD#to_dnf that specifies operator literals.
+* Distribute dynamic library for MacOSx under ext/
+
+# 0.0.1 / 2012-09-12
 
 * Enhancements
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 group :runtime do
-  gem "ffi", "~> 1.1"
+  gem "ffi", "~> 1.0"
 end
 
 group :development do

data/Manifest.txt

@@ -13,3 +13,4 @@ README.md
 spec/**/*
 tasks/**/*
 test/**/*
+ext/*

data/cudd-rb.noespec

@@ -12,7 +12,7 @@ variables:
   upper:
     Cudd
   version:
-    0.0.1
+    0.0.2
   summary: |-
     A ruby bridge to the CU Decision Diagram package (CUDD).
   description: |-

data/lib/cudd-rb/cube.rb

@@ -58,15 +58,16 @@ module Cudd
       h
     end
 
-    def to_dnf
+    def to_dnf(operators = {:not => :'!', :or => :'|', :and => :'&'})
       buf = ""
       to_a012.each_with_index do |val, index|
         next if val == 2
         name = interface.ith_var(index).var_name
         name = name.respond_to?(:to_dnf) ? name.to_dnf : name.to_s
-        buf << " & " unless buf.empty?
-        buf << "!" if val==0
+        buf << " #{operators[:and]} " unless buf.empty?
+        buf << "#{operators[:not]}("  if val==0
         buf << name
+        buf << ")" if val==0
       end
       buf
     end

data/lib/cudd-rb/interfaces/bdd.rb

@@ -254,14 +254,14 @@ module Cudd
       end
 
       # Converts a bdd to a disjunctive normal form
-      def bdd2dnf(bdd)
+      def bdd2dnf(bdd, operators = {:not => :'!', :or => :'|', :and => :'&'})
         return "true"  if bdd==one
         return "false" if bdd==zero
         buf, size = "", 0
         each_cube(bdd) do |cube|
           size += 1
-          buf << " | " unless buf.empty?
-          buf << "(" << cube.to_dnf << ")"
+          buf << " #{operators[:or]} " unless buf.empty?
+          buf << "(" << cube.to_dnf(operators) << ")"
         end
         size == 1 ? buf[1...-1] : buf
       end

data/lib/cudd-rb/version.rb

@@ -3,7 +3,7 @@ module Cudd
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/spec/cube/test_to_dnf.rb

@@ -18,7 +18,7 @@ module Cudd
       let(:c){ cube(x => false) }
 
       it 'uses default names' do
-        subject.should eq("!v0")
+        subject.should eq("!(v0)")
       end
     end
 
@@ -26,7 +26,7 @@ module Cudd
       let(:c){ cube(x => true, y => false) }
 
       it 'uses default names' do
-        subject.should eq("v0 & !v1")
+        subject.should eq("v0 & !(v1)")
       end
     end
 
@@ -36,7 +36,7 @@ module Cudd
       let(:c){ cube(u => true, v => false) }
 
       it 'uses provided names' do
-        subject.should eq("u & !v")
+        subject.should eq("u & !(v)")
       end
     end
 

data/spec/interfaces/bdd/test_bdd2dnf.rb

@@ -31,7 +31,7 @@ module Cudd
 
       context 'on an complex formula' do
         let(:bdd){ (x | y) & z }
-        it{ should eq("(!v0 & v1 & v2) | (v0 & v2)") }
+        it{ should eq("(!(v0) & v1 & v2) | (v0 & v2)") }
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cudd-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70210468650120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70210468650120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70210468665740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70210468665740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70210468660380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70210468660380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70210468679380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70210468679380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70210468673680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210468673680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ! "cudd-rb is a ruby bridge to the CU Decision Diagram (CUDD), an implementation
   of \nBinary Decision Diagrams."
 email:
@@ -144,6 +169,7 @@ files:
 - tasks/spec_test.rake
 - tasks/unit_test.rake
 - tasks/yard.rake
+- ext/libcudd.dylib
 homepage: https://github.com/blambeau/cudd-rb
 licenses: []
 post_install_message: 
@@ -156,9 +182,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2697852571902403534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A ruby bridge to the CU Decision Diagram package (CUDD).