thera 0.0.4 → 0.0.5

data/ext/extconf.rb

@@ -2,6 +2,7 @@ require 'mkmf-rice'
 
 QUARRY_H      = 'quarry.h'
 MARKER        = 'mkmf_marker'
+cflags        = '-x c++'
 quarry_dir    = File.join(File.dirname(__FILE__), '..', 'lib', 'quarry')
 quarry_obj    = File.join(quarry_dir, 'obj')
 quarry_src    = File.join(quarry_dir, 'src')
@@ -14,6 +15,7 @@ Dir.chdir(quarry_dir) do
     `make -f Makefile.osx clean`
     `make -f Makefile.osx`
   else
+    cflags += ' -std=g++0x -Wno-multichar -frtti'
     puts "Compiling quarry (linux mode)"
     `make -f Makefile.linux clean`
     `make -f Makefile.linux`
@@ -21,7 +23,7 @@ Dir.chdir(quarry_dir) do
 end
 
 # the cflags are required to make mkmf compile in c++ mode
-with_cflags("-x c++") do
+with_cflags(cflags) do
   find_header(QUARRY_H, quarry_src)
   $LIBPATH << quarry_obj
   have_library('quarry', MARKER, quarry_header)

data/lib/quarry/Makefile.linux

@@ -1,2 +1,4 @@
 STATIC_LIB = ar rcs
+CXX = g++
+CPPFLAGS = -fPIC -std=gnu++0x -Wno-multichar -Wno-write-strings
 include Makefile.targets

data/lib/quarry/src/classifier/classifier.h

@@ -6,6 +6,7 @@
 #include <vector>
 #include <iostream>
 #include <typeinfo>
+#include <stdint.h>
 using namespace std;
 
 namespace Storage {

data/lib/quarry/src/classifier/naive_bayes/naive_bayes_classifier.h

@@ -2,6 +2,7 @@
 #define __naive_bayes_classifier_h__
 #include "classifier/classifier.h"
 #include <vector>
+#include <cmath>
 
 namespace Classifier {
   class NaiveBayesClassifier : public Classifier {

data/lib/quarry/src/data_set/features/numeric_feature.h

@@ -3,6 +3,8 @@
 #include "data_set/example.h"
 #include "data_set/feature.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 namespace DataSet {
   class DataSet;

data/lib/quarry/src/storage/folders.cpp

@@ -19,7 +19,8 @@ void Storage::Folders::load_directory(string path, DataSet::SparseDataSet *data_
   string newpath;
   struct stat info;
   FILE *file;
-  int file_length;
+  int file_length = 0;
+  int read = 0;
   
   while((dp = readdir(dir))) {
     // ignore files starting with a dot
@@ -47,7 +48,7 @@ void Storage::Folders::load_directory(string path, DataSet::SparseDataSet *data_
     }
     
     // read into the buffer
-    fread(file_data, 1, file_length - 1, file);
+    read = fread(file_data, 1, file_length - 1, file);
     file_data[file_length - 1] = 0;
     fclose(file);
     

data/thera.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.description = "C++ Data Mining Library for Ruby"
   s.email = "me@willcannings.com"
   s.authors = ["Will Cannings"]
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.extensions = ["ext/extconf.rb"]
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thera
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
-  requirement: &70137311664380 !ruby/object:Gem::Requirement
+  requirement: &70358172322420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137311664380
+  version_requirements: *70358172322420
 description: C++ Data Mining Library for Ruby
 email: me@willcannings.com
 executables: []