ruby-opencv 0.0.10 → 0.0.11.pre

data/test/test_fisherfaces.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby; coding: utf-8-unix -*- 
+require 'test/unit'
+require 'opencv'
+require 'date'
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+include OpenCV
+
+# Tests for OpenCV::FisherFaces
+class TestFisherFaces < OpenCVTestCase
+  def setup
+    @fisherfaces = FisherFaces.new
+
+    @fisherfaces_trained = FisherFaces.new
+    @images = [CvMat.load(FILENAME_LENA256x256, CV_LOAD_IMAGE_GRAYSCALE)] * 2
+    @labels = [1, 2]
+    @fisherfaces_trained.train(@images, @labels)
+  end
+
+  def test_initialize
+    [FisherFaces.new, FisherFaces.new(1), FisherFaces.new(1, 99999)].each { |ff|
+      assert_equal(FisherFaces, ff.class)
+    }
+
+    assert_raise(TypeError) {
+      FisherFaces.new(DUMMY_OBJ)
+    }
+
+    assert_raise(TypeError) {
+      FisherFaces.new(1, DUMMY_OBJ)
+    }
+  end
+
+  def test_train
+    assert_nil(@fisherfaces.train(@images, @labels))
+
+    assert_raise(TypeError) {
+      @fisherfaces.train(DUMMY_OBJ, @labels)
+    }
+
+    assert_raise(TypeError) {
+      @fisherfaces.train(@images, DUMMY_OBJ)
+    }
+  end
+
+  def test_predict
+    predicted_label, predicted_confidence = @fisherfaces_trained.predict(@images[0])
+    assert_equal(@labels[0], predicted_label)
+    assert_in_delta(0.0, predicted_confidence, 0.01)
+
+    assert_raise(TypeError) {
+      @fisherfaces_trained.predict(DUMMY_OBJ)
+    }
+  end
+
+  def test_save
+    filename = "fisherfaces_save-#{DateTime.now.strftime('%Y%m%d%H%M%S')}.xml"
+    begin
+      @fisherfaces_trained.save(filename)
+      assert(File.exist? filename)
+    ensure
+      File.delete filename
+    end
+    assert_raise(TypeError) {
+      @fisherfaces_trained.save(DUMMY_OBJ)
+    }
+  end
+
+  def test_load
+    assert_nothing_raised {
+      @fisherfaces.load('fisherfaces_save.xml')
+    }
+    assert_raise(TypeError) {
+      @fisherfaces.load(DUMMY_OBJ)
+    }
+  end
+
+  def test_name
+    assert_equal('FaceRecognizer.Fisherfaces', @fisherfaces.name)
+  end
+
+  def test_get_mat
+    mat = @fisherfaces_trained.get_mat('eigenvalues')
+    assert_not_nil(mat)
+    assert_equal(CvMat, mat.class)
+
+    assert_raise(TypeError) {
+      @fisherfaces_trained.get_mat(DUMMY_OBJ)
+    }
+  end
+end
+

data/test/test_iplimage.rb

@@ -80,28 +80,24 @@ class TestIplImage < OpenCVTestCase
     img4 = IplImage.decode(data, CV_LOAD_IMAGE_COLOR)
     img5 = IplImage.decode(data_ary, CV_LOAD_IMAGE_COLOR)
     img6 = IplImage.decode(data_mat, CV_LOAD_IMAGE_COLOR)
-    expected_hash = hash_img(expected)
 
     [img1, img2, img3, img4, img5, img6].each { |img|
       assert_equal(IplImage, img.class)
       assert_equal(expected.rows, img.rows)
       assert_equal(expected.cols, img.cols)
       assert_equal(expected.channel, img.channel)
-      assert_equal(expected_hash, hash_img(img))
     }
 
     expected_c1 = IplImage.load(FILENAME_CAT, CV_LOAD_IMAGE_GRAYSCALE)
     img1c1 = IplImage.decode(data, CV_LOAD_IMAGE_GRAYSCALE)
     img2c1 = IplImage.decode(data_ary, CV_LOAD_IMAGE_GRAYSCALE)
     img3c1 = IplImage.decode(data_mat, CV_LOAD_IMAGE_GRAYSCALE)
-    expected_hash_c1 = hash_img(expected_c1)
 
     [img1c1, img2c1, img3c1].each { |img|
       assert_equal(IplImage, img.class)
       assert_equal(expected_c1.rows, img.rows)
       assert_equal(expected_c1.cols, img.cols)
       assert_equal(expected_c1.channel, img.channel)
-      assert_equal(expected_hash_c1, hash_img(img))
     }
 
     assert_raise(TypeError) {

data/test/test_lbph.rb

@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby; coding: utf-8-unix -*- 
+require 'test/unit'
+require 'opencv'
+require 'date'
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+include OpenCV
+
+# Tests for OpenCV::LBPH
+class TestLBPH < OpenCVTestCase
+  def setup
+    @lbph = LBPH.new
+
+    @lbph_trained = LBPH.new
+    @images = [CvMat.load(FILENAME_LENA256x256, CV_LOAD_IMAGE_GRAYSCALE)] * 2
+    @labels = [1, 2]
+    @lbph_trained.train(@images, @labels)
+  end
+
+  def test_initialize
+    [LBPH.new, LBPH.new(1), LBPH.new(1, 2, 3, 4, 5.0)].each { |lbph|
+      assert_equal(LBPH, lbph.class)
+    }
+
+    assert_raise(TypeError) {
+      LBPH.new(DUMMY_OBJ)
+    }
+    assert_raise(TypeError) {
+      LBPH.new(1, DUMMY_OBJ)
+    }
+    assert_raise(TypeError) {
+      LBPH.new(1, 2, DUMMY_OBJ)
+    }
+    assert_raise(TypeError) {
+      LBPH.new(1, 2, 3, DUMMY_OBJ)
+    }
+    assert_raise(TypeError) {
+      LBPH.new(1, 2, 3, 4, DUMMY_OBJ)
+    }
+  end
+
+  def test_train
+    assert_nil(@lbph.train(@images, @labels))
+
+    assert_raise(TypeError) {
+      @lbph.train(DUMMY_OBJ, @labels)
+    }
+
+    assert_raise(TypeError) {
+      @lbph.train(@images, DUMMY_OBJ)
+    }
+  end
+
+  def test_predict
+    predicted_label, predicted_confidence = @lbph_trained.predict(@images[0])
+    assert_equal(@labels[0], predicted_label)
+    assert_in_delta(0.0, predicted_confidence, 0.01)
+
+    assert_raise(TypeError) {
+      @lbph_trained.predict(DUMMY_OBJ)
+    }
+  end
+
+  def test_save
+    filename = "lbph_save-#{DateTime.now.strftime('%Y%m%d%H%M%S')}.xml"
+    begin
+      @lbph_trained.save(filename)
+      assert(File.exist? filename)
+    ensure
+      File.delete filename
+    end
+    assert_raise(TypeError) {
+      @lbph_trained.save(DUMMY_OBJ)
+    }
+  end
+
+  def test_load
+    assert_nothing_raised {
+      @lbph.load('lbph_save.xml')
+    }
+    assert_raise(TypeError) {
+      @lbph.load(DUMMY_OBJ)
+    }
+  end
+
+  def test_name
+    assert_equal('FaceRecognizer.LBPH', @lbph.name)
+  end
+
+  def test_get_int
+    assert_equal(1, @lbph.get_int('radius'))
+    assert_equal(8, @lbph.get_int('neighbors'))
+    assert_equal(8, @lbph.get_int('grid_x'))
+    assert_equal(8, @lbph.get_int('grid_y'))
+
+    assert_raise(TypeError) {
+      @lbph.get_int(DUMMY_OBJ)
+    }
+  end
+
+  def test_get_double
+    assert_equal(Float::MAX, @lbph.get_double('threshold'))
+
+    assert_raise(TypeError) {
+      @lbph.get_double(DUMMY_OBJ)
+    }
+  end
+
+  def test_get_matvector
+    histgrams = @lbph_trained.get_matvector('histograms')
+    assert_equal(Array, histgrams.class)
+    assert_equal(2, histgrams.size)
+    assert_equal(CvMat, histgrams[0].class)
+
+    assert_raise(TypeError) {
+      @lbph.get_matvector(DUMMY_OBJ)
+    }
+  end
+
+  def test_set_int
+    @lbph.set_int('radius', 2)
+    @lbph.set_int('neighbors', 3)
+    @lbph.set_int('grid_x', 4)
+    @lbph.set_int('grid_y', 5)
+
+    assert_equal(2, @lbph.get_int('radius'))
+    assert_equal(3, @lbph.get_int('neighbors'))
+    assert_equal(4, @lbph.get_int('grid_x'))
+    assert_equal(5, @lbph.get_int('grid_y'))
+
+    assert_raise(TypeError) {
+      @lbph.set_int(DUMMY_OBJ, 1)
+    }
+    assert_raise(TypeError) {
+      @lbph.set_int('radius', DUMMY_OBJ)
+    }
+  end
+
+  def test_set_double
+    @lbph.set_double('threshold', 1.0)
+    assert_in_delta(1.0, @lbph.get_double('threshold'), 0.001)
+
+    assert_raise(TypeError) {
+      @lbph.set_double(DUMMY_OBJ, 1.0)
+    }
+    assert_raise(TypeError) {
+      @lbph.set_double('threshold', DUMMY_OBJ)
+    }
+  end
+end
+

data/test/test_opencv.rb

@@ -9,15 +9,15 @@ include OpenCV
 class TestOpenCV < OpenCVTestCase
   def test_constants
     # OpenCV version
-    assert_equal('2.4.6.1', CV_VERSION)
+    assert_equal('2.4.7', CV_VERSION)
     assert_equal(2, CV_MAJOR_VERSION)
     assert_equal(4, CV_MINOR_VERSION)
-    assert_equal(6, CV_SUBMINOR_VERSION)
+    assert_equal(7, CV_SUBMINOR_VERSION)
 
     assert_equal(2, CV_VERSION_EPOCH)
     assert_equal(4, CV_VERSION_MAJOR)
-    assert_equal(6, CV_VERSION_MINOR)
-    assert_equal(1, CV_VERSION_REVISION)
+    assert_equal(7, CV_VERSION_MINOR)
+    assert_equal(0, CV_VERSION_REVISION)
 
     # Depths
     assert_equal(0, CV_8U)
@@ -28,6 +28,35 @@ class TestOpenCV < OpenCVTestCase
     assert_equal(5, CV_32F)
     assert_equal(6, CV_64F)
 
+    assert_equal(0, CV_8UC1)
+    assert_equal(8, CV_8UC2)
+    assert_equal(16, CV_8UC3)
+    assert_equal(24, CV_8UC4)
+    assert_equal(1, CV_8SC1)
+    assert_equal(9, CV_8SC2)
+    assert_equal(17, CV_8SC3)
+    assert_equal(25, CV_8SC4)
+    assert_equal(2, CV_16UC1)
+    assert_equal(10, CV_16UC2)
+    assert_equal(18, CV_16UC3)
+    assert_equal(26, CV_16UC4)
+    assert_equal(3, CV_16SC1)
+    assert_equal(11, CV_16SC2)
+    assert_equal(19, CV_16SC3)
+    assert_equal(27, CV_16SC4)
+    assert_equal(4, CV_32SC1)
+    assert_equal(12, CV_32SC2)
+    assert_equal(20, CV_32SC3)
+    assert_equal(28, CV_32SC4)
+    assert_equal(5, CV_32FC1)
+    assert_equal(13, CV_32FC2)
+    assert_equal(21, CV_32FC3)
+    assert_equal(29, CV_32FC4)
+    assert_equal(6, CV_64FC1)
+    assert_equal(14, CV_64FC2)
+    assert_equal(22, CV_64FC3)
+    assert_equal(30, CV_64FC4)
+
     # Load image flags
     assert_equal(-1, CV_LOAD_IMAGE_UNCHANGED)
     assert_equal(0, CV_LOAD_IMAGE_GRAYSCALE)

data/test/test_pointset.rb

@@ -38,11 +38,13 @@ class TestPointSet < OpenCVTestCase
     assert_equal(64, center.y.to_i)
 
     size = box.size
-    assert_in_delta(63.116, size.width, 0.001)
-    assert_in_delta(63.116, size.height, 0.001)
-    assert_in_delta(180, box.angle, 0.001)
+    assert_in_delta(63, size.width, 1.0)
+    assert_in_delta(63, size.height, 1.0)
 
-    assert_raise(CvStsBadArg) {
+    angle = [box.angle, 180 - box.angle].min
+    assert_in_delta(0, angle, 0.1)
+
+    assert_raise(CvStsBadSize) {
       @contour2.fit_ellipse2
     }
   end
@@ -102,7 +104,7 @@ class TestPointSet < OpenCVTestCase
     size = box.size
     assert_in_delta(63.356, size.width, 0.001)
     assert_in_delta(63.356, size.height, 0.001)
-    assert_in_delta(-8.130, box.angle, 0.001)
+    assert_in_delta(-81.30, box.angle, 1.0)
 
     flunk('FIXME: Currently PointSet#min_area_rect2 causes segmentation fault when "self" is invalid.')    
     assert_raise(CvStsBadSize) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11.pre
 platform: ruby
 authors:
 - lsxi
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
 description: ruby-opencv is a wrapper of OpenCV for Ruby. It helps you to write computer
@@ -83,9 +83,10 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.md
+- examples/facerec/readme.md
 - examples/matching_to_many_images/train/trainImages.txt
 files:
-- .gitignore
+- ".gitignore"
 - DEVELOPERS_NOTE.md
 - Gemfile
 - History.txt
@@ -95,8 +96,6 @@ files:
 - Rakefile
 - config.yml
 - examples/alpha_blend.rb
-- examples/box.png
-- examples/box_in_scene.png
 - examples/contours/bitmap-contours-with-labels.png
 - examples/contours/bitmap-contours.png
 - examples/contours/bounding-box-detect-canny.rb
@@ -104,14 +103,26 @@ files:
 - examples/contours/rotated-boxes.jpg
 - examples/convexhull.rb
 - examples/face_detect.rb
+- examples/facerec/create_csv.rb
+- examples/facerec/facerec_eigenfaces.rb
+- examples/facerec/facerec_fisherfaces.rb
+- examples/facerec/facerec_lbph.rb
+- examples/facerec/readme.md
 - examples/find_obj.rb
 - examples/houghcircle.rb
-- examples/inpaint.png
+- examples/images/box.png
+- examples/images/box_in_scene.png
+- examples/images/inpaint.png
+- examples/images/lena-256x256.jpg
+- examples/images/lena-eyes.jpg
+- examples/images/lenna-rotated.jpg
+- examples/images/lenna.jpg
+- examples/images/stuff.jpg
+- examples/images/tiffany.jpg
 - examples/inpaint.rb
-- examples/lenna-rotated.jpg
-- examples/lenna.jpg
 - examples/match_kdtree.rb
-- examples/matching_to_many_images.rb
+- examples/match_template.rb
+- examples/matching_to_many_images/matching_to_many_images.rb
 - examples/matching_to_many_images/query.png
 - examples/matching_to_many_images/train/1.png
 - examples/matching_to_many_images/train/2.png
@@ -119,8 +130,8 @@ files:
 - examples/matching_to_many_images/train/trainImages.txt
 - examples/paint.rb
 - examples/snake.rb
-- examples/stuff.jpg
-- examples/tiffany.jpg
+- ext/opencv/algorithm.cpp
+- ext/opencv/algorithm.h
 - ext/opencv/curve.cpp
 - ext/opencv/curve.h
 - ext/opencv/cvavgcomp.cpp
@@ -197,13 +208,21 @@ files:
 - ext/opencv/cvutils.h
 - ext/opencv/cvvideowriter.cpp
 - ext/opencv/cvvideowriter.h
+- ext/opencv/eigenfaces.cpp
+- ext/opencv/eigenfaces.h
 - ext/opencv/extconf.rb
+- ext/opencv/facerecognizer.cpp
+- ext/opencv/facerecognizer.h
+- ext/opencv/fisherfaces.cpp
+- ext/opencv/fisherfaces.h
 - ext/opencv/gui.cpp
 - ext/opencv/gui.h
 - ext/opencv/iplconvkernel.cpp
 - ext/opencv/iplconvkernel.h
 - ext/opencv/iplimage.cpp
 - ext/opencv/iplimage.h
+- ext/opencv/lbph.cpp
+- ext/opencv/lbph.h
 - ext/opencv/mouseevent.cpp
 - ext/opencv/mouseevent.h
 - ext/opencv/opencv.cpp
@@ -222,7 +241,10 @@ files:
 - lib/opencv/psyched_yaml.rb
 - lib/opencv/version.rb
 - ruby-opencv.gemspec
+- test/eigenfaces_save.xml
+- test/fisherfaces_save.xml
 - test/helper.rb
+- test/lbph_save.xml
 - test/runner.rb
 - test/samples/airplane.jpg
 - test/samples/baboon.jpg
@@ -304,8 +326,11 @@ files:
 - test/test_cvtermcriteria.rb
 - test/test_cvtwopoints.rb
 - test/test_cvvideowriter.rb
+- test/test_eigenfaces.rb
+- test/test_fisherfaces.rb
 - test/test_iplconvkernel.rb
 - test/test_iplimage.rb
+- test/test_lbph.rb
 - test/test_mouseevent.rb
 - test/test_opencv.rb
 - test/test_pointset.rb
@@ -318,68 +343,71 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ruby-opencv
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: OpenCV wrapper for Ruby
 test_files:
-- test/test_curve.rb
-- test/test_cvavgcomp.rb
-- test/test_cvbox2d.rb
-- test/test_cvcapture.rb
-- test/test_cvchain.rb
-- test/test_cvcircle32f.rb
-- test/test_cvconnectedcomp.rb
 - test/test_cvcontour.rb
+- test/test_eigenfaces.rb
+- test/test_cvmoments.rb
+- test/test_cvseq.rb
 - test/test_cvcontourtree.rb
-- test/test_cverror.rb
-- test/test_cvfeaturetree.rb
+- test/test_cvbox2d.rb
+- test/test_iplimage.rb
+- test/test_cvvideowriter.rb
+- test/test_cvline.rb
+- test/test_cvhumoments.rb
 - test/test_cvfont.rb
-- test/test_cvhaarclassifiercascade.rb
+- test/test_cvconnectedcomp.rb
 - test/test_cvhistogram.rb
-- test/test_cvhumoments.rb
-- test/test_cvline.rb
-- test/test_cvmat.rb
-- test/test_cvmat_drawing.rb
-- test/test_cvmat_dxt.rb
+- test/test_trackbar.rb
 - test/test_cvmat_imageprocessing.rb
-- test/test_cvmat_matching.rb
-- test/test_cvmoments.rb
-- test/test_cvpoint.rb
-- test/test_cvpoint2d32f.rb
-- test/test_cvpoint3d32f.rb
+- test/test_cvhaarclassifiercascade.rb
+- test/test_cvcircle32f.rb
+- test/test_cvcapture.rb
+- test/test_cvmat_dxt.rb
 - test/test_cvrect.rb
-- test/test_cvscalar.rb
-- test/test_cvseq.rb
-- test/test_cvsize.rb
-- test/test_cvsize2d32f.rb
-- test/test_cvslice.rb
-- test/test_cvsurfparams.rb
+- test/test_iplconvkernel.rb
 - test/test_cvsurfpoint.rb
+- test/test_cvavgcomp.rb
+- test/test_cvscalar.rb
+- test/test_pointset.rb
+- test/test_curve.rb
 - test/test_cvtermcriteria.rb
 - test/test_cvtwopoints.rb
-- test/test_cvvideowriter.rb
-- test/test_iplconvkernel.rb
-- test/test_iplimage.rb
+- test/test_cvsurfparams.rb
+- test/test_cvpoint2d32f.rb
+- test/test_cvpoint3d32f.rb
+- test/test_cvfeaturetree.rb
 - test/test_mouseevent.rb
-- test/test_opencv.rb
-- test/test_pointset.rb
+- test/test_cvchain.rb
+- test/test_cvmat.rb
+- test/test_fisherfaces.rb
+- test/test_cvmat_matching.rb
+- test/test_cverror.rb
+- test/test_cvpoint.rb
+- test/test_cvsize2d32f.rb
 - test/test_preliminary.rb
-- test/test_trackbar.rb
+- test/test_cvmat_drawing.rb
+- test/test_lbph.rb
+- test/test_cvsize.rb
 - test/test_window.rb
+- test/test_cvslice.rb
+- test/test_opencv.rb