wapiti 0.0.1 → 0.0.2

data/README.md

@@ -79,7 +79,7 @@ Before saving your model you can use `compact` to reduce the model's size:
 By calling `#label` on a Model instance you can add labels to your sequence
 data:
 
-    model = Waiti.load('m2.mod')
+    model = Wapiti.load('m2.mod')
     model.label('test.txt')
     => [[["Confidence NN B-NP", "B-NP"], ["in IN B-PP", "B-PP"] ... ]
 

data/ext/wapiti/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-$CFLAGS << %q{ -std=c99 -O3 -Wall }
+$CFLAGS << %q{ -std=c99 -O3 -Wall -ggdb }
 
 have_library('pthread')
 have_library('m')

data/ext/wapiti/native.c

@@ -873,11 +873,12 @@ static VALUE model_train(VALUE self, VALUE data) {
 
 		rdr_loadpat(model->reader, file);
 		fclose(file);
-		qrk_lock(model->reader->obs, false);
 	}
 	else {
-		rb_raise(cNativeError, "failed to train model: no pattern given");
+		// rb_raise(cNativeError, "failed to train model: no pattern given");
 	}
+
+	qrk_lock(model->reader->obs, false);
 	
 	
 	// Load the training data. When this is done we lock the quarks as we

data/ext/wapiti/tools.c

@@ -67,13 +67,9 @@ void fatal(const char *msg, ...) {
 	va_list args;
 	va_start(args, msg);
 
-	// VALUE message = rb_vsprintf(msg, args);
-	VALUE message = rb_str_new2(msg);
+	rb_raise(cNativeError, msg, args);
 
-	va_end(args);
-	
-	(void)rb_funcall(cLogger, rb_intern("fatal"), 1, message);
-	rb_raise(cNativeError, StringValuePtr(message));
+	va_end(args);	
 }
 
 /* pfatal:
@@ -90,12 +86,10 @@ void pfatal(const char *msg, ...) {
 
 	// VALUE message = rb_vsprintf(msg, args);
 	// rb_str_catf(message, ": <%s>", err);
-	VALUE message = rb_str_new2(msg);
+	rb_raise(cNativeError, msg, args);
 
 	va_end(args);
 
-	(void)rb_funcall(cLogger, rb_intern("fatal"), 1, message);
-	rb_raise(cNativeError, StringValuePtr(message));
 }
 
 /* warning:

data/lib/wapiti/model.rb

@@ -8,9 +8,9 @@ module Wapiti
 				config = Options.new(options, &block)
 				
 				# check configuration					
-				if config.pattern.empty?
-					raise ConfigurationError, 'invalid options: no pattern specified'
-				end
+				# if config.pattern.empty?
+				# 	raise ConfigurationError, 'invalid options: no pattern specified'
+				# end
 				
 				unless config.valid?
 					raise ConfigurationError, "invalid options: #{ config.validate.join('; ') }"

data/lib/wapiti/version.rb

@@ -1,3 +1,3 @@
 module Wapiti
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/spec/wapiti/model_spec.rb

@@ -110,6 +110,12 @@ module Wapiti
 				# model.train([]).nlbl.should == 6
 			end
 			
+			context 'when called without a pattern' do
+				it 'fails because of wapiti' do
+					expect { Model.new.train(data).nlbl.should == 6 }.to raise_error(NativeError)
+				end
+			end
+			
 		end
 		
 		describe '#label' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wapiti
 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: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157117600 !ruby/object:Gem::Requirement
+  requirement: &2156429940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2157117600
+  version_requirements: *2156429940
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2157116700 !ruby/object:Gem::Requirement
+  requirement: &2156428740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2157116700
+  version_requirements: *2156428740
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2157078940 !ruby/object:Gem::Requirement
+  requirement: &2156427300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '4.6'
   type: :development
   prerelease: false
-  version_requirements: *2157078940
+  version_requirements: *2156427300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157078120 !ruby/object:Gem::Requirement
+  requirement: &2156425920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2157078120
+  version_requirements: *2156425920
 description: This gem provides a Ruby API for Conditional Random Fields (CRF). It
   is implemented as a C exstension and based on the wicked fast "wapiti" package.
 email: