linkparser 1.1.4 → 2.0.0

data/ext/linkparser.c

@@ -1,11 +1,11 @@
 /*
  *  linkparser.c - Ruby LinkParser
- *  $Id: linkparser.c,v 21df914cedb1 2010/10/12 15:45:26 ged $
- *  
+ *  $Id: linkparser.c,v 85300de8d84c 2015/03/02 16:59:48 ged $
+ *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
- *  
- *  Please see the LICENSE file at the top of the distribution for licensing 
+ *
+ *  Please see the LICENSE file at the top of the distribution for licensing
  *  information.
  */
 
@@ -27,51 +27,80 @@ VALUE rlink_cParseOptions;
 VALUE rlink_sLinkageCTree;
 
 
-/* --------------------------------------------------
- * Utility functions
- * -------------------------------------------------- */
+/* --------------------------------------------------------------
+ * Logging Functions
+ * -------------------------------------------------------------- */
 
+/*
+ * Log a message to the given +context+ object's logger.
+ */
 void
 #ifdef HAVE_STDARG_PROTOTYPES
-rlink_debug(const char *fmt, ...)
+rlink_log_obj( VALUE context, const char *level, const char *fmt, ... )
 #else
-rlink_debug(fmt, va_alist)
-	 const char *fmt;
-	 va_dcl
+rlink_log_obj( VALUE context, const char *level, const char *fmt, va_dcl )
 #endif
 {
-	char buf[BUFSIZ], buf2[BUFSIZ];
+	char buf[BUFSIZ];
 	va_list	args;
+	VALUE logger = Qnil;
+	VALUE message = Qnil;
 
-	if (!RTEST(ruby_debug)) return;
+	va_init_list( args, fmt );
+	vsnprintf( buf, BUFSIZ, fmt, args );
+	message = rb_str_new2( buf );
 
-	snprintf( buf, BUFSIZ, "LinkParser Debug>>> %s", fmt );
+	logger = rb_funcall( context, rb_intern("log"), 0, 0 );
+	rb_funcall( logger, rb_intern(level), 1, message );
+
+	va_end( args );
+}
+
+
+/*
+ * Log a message to the global logger.
+ */
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rlink_log( const char *level, const char *fmt, ... )
+#else
+rlink_log( const char *level, const char *fmt, va_dcl )
+#endif
+{
+	char buf[BUFSIZ];
+	va_list	args;
+	VALUE logger = Qnil;
+	VALUE message = Qnil;
 
 	va_init_list( args, fmt );
-	vsnprintf( buf2, BUFSIZ, buf, args );
-	fputs( buf2, stderr );
-	fputs( "\n", stderr );
-	fflush( stderr );
+	vsnprintf( buf, BUFSIZ, fmt, args );
+	message = rb_str_new2( buf );
+
+	logger = rb_funcall( rlink_mLinkParser, rb_intern("logger"), 0, 0 );
+	rb_funcall( logger, rb_intern(level), 1, message );
+
 	va_end( args );
 }
 
 
 /*
  * Raise a LinkParser::Error. The link-grammar library no longer supports fetching the actual
- * error message, so this just raises an exception with "Unknown error" now. Hopefully the 
+ * error message, so this just raises an exception with "Unknown error" now. Hopefully the
  * library will have printed out the actual problem to stderr, and stderr is pointed
- * somewhere useful. 
+ * somewhere useful.
  */
 void
-rlink_raise_lp_error() {
+rlink_raise_lp_error()
+{
 	rb_raise( rlink_eLpError, "Unknown error" );
 }
 
 
-/* Make a Parse_Options after merging the specified default_options with any 
+/* Make a Parse_Options after merging the specified default_options with any
    new options given. */
 VALUE
-rlink_make_parse_options( VALUE default_options, VALUE options ) {
+rlink_make_parse_options( VALUE default_options, VALUE options )
+{
 	if ( NIL_P(options) ) options = rb_hash_new();
 	options = rb_funcall( default_options, rb_intern("merge"), 1, options );
 
@@ -87,7 +116,8 @@ rlink_make_parse_options( VALUE default_options, VALUE options ) {
  *
  */
 static VALUE
-rlink_link_grammar_version( VALUE self ) {
+rlink_link_grammar_version( VALUE self )
+{
 #ifdef HAVE_LINKGRAMMAR_GET_VERSION
 	const char *version = linkgrammar_get_version();
 	if ( !version ) rb_bug( "linkgrammar_get_version returned NULL pointer" );
@@ -102,7 +132,8 @@ rlink_link_grammar_version( VALUE self ) {
  * LinkParser extension init function
  */
 void
-Init_linkparser_ext() {
+Init_linkparser_ext()
+{
 	rlink_mLinkParser = rb_define_module( "LinkParser" );
 
 	/* The exception class used for LinkParser errors */
@@ -111,8 +142,6 @@ Init_linkparser_ext() {
 	rb_define_singleton_method( rlink_mLinkParser, "link_grammar_version",
 		rlink_link_grammar_version, 0 );
 
-	setlocale( LC_ALL, "" );
-
 	rlink_init_dict();
 	rlink_init_sentence();
 	rlink_init_linkage();

data/ext/linkparser.h

@@ -1,11 +1,11 @@
 /*
  *		linkparser.h - Ruby-LinkParser Header
- *		$Id: linkparser.h,v 65471608cc6e 2011/04/04 18:56:35 ged $
+ *		$Id: linkparser.h,v 85300de8d84c 2015/03/02 16:59:48 ged $
  *
  *		Authors:
  *		  * Michael Granger <ged@FaerieMUD.org>
  *
- *  Please see the LICENSE file at the top of the distribution for licensing 
+ *  Please see the LICENSE file at the top of the distribution for licensing
  *  information.
  */
 
@@ -22,16 +22,22 @@
 
 #include <link-grammar/link-includes.h>
 
+#include "extconf.h"
+
+/* --------------------------------------------------------------
+ * Declarations
+ * -------------------------------------------------------------- */
 
-/* Debugging functions/macros */
 #ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
 #define va_init_list(a,b) va_start(a,b)
-extern void rlink_debug(const char *fmt, ...);
+void rlink_log_obj( VALUE, const char *, const char *, ... );
+void rlink_log( const char *, const char *, ... );
 #else
 #include <varargs.h>
 #define va_init_list(a,b) va_start(a)
-extern void rlink_debug(fmt, va_alist);
+void rlink_log_obj( VALUE, const char *, const char *, va_dcl );
+void rlink_log( const char *, const char *, va_dcl );
 #endif
 
 extern void rlink_raise_lp_error _(( void ));
@@ -59,7 +65,7 @@ extern VALUE rlink_sLinkageCTree;
 extern VALUE rlink_eLpError;
 
 
-/* 
+/*
  * Structures
  */
 struct rlink_dictionary {
@@ -67,8 +73,8 @@ struct rlink_dictionary {
 };
 
 struct rlink_sentence {
-	Sentence 	sentence;
-	VALUE	 	dictionary;
+	Sentence	sentence;
+	VALUE		dictionary;
 	VALUE		parsed_p;
 	VALUE		options;
 };
@@ -84,14 +90,6 @@ struct rlink_linkage {
  * Macros
  */
 
-/* Debugging macro */
-#if DEBUG
-#  define debugMsg(f)	rlink_debug f
-#else /* ! DEBUG */
-#  define debugMsg(f) 
-#endif /* DEBUG */
-
-
 #define IsDictionary( obj ) rb_obj_is_kind_of( (obj), rlink_cDictionary )
 #define IsSentence( obj ) rb_obj_is_kind_of( (obj), rlink_cSentence )
 #define IsLinkage( obj ) rb_obj_is_kind_of( (obj), rlink_cLinkage )

data/ext/parseoptions.c

@@ -1,11 +1,11 @@
 /*
  *  parseoptions.c - Ruby LinkParser::ParseOptions class
- *  $Id: parseoptions.c,v 21df914cedb1 2010/10/12 15:45:26 ged $
- *  
+ *  $Id: parseoptions.c,v 92228378be38 2015/03/02 16:44:04 ged $
+ *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
- *  
- *  Please see the LICENSE file at the top of the distribution for licensing 
+ *
+ *  Please see the LICENSE file at the top of the distribution for licensing
  *  information.
  */
 
@@ -16,13 +16,13 @@
  *  Forward declarations
  * -------------------------------------------------- */
 
-static VALUE rlink_parseopts_each_opthash_i _(( VALUE, VALUE ));
-
 
 /* --------------------------------------------------
  * Macros and constants
  * -------------------------------------------------- */
 
+VALUE vdal_sym;
+VALUE corpus_sym;
 
 /* --------------------------------------------------
  *	Memory-management functions
@@ -32,8 +32,11 @@ static VALUE rlink_parseopts_each_opthash_i _(( VALUE, VALUE ));
  * Free function
  */
 static void
-rlink_parseopts_gc_free( Parse_Options parseopts ) {
-	if ( parseopts ) parse_options_delete( parseopts );
+rlink_parseopts_gc_free( Parse_Options parseopts )
+{
+	if ( parseopts ) {
+		parse_options_delete( parseopts );
+	}
 }
 
 
@@ -41,7 +44,8 @@ rlink_parseopts_gc_free( Parse_Options parseopts ) {
  * Object validity checker. Returns the data pointer.
  */
 static Parse_Options
-check_parseopts( VALUE self ) {
+check_parseopts( VALUE self )
+{
 	Check_Type( self, T_DATA );
 
     if ( !IsParseOptions(self) ) {
@@ -57,7 +61,8 @@ check_parseopts( VALUE self ) {
  * Fetch the data pointer and check it for sanity.
  */
 static Parse_Options
-get_parseopts( VALUE self ) {
+get_parseopts( VALUE self )
+{
 	Parse_Options parseopts = check_parseopts( self );
 
 	if ( !parseopts )
@@ -67,12 +72,13 @@ get_parseopts( VALUE self ) {
 }
 
 
-/* 
- * Get the Parse_Options struct behind the LinkParser::ParseOptions +object+ 
+/*
+ * Get the Parse_Options struct behind the LinkParser::ParseOptions +object+
  * specified.
- */ 
+ */
 Parse_Options
-rlink_get_parseopts( VALUE obj ) {
+rlink_get_parseopts( VALUE obj )
+{
 	return get_parseopts( obj );
 }
 
@@ -88,8 +94,9 @@ rlink_get_parseopts( VALUE obj ) {
  *  Allocate a new LinkParser::ParseOptions object.
  */
 static VALUE
-rlink_parseopts_s_alloc( VALUE klass ) {
-	debugMsg(( "Wrapping an uninitialized ParseOptions pointer." ));
+rlink_parseopts_s_alloc( VALUE klass )
+{
+	rlink_log( "debug", "Wrapping an uninitialized ParseOptions pointer."  );
 	return Data_Wrap_Struct( klass, 0, rlink_parseopts_gc_free, 0 );
 }
 
@@ -105,83 +112,69 @@ rlink_parseopts_s_alloc( VALUE klass ) {
  *     LinkParser::ParseOptions.new( opthash )   -> obj
  *
  *  Create a new ParseOptions object and set values from opthash.
- *  
- *     po = LinkParser::ParseOptions.new( :allow_null => true, :batch_mode => true )
- *     
+ *
+ *     po = LinkParser::ParseOptions.new( min_null_count: 1, verbosity: 0 )
+ *
  */
 static VALUE
-rlink_parseopts_init( int argc, VALUE *argv, VALUE self ) {
+rlink_parseopts_init( int argc, VALUE *argv, VALUE self )
+{
 	if ( ! check_parseopts(self) ) {
 		Parse_Options opts;
 		VALUE opthash = Qnil;
 
-		debugMsg(( "Initializing a ParseOptions: %p", self ));
+		rlink_log_obj( self, "debug", "Initializing a ParseOptions: %p", self );
 		DATA_PTR( self ) = opts = parse_options_create();
 
 		rb_scan_args( argc, argv, "01", &opthash );
 		if ( RTEST(opthash) ) {
-			debugMsg(( "Setting options from an opthash." ));
-			rb_iterate( rb_each, opthash, rlink_parseopts_each_opthash_i, self );
+			rlink_log_obj( self, "debug", "Setting options from an opthash." );
+			rb_funcall( self, rb_intern("merge!"), 1, opthash );
 		}
 	}
 
 	else {
-		rb_raise( rb_eRuntimeError, "Cannot re-initialize a Dictionary object." );
+		rb_raise( rb_eRuntimeError, "Cannot re-initialize a ParseOptions object." );
 	}
 
 	return self;
 }
 
 
-/* 
- *  Iterator function for rlink_parseopts_init() -- for each element of the hash passed
- *  to the constructor, call the corresponding accessor in the new object.
+/*
+ * Copy constructor
  */
 static VALUE
-rlink_parseopts_each_opthash_i( VALUE pair, VALUE self ) {
-	VALUE key, val, keystring;
-	char *method_name;
-	ID method;
-
-	key = rb_ary_entry( pair, 0 );
-	val = rb_ary_entry( pair, 1 );
-
-	keystring = rb_obj_as_string( key );
-
-	method_name = ALLOCA_N( char, RSTRING_LEN(keystring) + 1 );
-	strncpy( method_name, RSTRING_PTR(keystring), RSTRING_LEN(keystring) + 1 );
-	strncat( method_name, "=", 1 );
-
-	debugMsg(( "Calling method %s", method_name ));
-	method = rb_intern( method_name );
+rlink_parseopts_init_copy( VALUE self, VALUE other )
+{
+	if ( ! check_parseopts(self) ) {
+		Parse_Options opts;
 
-	return rb_funcall( self, method, 1, val );
-}
+		rlink_log_obj( self, "debug", "Initializing a copied ParseOptions: %p", self );
+		DATA_PTR( self ) = opts = parse_options_create();
+		rb_funcall( self, rb_intern("merge!"), 1, other );
 
+		rb_call_super( 1, &other );
+	}
 
-/*
- *  call-seq:
- *     merge( other )   -> parseopts
- *
- *  Merge the receiving parse options with the given +other+ object, which can
- *  be either another LinkParser::ParseOptions object or a Hash of options.
- */
-/*static VALUE
-rlink_parseopts_merge( VALUE self, other ) {
+	else {
+		rb_raise( rb_eRuntimeError, "Can't recopy a ParseOptions object." );
+	}
 
+	return self;
 }
-*/
 
 
 /*
  *  call-seq:
  *     opts.verbosity= fixnum
  *
- *  This sets the level of description printed to stderr/stdout about the 
+ *  This sets the level of description printed to stderr/stdout about the
  *  parsing process.
  */
 static VALUE
-rlink_parseopts_set_verbosity( VALUE self, VALUE verbosity ) {
+rlink_parseopts_set_verbosity( VALUE self, VALUE verbosity )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_verbosity( opts, NUM2INT(verbosity) );
 	return verbosity;
@@ -192,11 +185,12 @@ rlink_parseopts_set_verbosity( VALUE self, VALUE verbosity ) {
  *  call-seq:
  *     opts.verbosity   -> fixnum
  *
- *  This gets the level of description printed to stderr/stdout about the 
+ *  This gets the level of description printed to stderr/stdout about the
  *  parsing process.
  */
 static VALUE
-rlink_parseopts_get_verbosity( VALUE self ) {
+rlink_parseopts_get_verbosity( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -209,13 +203,14 @@ rlink_parseopts_get_verbosity( VALUE self ) {
  *  call-seq:
  *     opts.linkage_limit= fixnum
  *
- *  This parameter determines the maximum number of linkages that are 
- *  considered in post-processing. If more than +linkage_limit+ linkages are found, 
- *  then a random sample of +linkage_limit+ is chosen for post-processing. When 
+ *  This parameter determines the maximum number of linkages that are
+ *  considered in post-processing. If more than +linkage_limit+ linkages are found,
+ *  then a random sample of +linkage_limit+ is chosen for post-processing. When
  *  this happen a warning is displayed at verbosity levels greater than 1.
  */
 static VALUE
-rlink_parseopts_set_linkage_limit( VALUE self, VALUE linkage_limit ) {
+rlink_parseopts_set_linkage_limit( VALUE self, VALUE linkage_limit )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_linkage_limit( opts, NUM2INT(linkage_limit) );
 	return linkage_limit;
@@ -226,13 +221,14 @@ rlink_parseopts_set_linkage_limit( VALUE self, VALUE linkage_limit ) {
  *  call-seq:
  *     opts.linkage_limit   -> fixnum
  *
- *  This parameter determines the maximum number of linkages that are 
- *  considered in post-processing. If more than +linkage_limit+ linkages are found, 
- *  then a random sample of +linkage_limit+ is chosen for post-processing. When 
+ *  This parameter determines the maximum number of linkages that are
+ *  considered in post-processing. If more than +linkage_limit+ linkages are found,
+ *  then a random sample of +linkage_limit+ is chosen for post-processing. When
  *  this happen a warning is displayed at verbosity levels greater than 1.
  */
 static VALUE
-rlink_parseopts_get_linkage_limit( VALUE self ) {
+rlink_parseopts_get_linkage_limit( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -245,12 +241,13 @@ rlink_parseopts_get_linkage_limit( VALUE self ) {
  *  call-seq:
  *     opts.disjunct_cost= fixnum
  *
- *  Determines the maximum disjunct cost used during parsing, where the cost 
- * of a disjunct is equal to the maximum cost of all of its connectors. The 
- * default is that all disjuncts, no matter what their cost, are considered.
+ *  Determines the maximum disjunct cost used during parsing, where the cost
+ *  of a disjunct is equal to the maximum cost of all of its connectors. The
+ *  default is that all disjuncts, no matter what their cost, are considered.
  */
 static VALUE
-rlink_parseopts_set_disjunct_cost( VALUE self, VALUE disjunct_cost ) {
+rlink_parseopts_set_disjunct_cost( VALUE self, VALUE disjunct_cost )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_disjunct_cost( opts, NUM2INT(disjunct_cost) );
 	return disjunct_cost;
@@ -264,7 +261,8 @@ rlink_parseopts_set_disjunct_cost( VALUE self, VALUE disjunct_cost ) {
  *  Get the maximum disjunct cost used during parsing.
  */
 static VALUE
-rlink_parseopts_get_disjunct_cost( VALUE self ) {
+rlink_parseopts_get_disjunct_cost( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -277,12 +275,13 @@ rlink_parseopts_get_disjunct_cost( VALUE self ) {
  *  call-seq:
  *     opts.min_null_count= fixnum   -> fixnum
  *
- *  Set the minimum of null links that a parse can have. A call to 
- *  LinkParser::Sentence#parse will find all linkages having the minimum 
+ *  Set the minimum of null links that a parse can have. A call to
+ *  LinkParser::Sentence#parse will find all linkages having the minimum
  *  number of null links within the range specified by this parameter.
  */
 static VALUE
-rlink_parseopts_set_min_null_count( VALUE self, VALUE null_count ) {
+rlink_parseopts_set_min_null_count( VALUE self, VALUE null_count )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_min_null_count( opts, NUM2INT(null_count) );
 	return null_count;
@@ -296,7 +295,8 @@ rlink_parseopts_set_min_null_count( VALUE self, VALUE null_count ) {
  *  Get the minimum of null links that a parse can have.
  */
 static VALUE
-rlink_parseopts_get_min_null_count( VALUE self ) {
+rlink_parseopts_get_min_null_count( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -312,7 +312,8 @@ rlink_parseopts_get_min_null_count( VALUE self ) {
  *  Set the maximum number of null links allowed in a parse.
  */
 static VALUE
-rlink_parseopts_set_max_null_count( VALUE self, VALUE null_count ) {
+rlink_parseopts_set_max_null_count( VALUE self, VALUE null_count )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_max_null_count( opts, NUM2INT(null_count) );
 	return null_count;
@@ -326,7 +327,8 @@ rlink_parseopts_set_max_null_count( VALUE self, VALUE null_count ) {
  *  Get the maximum number of null links allowed in a parse.
  */
 static VALUE
-rlink_parseopts_get_max_null_count( VALUE self ) {
+rlink_parseopts_get_max_null_count( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -335,53 +337,21 @@ rlink_parseopts_get_max_null_count( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     opts.null_block= null_block
- *
- *  Set the null_block option to the specified value. The null_block option 
- *  allows null links to be counted in "bunches." For example, if null_block 
- *  is 4, then a linkage with 1,2,3 or 4 null links has a null cost of 1, a 
- *  linkage with 5,6,7 or 8 null links has a null cost of 2, etc.
- */
-static VALUE
-rlink_parseopts_set_null_block( VALUE self, VALUE null_block ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_null_block( opts, NUM2INT(null_block) );
-	return null_block;
-}
-
-
-/*
- *  call-seq:
- *     opts.null_block   -> fixnum
- *
- *  Get the value of the null_block option.
- */
-static VALUE
-rlink_parseopts_get_null_block( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_null_block( opts );
-	return INT2FIX( rval );
-}
-
-
 /*
  *  call-seq:
  *     opts.islands_ok= boolean
  *
- *  This option determines whether or not "islands" of links are allowed. For 
+ *  This option determines whether or not "islands" of links are allowed. For
  *  example, the following linkage has an island:
  *
- *       +------Wd-----+                                           
+ *       +------Wd-----+
  *       |     +--Dsu--+---Ss--+-Paf-+      +--Dsu--+---Ss--+--Pa-+
  *       |     |       |       |     |      |       |       |     |
  *     ///// this sentence.n is.v false.a this sentence.n is.v true.a
  */
 static VALUE
-rlink_parseopts_set_islands_ok( VALUE self, VALUE islands_ok ) {
+rlink_parseopts_set_islands_ok( VALUE self, VALUE islands_ok )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_islands_ok( opts, RTEST(islands_ok) );
 	return islands_ok;
@@ -395,7 +365,8 @@ rlink_parseopts_set_islands_ok( VALUE self, VALUE islands_ok ) {
  *  Get the value of the islands_ok option.
  */
 static VALUE
-rlink_parseopts_get_islands_ok_p( VALUE self ) {
+rlink_parseopts_get_islands_ok_p( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -408,14 +379,15 @@ rlink_parseopts_get_islands_ok_p( VALUE self ) {
  *  call-seq:
  *     opts.short_length= fixnum
  *
- *  The short_length parameter determines how long the links are allowed to 
- *  be. The intended use of this is to speed up parsing by not considering 
- *  very long links for most connectors, since they are very rarely used in a 
- *  correct parse. An entry for UNLIMITED-CONNECTORS in the dictionary will 
+ *  The short_length parameter determines how long the links are allowed to
+ *  be. The intended use of this is to speed up parsing by not considering
+ *  very long links for most connectors, since they are very rarely used in a
+ *  correct parse. An entry for UNLIMITED-CONNECTORS in the dictionary will
  *  specify which connectors are exempt from the length limit.
  */
 static VALUE
-rlink_parseopts_set_short_length( VALUE self, VALUE short_length ) {
+rlink_parseopts_set_short_length( VALUE self, VALUE short_length )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_short_length( opts, NUM2INT(short_length) );
 	return short_length;
@@ -429,7 +401,8 @@ rlink_parseopts_set_short_length( VALUE self, VALUE short_length ) {
  *  Get the value of the short_length option.
  */
 static VALUE
-rlink_parseopts_get_short_length( VALUE self ) {
+rlink_parseopts_get_short_length( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -442,13 +415,14 @@ rlink_parseopts_get_short_length( VALUE self ) {
  *  call-seq:
  *     opts.max_memory= fixnum
  *
- *  Determines the maximum memory allowed during parsing. This is used just as 
- *  max_parse_time is, so that the parsing process is terminated as quickly as 
- *  possible after the total memory (including that allocated to all 
+ *  Determines the maximum memory allowed during parsing. This is used just as
+ *  max_parse_time is, so that the parsing process is terminated as quickly as
+ *  possible after the total memory (including that allocated to all
  *  dictionaries, etc.) exceeds the maximum allowed.
  */
 static VALUE
-rlink_parseopts_set_max_memory( VALUE self, VALUE mem ) {
+rlink_parseopts_set_max_memory( VALUE self, VALUE mem )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_max_memory( opts, NUM2INT(mem) );
 	return mem;
@@ -462,7 +436,8 @@ rlink_parseopts_set_max_memory( VALUE self, VALUE mem ) {
  *  Get the value of the max_memory option.
  */
 static VALUE
-rlink_parseopts_get_max_memory( VALUE self ) {
+rlink_parseopts_get_max_memory( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -471,48 +446,19 @@ rlink_parseopts_get_max_memory( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     opts.max_sentence_length= fixnum
- *
- *  Determines the maximum length of a parsed sentence.
- */
-static VALUE
-rlink_parseopts_set_max_sentence_length( VALUE self, VALUE len ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_max_sentence_length( opts, NUM2INT(len) );
-	return len;
-}
-
-
-/*
- *  call-seq:
- *     opts.max_sentence_length   -> fixnum
- *
- *  Get the value of the max_sentence_length option.
- */
-static VALUE
-rlink_parseopts_get_max_sentence_length( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_max_sentence_length( opts );
-	return INT2FIX( rval );
-}
-
-
 /*
  *  call-seq:
  *     opts.max_parse_time= seconds
  *
- *  Determines the approximate maximum time that parsing is allowed to take. 
- *  The way it works is that after this time has expired, the parsing process 
- *  is artificially forced to complete quickly by pretending that no further 
- *  solutions (entries in the hash table) can be constructed. The actual 
+ *  Determines the approximate maximum time that parsing is allowed to take.
+ *  The way it works is that after this time has expired, the parsing process
+ *  is artificially forced to complete quickly by pretending that no further
+ *  solutions (entries in the hash table) can be constructed. The actual
  *  parsing time might be slightly longer.
  */
 static VALUE
-rlink_parseopts_set_max_parse_time( VALUE self, VALUE secs ) {
+rlink_parseopts_set_max_parse_time( VALUE self, VALUE secs )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_max_parse_time( opts, NUM2INT(secs) );
 	return secs;
@@ -526,7 +472,8 @@ rlink_parseopts_set_max_parse_time( VALUE self, VALUE secs ) {
  *  Get the number of seconds of the max_parse_time option.
  */
 static VALUE
-rlink_parseopts_get_max_parse_time( VALUE self ) {
+rlink_parseopts_get_max_parse_time( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -535,106 +482,17 @@ rlink_parseopts_get_max_parse_time( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     opts.screen_width= columns
- *
- *  Set the screen width assumed by the diagramming functions.
- */
-static VALUE
-rlink_parseopts_set_screen_width( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_screen_width( opts, NUM2INT(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.screen_width   -> fixnum
- *
- *  Get the screen width assumed by the diagramming functions.
- */
-static VALUE
-rlink_parseopts_get_screen_width( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_screen_width( opts );
-	return INT2FIX( rval );
-}
-
-
-/*
- *  call-seq:
- *     opts.allow_null= boolean
- *
- *  Indicates whether or not linkages are allowed to have null links.
- */
-static VALUE
-rlink_parseopts_set_allow_null( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_allow_null( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.allow_null?   -> true or false
- *
- *  Get the value of the allow_null option.
- */
-static VALUE
-rlink_parseopts_get_allow_null_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_allow_null( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_walls= boolean
- *
- *  Whether or not to show the wall word(s) when a linkage diagram is printed.
- */
-static VALUE
-rlink_parseopts_set_display_walls( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_walls( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_walls?   -> true or false
- *
- *  Whether or not to show the wall word(s) when a linkage diagram is printed.
- */
-static VALUE
-rlink_parseopts_get_display_walls_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_display_walls( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
 /*
  *  call-seq:
  *     opts.all_short_connectors= boolean
  *
- *  If true, then all connectors have length restrictions imposed on them -- 
- *  they can be no farther than short_length apart. This is used when parsing 
+ *  If true, then all connectors have length restrictions imposed on them --
+ *  they can be no farther than short_length apart. This is used when parsing
  *  in "panic" mode, for example.
  */
 static VALUE
-rlink_parseopts_set_all_short_connectors( VALUE self, VALUE val ) {
+rlink_parseopts_set_all_short_connectors( VALUE self, VALUE val )
+{
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_all_short_connectors( opts, RTEST(val) );
 	return val;
@@ -648,7 +506,8 @@ rlink_parseopts_set_all_short_connectors( VALUE self, VALUE val ) {
  *  Get the value of the all_short_connectors option.
  */
 static VALUE
-rlink_parseopts_get_all_short_connectors_p( VALUE self ) {
+rlink_parseopts_get_all_short_connectors_p( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -659,321 +518,75 @@ rlink_parseopts_get_all_short_connectors_p( VALUE self ) {
 
 /*
  *  call-seq:
- *     opts.cost_model_type= 
+ *     opts.cost_model_type = :vdal
+ *     opts.cost_model_type = :corpus
  *
- *  The cost model type for ranking linkages, which is an index into an array 
- *  of function pointers. The current code only has a single entry, but others 
- *  could easily be added.
- */
-static VALUE
-rlink_parseopts_set_cost_model_type( VALUE self, VALUE cm ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_cost_model_type( opts, NUM2INT(cm) );
-	return cm;
-}
-
-
-/*
- *  call-seq:
- *     opts.cost_model_type   -> fixnum
+ *  The cost model type for ranking linkages. Currently, there are two models: VDAL (:vdal)
+ *  and CORPUS (:corpus). The VDAL model ranks parses from lowest to highest cost in and-cost,
+ *  disjunct-cost, unused-word-cost and structure-violations-cost. The CORPUS model ranks
+ *  parses according to the frequency of use of disjuncts, based on a statistical analysis
+ *  of a collection of texts. If you haven't compiled the link-grammar library with support
+ *  for the CORPUS cost model, attempting to set it to this will raise an exception.
  *
- *  Get the cost model type for ranking linkages.
  */
-/*
-
-There's no actual API function for getting the cost_model_type. I guess if
-there's ever more than one model type defined there will be.
-
 static VALUE
-rlink_parseopts_get_cost_model_type( VALUE self ) {
+rlink_parseopts_set_cost_model_type( VALUE self, VALUE model_name )
+{
 	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_cost_model_type( opts );
-	return INT2FIX( rval );
-}
-*/
-
+	Cost_Model_type model;
 
-/*
- *  call-seq:
- *     opts.batch_mode= boolean
- *
- *  Enable or disable "batch mode."
- *
- *  :TODO: Figure out what batch mode is.
- */
-static VALUE
-rlink_parseopts_set_batch_mode( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_batch_mode( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.batch_mode?   -> true or false
- *
- *  Returns +true+ if batch mode is enabled.
- */
-static VALUE
-rlink_parseopts_get_batch_mode_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_batch_mode( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-/*
- *  call-seq:
- *     opts.panic_mode= boolean
- *
- *  Enable or disable "panic mode."
- *  
- *  :TODO: Figure out what enabling this option does. I only know about panic
- *  mode in the parser -- does this allow/disallow the parser from entering it?
- */
-static VALUE
-rlink_parseopts_set_panic_mode( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_panic_mode( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.panic_mode?   -> true or false
- *
- *  Returns +true+ if panic mode is enabled.
- */
-static VALUE
-rlink_parseopts_get_panic_mode_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_panic_mode( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_on= boolean
- *
- *  Enable/disable display.
- *  
- *  :TODO: Figure out what this setting does.
- *  
- */
-static VALUE
-rlink_parseopts_set_display_on( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_on( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_on?   -> true or false
- *
- *  Returns +true+ if ...?
- */
-static VALUE
-rlink_parseopts_get_display_on_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_display_on( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_postscript= boolean
- *
- *  Enable/disable display using Postscript.
- */
-static VALUE
-rlink_parseopts_set_display_postscript( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_postscript( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_postscript?   -> true or false
- *
- *  Returns +true+ if display should use Postscript instead of plain text.
- */
-static VALUE
-rlink_parseopts_get_display_postscript_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_display_postscript( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_constituents= boolean
- *
- *  Set the display_constituents option to the specified value.
- */
-static VALUE
-rlink_parseopts_set_display_constituents( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_constituents( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_constituents?   -> true or false
- *
- *  Get the value of the display_constituents option.
- */
-static VALUE
-rlink_parseopts_get_display_constituents_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_display_constituents( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_bad= boolean
- *
- *  Set the display_bad option to the specified value.
- */
-static VALUE
-rlink_parseopts_set_display_bad( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_bad( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_bad?   -> true or false
- *
- *  Get the value of the display_bad option.
- */
-static VALUE
-rlink_parseopts_get_display_bad_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_display_bad( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_links= boolean
- *
- *  Set the display_links option to the specified value.
- */
-static VALUE
-rlink_parseopts_set_display_links( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_links( opts, RTEST(val) );
-	return val;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_links?   -> true or false
- *
- *  Get the value of the display_links option.
- */
-static VALUE
-rlink_parseopts_get_display_links_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
-
-	rval = parse_options_get_display_links( opts );
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     opts.display_union= boolean
- *
- *  Set the display_union option to the specified value.
- */
-static VALUE
-rlink_parseopts_set_display_union( VALUE self, VALUE val ) {
-	Parse_Options opts = get_parseopts( self );
-	parse_options_set_display_union( opts, RTEST(val) );
-	return val;
-}
+	if ( model_name == vdal_sym ) {
+		rlink_log_obj( self, "debug", "Selected the 'VDAL' cost model" );
+		model = VDAL;
+	} else if ( model_name == corpus_sym ) {
+		rlink_log_obj( self, "debug", "Selected the 'CORPUS' cost model" );
+		model = CORPUS;
+	} else {
+		rb_raise( rb_eArgError, "Unknown cost model %s (expected either :vdal or :corpus).",
+			 RSTRING_PTR(rb_inspect( model_name )) );
+	}
 
+	rlink_log_obj( self, "info", "Setting the cost model to %s", model == VDAL ? "VDAL" : "CORPUS" );
+	parse_options_reset_resources( opts );
+	parse_options_set_cost_model_type( opts, model );
 
-/*
- *  call-seq:
- *     opts.display_union?   -> true or false
- *
- *  Get the value of the display_union option.
- */
-static VALUE
-rlink_parseopts_get_display_union_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
+	if ( parse_options_get_cost_model_type(opts) != model ) {
+		rb_raise( rb_eArgError,
+			"Couldn't set the cost model: is link-grammar possibly compiled without it?" );
+	}
 
-	rval = parse_options_get_display_union( opts );
-	return rval ? Qtrue : Qfalse;
+	return model_name;
 }
 
 
 /*
  *  call-seq:
- *     opts.echo_on= boolean
+ *     opts.cost_model_type   -> Symbol
  *
- *  Set the echo_on option to the specified value.
+ *  Get the cost model type for ranking linkages.
  */
 static VALUE
-rlink_parseopts_set_echo_on( VALUE self, VALUE val ) {
+rlink_parseopts_get_cost_model_type( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
-	parse_options_set_echo_on( opts, RTEST(val) );
-	return val;
-}
-
+	Cost_Model_type model = parse_options_get_cost_model_type( opts );
+	VALUE model_name = Qnil;
 
-/*
- *  call-seq:
- *     opts.echo_on?   -> true or false
- *
- *  Get the value of the echo_on option.
- */
-static VALUE
-rlink_parseopts_get_echo_on_p( VALUE self ) {
-	Parse_Options opts = get_parseopts( self );
-	int rval;
+	switch( model ) {
+	case VDAL:
+		model_name = vdal_sym;
+		break;
+	case CORPUS:
+		model_name = corpus_sym;
+		break;
+	default:
+		rb_bug( "Unhandled cost model type %d", model );
+	}
 
-	rval = parse_options_get_echo_on( opts );
-	return rval ? Qtrue : Qfalse;
+	return model_name;
 }
 
 
-
-
 /*
  *  call-seq:
  *     opts.spell_guessing_enabled= boolean
@@ -981,7 +594,8 @@ rlink_parseopts_get_echo_on_p( VALUE self ) {
  *  Enable/disable spell-guessing if it's supported.
  */
 static VALUE
-rlink_parseopts_set_spell_guess( VALUE self, VALUE val ) {
+rlink_parseopts_set_spell_guess( VALUE self, VALUE val )
+{
 #ifdef HAVE_PARSE_OPTIONS_GET_SPELL_GUESS
 	Parse_Options opts = get_parseopts( self );
 	parse_options_set_spell_guess( opts, RTEST(val) );
@@ -1001,7 +615,8 @@ rlink_parseopts_set_spell_guess( VALUE self, VALUE val ) {
  *  mean that it's supported, only that it will be used if it is.
  */
 static VALUE
-rlink_parseopts_get_spell_guess_p( VALUE self ) {
+rlink_parseopts_get_spell_guess_p( VALUE self )
+{
 #ifdef HAVE_PARSE_OPTIONS_GET_SPELL_GUESS
 	Parse_Options opts = get_parseopts( self );
 	int rval;
@@ -1027,7 +642,8 @@ rlink_parseopts_get_spell_guess_p( VALUE self ) {
  *     end
  */
 static VALUE
-rlink_parseopts_timer_expired_p( VALUE self ) {
+rlink_parseopts_timer_expired_p( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -1048,7 +664,8 @@ rlink_parseopts_timer_expired_p( VALUE self ) {
  *     end
  */
 static VALUE
-rlink_parseopts_memory_exhausted_p( VALUE self ) {
+rlink_parseopts_memory_exhausted_p( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -1069,7 +686,8 @@ rlink_parseopts_memory_exhausted_p( VALUE self ) {
  *     end
  */
 static VALUE
-rlink_parseopts_resources_exhausted_p( VALUE self ) {
+rlink_parseopts_resources_exhausted_p( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 	int rval;
 
@@ -1086,7 +704,8 @@ rlink_parseopts_resources_exhausted_p( VALUE self ) {
  *
  */
 static VALUE
-rlink_parseopts_reset_resources( VALUE self ) {
+rlink_parseopts_reset_resources( VALUE self )
+{
 	Parse_Options opts = get_parseopts( self );
 
 	parse_options_reset_resources( opts );
@@ -1095,142 +714,52 @@ rlink_parseopts_reset_resources( VALUE self ) {
 
 
 
-/*
- * LinkParser parse options class. Instances of this class are used to specify the different
- * parameters that are used to parse sentences. Examples of the kinds of things that are
- * controlled by ParseOptions include maximum parsing time and memory, whether to use
- * null-links, and whether or not to use "panic" mode. This data structure is passed in to
- * the various parsing and printing routines along with the sentence.
- *
- */
 void
-rlink_init_parseoptions() {
+rlink_init_parseoptions()
+{
 	rlink_cParseOptions = rb_define_class_under( rlink_mLinkParser,
 		"ParseOptions", rb_cObject );
 
+	vdal_sym = ID2SYM( rb_intern("vdal") );
+	corpus_sym = ID2SYM( rb_intern("corpus") );
+
 	rb_define_alloc_func( rlink_cParseOptions, rlink_parseopts_s_alloc );
 	rb_define_method( rlink_cParseOptions, "initialize", rlink_parseopts_init, -1 );
+	rb_define_method( rlink_cParseOptions, "initialize_copy", rlink_parseopts_init_copy, 1 );
 /*
 	rb_define_method( rlink_cParseOptions, "merge", rlink_parseopts_merge, 1 );
 	rb_define_method( rlink_cParseOptions, "merge!", rlink_parseopts_merge_bang, 1 );
 */
-	rb_define_method( rlink_cParseOptions, "verbosity=",
-		rlink_parseopts_set_verbosity, 1 );
-	rb_define_method( rlink_cParseOptions, "verbosity",
-		rlink_parseopts_get_verbosity, 0 );
-	rb_define_method( rlink_cParseOptions, "linkage_limit=",
-		rlink_parseopts_set_linkage_limit, 1 );
-	rb_define_method( rlink_cParseOptions, "linkage_limit",
-		rlink_parseopts_get_linkage_limit, 0 );
-	rb_define_method( rlink_cParseOptions, "disjunct_cost=",
-		rlink_parseopts_set_disjunct_cost, 1 );
-	rb_define_method( rlink_cParseOptions, "disjunct_cost",
-		rlink_parseopts_get_disjunct_cost, 0 );
-	rb_define_method( rlink_cParseOptions, "min_null_count=",
-		rlink_parseopts_set_min_null_count, 1 );
-	rb_define_method( rlink_cParseOptions, "min_null_count",
-		rlink_parseopts_get_min_null_count, 0 );
-	rb_define_method( rlink_cParseOptions, "max_null_count=",
-		rlink_parseopts_set_max_null_count, 1 );
-	rb_define_method( rlink_cParseOptions, "max_null_count",
-		rlink_parseopts_get_max_null_count, 0 );
-	rb_define_method( rlink_cParseOptions, "null_block=",
-		rlink_parseopts_set_null_block, 1 );
-	rb_define_method( rlink_cParseOptions, "null_block",
-		rlink_parseopts_get_null_block, 0 );
-	rb_define_method( rlink_cParseOptions, "islands_ok=",
-		rlink_parseopts_set_islands_ok, 1 );
-	rb_define_method( rlink_cParseOptions, "islands_ok?",
-		rlink_parseopts_get_islands_ok_p, 0 );
-	rb_define_method( rlink_cParseOptions, "short_length=",
-		rlink_parseopts_set_short_length, 1 );
-	rb_define_method( rlink_cParseOptions, "short_length",
-		rlink_parseopts_get_short_length, 0 );
-	rb_define_method( rlink_cParseOptions, "max_memory=",
-		rlink_parseopts_set_max_memory, 1 );
-	rb_define_method( rlink_cParseOptions, "max_memory",
-		rlink_parseopts_get_max_memory, 0 );
-	rb_define_method( rlink_cParseOptions, "max_sentence_length=",
-		rlink_parseopts_set_max_sentence_length, 1 );
-	rb_define_method( rlink_cParseOptions, "max_sentence_length",
-		rlink_parseopts_get_max_sentence_length, 0 );
-	rb_define_method( rlink_cParseOptions, "max_parse_time=",
-		rlink_parseopts_set_max_parse_time, 1 );
-	rb_define_method( rlink_cParseOptions, "max_parse_time",
-		rlink_parseopts_get_max_parse_time, 0 );
-	rb_define_method( rlink_cParseOptions, "screen_width=",
-		rlink_parseopts_set_screen_width, 1 );
-	rb_define_method( rlink_cParseOptions, "screen_width",
-		rlink_parseopts_get_screen_width, 0 );
-	rb_define_method( rlink_cParseOptions, "allow_null=",
-		rlink_parseopts_set_allow_null, 1 );
-	rb_define_method( rlink_cParseOptions, "allow_null?",
-		rlink_parseopts_get_allow_null_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_walls=",
-		rlink_parseopts_set_display_walls, 1 );
-	rb_define_method( rlink_cParseOptions, "display_walls?",
-		rlink_parseopts_get_display_walls_p, 0 );
-	rb_define_method( rlink_cParseOptions, "all_short_connectors=",
-		rlink_parseopts_set_all_short_connectors, 1 );
-	rb_define_method( rlink_cParseOptions, "all_short_connectors?",
-		rlink_parseopts_get_all_short_connectors_p, 0 );
-	rb_define_method( rlink_cParseOptions, "cost_model_type=",
-		rlink_parseopts_set_cost_model_type, 1 );
-
-/*  (No way to get the cost_model_type from the API)
-
-	rb_define_method( rlink_cParseOptions, "cost_model_type",
-		rlink_parseopts_get_cost_model_type, 0 );
-*/
-	rb_define_method( rlink_cParseOptions, "batch_mode=",
-		rlink_parseopts_set_batch_mode, 1 );
-	rb_define_method( rlink_cParseOptions, "batch_mode?",
-		rlink_parseopts_get_batch_mode_p, 0 );
-	rb_define_method( rlink_cParseOptions, "panic_mode=",
-		rlink_parseopts_set_panic_mode, 1 );
-	rb_define_method( rlink_cParseOptions, "panic_mode?",
-		rlink_parseopts_get_panic_mode_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_on=",
-		rlink_parseopts_set_display_on, 1 );
-	rb_define_method( rlink_cParseOptions, "display_on?",
-		rlink_parseopts_get_display_on_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_postscript=",
-		rlink_parseopts_set_display_postscript, 1 );
-	rb_define_method( rlink_cParseOptions, "display_postscript?",
-		rlink_parseopts_get_display_postscript_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_constituents=",
-		rlink_parseopts_set_display_constituents, 1 );
-	rb_define_method( rlink_cParseOptions, "display_constituents?",
-		rlink_parseopts_get_display_constituents_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_bad=",
-		rlink_parseopts_set_display_bad, 1 );
-	rb_define_method( rlink_cParseOptions, "display_bad?",
-		rlink_parseopts_get_display_bad_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_links=",
-		rlink_parseopts_set_display_links, 1 );
-	rb_define_method( rlink_cParseOptions, "display_links?",
-		rlink_parseopts_get_display_links_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_union=",
-		rlink_parseopts_set_display_union, 1 );
-	rb_define_method( rlink_cParseOptions, "display_union?",
-		rlink_parseopts_get_display_union_p, 0 );
-	rb_define_method( rlink_cParseOptions, "echo_on=",
-		rlink_parseopts_set_echo_on, 1 );
-	rb_define_method( rlink_cParseOptions, "echo_on?",
-		rlink_parseopts_get_echo_on_p, 0 );
-	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled=",
-		rlink_parseopts_set_spell_guess, 1 );
-	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled?",
-		rlink_parseopts_get_spell_guess_p, 0 );
-
-	rb_define_method( rlink_cParseOptions, "timer_expired?",
-		rlink_parseopts_timer_expired_p, 0 );
-	rb_define_method( rlink_cParseOptions, "memory_exhausted?",
-		rlink_parseopts_memory_exhausted_p, 0 );
-	rb_define_method( rlink_cParseOptions, "resources_exhausted?",
-		rlink_parseopts_resources_exhausted_p, 0 );
-	rb_define_method( rlink_cParseOptions, "reset_resources",
-		rlink_parseopts_reset_resources, 0 );
+	rb_define_method( rlink_cParseOptions, "verbosity=", rlink_parseopts_set_verbosity, 1 );
+	rb_define_method( rlink_cParseOptions, "verbosity", rlink_parseopts_get_verbosity, 0 );
+	rb_define_method( rlink_cParseOptions, "linkage_limit=", rlink_parseopts_set_linkage_limit, 1 );
+	rb_define_method( rlink_cParseOptions, "linkage_limit", rlink_parseopts_get_linkage_limit, 0 );
+	rb_define_method( rlink_cParseOptions, "disjunct_cost=", rlink_parseopts_set_disjunct_cost, 1 );
+	rb_define_method( rlink_cParseOptions, "disjunct_cost", rlink_parseopts_get_disjunct_cost, 0 );
+	rb_define_method( rlink_cParseOptions, "min_null_count=", rlink_parseopts_set_min_null_count, 1 );
+	rb_define_method( rlink_cParseOptions, "min_null_count", rlink_parseopts_get_min_null_count, 0 );
+	rb_define_method( rlink_cParseOptions, "max_null_count=", rlink_parseopts_set_max_null_count, 1 );
+	rb_define_method( rlink_cParseOptions, "max_null_count", rlink_parseopts_get_max_null_count, 0 );
+	rb_define_method( rlink_cParseOptions, "islands_ok=", rlink_parseopts_set_islands_ok, 1 );
+	rb_define_method( rlink_cParseOptions, "islands_ok?", rlink_parseopts_get_islands_ok_p, 0 );
+	rb_define_method( rlink_cParseOptions, "short_length=", rlink_parseopts_set_short_length, 1 );
+	rb_define_method( rlink_cParseOptions, "short_length", rlink_parseopts_get_short_length, 0 );
+	rb_define_method( rlink_cParseOptions, "max_memory=", rlink_parseopts_set_max_memory, 1 );
+	rb_define_method( rlink_cParseOptions, "max_memory", rlink_parseopts_get_max_memory, 0 );
+	rb_define_method( rlink_cParseOptions, "max_parse_time=", rlink_parseopts_set_max_parse_time, 1 );
+	rb_define_method( rlink_cParseOptions, "max_parse_time", rlink_parseopts_get_max_parse_time, 0 );
+	rb_define_method( rlink_cParseOptions, "all_short_connectors=", rlink_parseopts_set_all_short_connectors, 1 );
+	rb_define_method( rlink_cParseOptions, "all_short_connectors?", rlink_parseopts_get_all_short_connectors_p, 0 );
+	rb_define_method( rlink_cParseOptions, "cost_model_type=", rlink_parseopts_set_cost_model_type, 1 );
+	rb_define_method( rlink_cParseOptions, "cost_model_type", rlink_parseopts_get_cost_model_type, 0 );
+
+	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled=", rlink_parseopts_set_spell_guess, 1 );
+	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled?", rlink_parseopts_get_spell_guess_p, 0 );
+
+	rb_define_method( rlink_cParseOptions, "timer_expired?", rlink_parseopts_timer_expired_p, 0 );
+	rb_define_method( rlink_cParseOptions, "memory_exhausted?", rlink_parseopts_memory_exhausted_p, 0 );
+	rb_define_method( rlink_cParseOptions, "resources_exhausted?", rlink_parseopts_resources_exhausted_p, 0 );
+	rb_define_method( rlink_cParseOptions, "reset_resources", rlink_parseopts_reset_resources, 0 );
 
 }