wapiti 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b556f6c375171e82550f04adffc293154d90e370
-  data.tar.gz: 1a40a18e7e4f6afbbfc8a51d1aaef6a469375574
+  metadata.gz: f8e3f42f711858caf64ca6682ea3aea8d9439a02
+  data.tar.gz: 32569d35d3e6d2af1adf91df7a1a8d7ba996d198
 SHA512:
-  metadata.gz: f904c8d7ce3b0c48a74f4f2e678b120626eb89ae9d22a3cc4b75d3b8c081d8dc0cffbe030a9a2b3132927a80c696e5df7eb6673a66420600ebcf7e09eb497282
-  data.tar.gz: 58be17b5b87d9ee0ee7fa6037492e1bb0b6070ae1611c640799ab318fcf8abfc074ef89bcb944297b428996f8b2b13fc9dfed6081d6fbf02c0d4bfd8e54e1ea3
+  metadata.gz: 2ed36dbff7978ca5a731bc3381faad7b9fc362dcdd46ce0b7495dceacd6d21458a33bab5250ee71788d4b2e553625d3b39e61b4140ef701498f04742cf10d19c
+  data.tar.gz: d9e10608342bc351c88cbb61d37af504b983c3e5b973ee2a29919951987ec4d3a3919d98f053990300207820cf59ab297c80a6efb4806060999c0090079b9e39

data/HISTORY.md

@@ -1,3 +1,7 @@
+0.1.1 / 2014-02-27
+==================
+* Updated train routine
+
 0.1.0 / 2014-02-25
 ==================
 * Updated to wapiti 1.5.0

data/ext/wapiti/native.c

@@ -29,20 +29,10 @@ VALUE cLogger;
 int wapiti_main(int argc, char *argv[argc]);
 
 void dolabel(mdl_t *mdl);
-void dotrain(mdl_t *mdl);
-void doupdt(mdl_t *mdl);
 
 
 /* --- Utilities --- */
 
-static void trn_auto(mdl_t *mdl) {
-  const int maxiter = mdl->opt->maxiter;
-  mdl->opt->maxiter = 3;
-  trn_sgdl1(mdl);
-  mdl->opt->maxiter = maxiter;
-  trn_lbfgs(mdl);
-}
-
 static const struct {
   const char *name;
   void (* train)(mdl_t *mdl);
@@ -52,10 +42,9 @@ static const struct {
   {"bcd",    trn_bcd  },
   {"rprop",  trn_rprop},
   {"rprop+", trn_rprop},
-  {"rprop-", trn_rprop},
-  {"auto",   trn_auto }
+  {"rprop-", trn_rprop}
 };
-static const int trn_cnt = sizeof(trn_lst) / sizeof(trn_lst[0]);
+static const uint32_t trn_cnt = sizeof(trn_lst) / sizeof(trn_lst[0]);
 
 
 /* --- Options Class --- */
@@ -865,13 +854,14 @@ static VALUE model_train(VALUE self, VALUE data) {
 
   mdl_t* model = get_model(self);
 
-  int trn;
+  uint32_t trn;
   for (trn = 0; trn < trn_cnt; trn++) {
     if (!strcmp(model->opt->algo, trn_lst[trn].name)) break;
   }
 
   if (trn == trn_cnt) {
-    rb_raise(cNativeError, "failed to train model: unknown algorithm '%s'", model->opt->algo);
+    rb_raise(cNativeError,
+        "failed to train model: unknown algorithm '%s'", model->opt->algo);
   }
 
   FILE *file;
@@ -882,22 +872,20 @@ static VALUE model_train(VALUE self, VALUE data) {
     file = fopen(model->opt->pattern, "r");
 
     if (!file) {
-      rb_raise(cNativeError, "failed to train model: failed to load pattern file '%s'", model->opt->pattern);
+      rb_raise(cNativeError,
+          "failed to train model: failed to load pattern file '%s'", model->opt->pattern);
     }
 
     rdr_loadpat(model->reader, file);
     fclose(file);
-  }
-  else {
-    // rb_raise(cNativeError, "failed to train model: no pattern given");
-  }
 
-  qrk_lock(model->reader->obs, false);
+    qrk_lock(model->reader->obs, false);
+  }
 
 
   // Load the training data. When this is done we lock the quarks as we
   // don't want to put in the model, informations present only in the
-  // devlopment set.
+  // development set.
 
   switch (TYPE(data)) {
     case T_STRING:
@@ -928,7 +916,8 @@ static VALUE model_train(VALUE self, VALUE data) {
   // the training dataset will be used instead.
   if (model->opt->devel) {
     if (!(file = fopen(model->opt->devel, "r"))) {
-      rb_raise(cNativeError, "failed to train model: cannot open development file '%s'", model->opt->devel);
+      rb_raise(cNativeError,
+          "failed to train model: cannot open development file '%s'", model->opt->devel);
     }
 
     model->devel = rdr_readdat(model->reader, file, true);
@@ -937,7 +926,8 @@ static VALUE model_train(VALUE self, VALUE data) {
 
   // Initialize the model. If a previous model was loaded, this will be
   // just a resync, else the model structure will be created.
-  rb_funcall(self, rb_intern("sync"), 0);
+  // rb_funcall(self, rb_intern("sync"), 0);
+	mdl_sync(model);
 
   // Train the model.
   uit_setup(model);
@@ -946,7 +936,8 @@ static VALUE model_train(VALUE self, VALUE data) {
 
   // If requested compact the model.
   if (model->opt->compact) {
-    rb_funcall(self, rb_intern("compact"), 0);
+    // rb_funcall(self, rb_intern("compact"), 0);
+		mdl_compact(model);
   }
 
   return self;

data/lib/wapiti/version.rb

@@ -1,3 +1,3 @@
 module Wapiti
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wapiti
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake