ruby-fann 0.7.10 → 1.0.0

data/History.txt

@@ -1,7 +1,12 @@
+== 1.0.0 2009-12-01
+
+* 1 major enhancement:
+  * Can build/install & execute without first installing & building FANN.
+
 == 0.7.10 2008-11-24
 
 * 1 minor enhancement:
-  * Remove serveral printf statements that were showing up in certain production environment's error logs.
+  * Remove several printf statements that were showing up in certain production environment's error logs.
 
 == 0.7.9 2008-08-15
 

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007 FIXME full name
+Copyright (c) 2007-2009 Steven Miers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -10,10 +10,31 @@ ext/ruby_fann/Makefile
 ext/ruby_fann/extconf.rb
 ext/ruby_fann/fann_augment.h
 ext/ruby_fann/neural_network.c
+ext/ruby_fann/doublefann.h
+ext/ruby_fann/fann_error.h
+ext/ruby_fann/fann_activation.h
+ext/ruby_fann/fann_data.h
+ext/ruby_fann/fann_internal.h
+ext/ruby_fann/fann_train.h
+ext/ruby_fann/fann_cascade.h
+ext/ruby_fann/fann_io.h
+ext/ruby_fann/fann.c
+ext/ruby_fann/doublefann.c
+ext/ruby_fann/fann_io.c
+ext/ruby_fann/fann_train.c
+ext/ruby_fann/fann_train_data.c
+ext/ruby_fann/fann_error.c
+ext/ruby_fann/fann_cascade.c
+ext/ruby_fann/fann_io.c
+ext/ruby_fann/fann_train.c
+ext/ruby_fann/fann_train_data.c
+ext/ruby_fann/fann_error.c
+ext/ruby_fann/fann_cascade.c
 lib/ruby_fann.rb
 lib/ruby_fann/neurotica.rb
+lib/ruby_fann/
 lib/ruby_fann/version.rb
-log/debug.log
+log/
 neurotica1.png
 neurotica2.vrml
 script/destroy

data/README.txt

@@ -2,7 +2,6 @@
 Bindings to use FANN from within ruby/rails environment.  Fann is a is a free open source neural network library, which implements multilayer artificial neural networks with support for both fully connected and sparsely connected networks.  It is easy to use, versatile, well documented, and fast.  RubyFann makes programming neural networks a breeze, with the added benefit that most of the heavy lifting natively.
 
 = Requirements
-	FANN 2.1 or greater (preferably in /usr/local/lib)
 	Ruby 1.8.6 or greater.
 	gnu make tools or equiv for native code in ext
 

data/ext/ruby_fann/Makefile

@@ -4,58 +4,65 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /usr/local/lib/ruby/1.8/i686-darwin8.11.1
+topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr/local
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+sharedstatedir = $(prefix)/com
+mandir = $(DESTDIR)/usr/share/man
 psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(DESTDIR)/Library/Ruby/Site
 htmldir = $(docdir)
-datadir = $(datarootdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(datarootdir)/info
+infodir = $(DESTDIR)/usr/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
 sysconfdir = $(prefix)/etc
-mandir = $(datarootdir)/man
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
+datadir = $(datarootdir)
 localstatedir = $(prefix)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
 
 CC = gcc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -g -O2  -fno-common -pipe -fno-common 
-INCFLAGS = -I. -I. -I/usr/local/lib/ruby/1.8/i686-darwin8.11.1 -I.
-CPPFLAGS =  -I/usr/local/include 
+CFLAGS   =  -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common $(cflags) 
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DHAVE_DOUBLEFANN_H  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.   
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+ldflags  = -L. -arch i386 -arch x86_64 
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup
 AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = i686-darwin8.11.1
-sitearch = i686-darwin8.11.1
+arch = universal-darwin10.0
+sitearch = universal-darwin10.0
 ruby_version = 1.8
-ruby = /usr/local/bin/ruby
+ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -68,8 +75,8 @@ COPY = cp
 
 preload = 
 
-libpath = . $(libdir) /usr/local/lib
-LIBPATH =  -L"." -L"$(libdir)" -L"/usr/local/lib"
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -79,7 +86,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -ldoublefann  -lpthread -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl  
 SRCS = neural_network.c
 OBJS = neural_network.o
 TARGET = neural_network
@@ -87,6 +94,7 @@ DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)

data/ext/ruby_fann/doublefann.c

@@ -0,0 +1,30 @@
+/*
+Fast Artificial Neural Network Library (fann)
+Copyright (C) 2003 Steffen Nissen (lukesky@diku.dk)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/* Easy way to allow for build of multiple binaries */
+
+#include "config.h"
+#include "doublefann.h"
+
+#include "fann.c"
+#include "fann_io.c"
+#include "fann_train.c"
+#include "fann_train_data.c"
+#include "fann_error.c"
+#include "fann_cascade.c"

data/ext/ruby_fann/doublefann.h

@@ -0,0 +1,33 @@
+/*
+Fast Artificial Neural Network Library (fann)
+Copyright (C) 2003 Steffen Nissen (lukesky@diku.dk)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef __doublefann_h__
+#define __doublefann_h__
+
+typedef double fann_type;
+
+#undef DOUBLEFANN
+#define DOUBLEFANN
+#define FANNPRINTF "%.20e"
+#define FANNSCANF "%le"
+
+#define FANN_INCLUDE
+#include "fann.h"
+
+#endif

data/ext/ruby_fann/extconf.rb

@@ -1,8 +1,12 @@
 require 'mkmf'
-lib = dir_config('fann', '/usr/local')
-if !have_library("doublefann", "fann_create_standard")
-  puts "FANN must be installed and available in /usr/local or passed in with --with-fann-dir.  Windows users should use ruby compiled in Cygwin or an equivalent, such as MingW.  Ruby installed with the OneClickInstaller is not sufficient."
-  exit 1
-end
+# lib = dir_config('fann', '/usr/local')
+#if !have_library("doublefann", "fann_create_standard")
+#  puts "FANN must be installed and available in /usr/local or passed in with --with-fann-dir.  Windows users should use ruby compiled in Cygwin or an equivalent, such as MingW.  Ruby installed with the OneClickInstaller is not sufficient."
+#  exit 1
+#end
 #find_library("doublefann", "fann_create_standard", "/usr/local/lib")
+
+#dir_config('fann', '.')
+$objs=["neural_network.o", "doublefann.o"]
+have_header("doublefann.h")
 create_makefile("neural_network")