gecoder 0.8.2 → 0.8.3

data/ext/missing.cpp

@@ -1,328 +0,0 @@
-/**
- * Gecode/R, a Ruby interface to Gecode.
- * Copyright (C) 2007 The Gecode/R development team.
- * 
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-**/
-
-#include "missing.h"
-#include "gecode.hh"
-
-#include <iostream>
-#include <map>
-
-namespace Gecode {
-
-struct MBranchingDesc::Private
-{
-	const Gecode::BranchingDesc *ptr;
-};
-
-MBranchingDesc::MBranchingDesc() : d(new Private)
-{
-
-}
-
-MBranchingDesc::~MBranchingDesc()
-{
-	delete d;
-}
-
-void MBranchingDesc::setPtr(const Gecode::BranchingDesc *desc)
-{
-	d->ptr = desc;
-}
-
-const Gecode::BranchingDesc *MBranchingDesc::ptr() const
-{
-	return d->ptr;
-}
-
-int MBranchingDesc::alternatives() const
-{
-	if(d->ptr) return d->ptr->alternatives();
-	
-	return -1;
-}
-
-int MBranchingDesc::size() const
-{
-	if(d->ptr) return d->ptr->size();
-	
-	return -1;
-}
-
-
-///////////////////////////////////// 
-
-struct ltstr
-{
-	bool operator()(const char* s1, const char* s2) const
-	{
-		return strcmp(s1, s2) < 0;
-	}
-};
-
-typedef std::map<const char *, MIntVarArray *, ltstr> IntVarArrays;
-typedef std::map<const char *, MBoolVarArray *, ltstr> BoolVarArrays;
-typedef std::map<const char *, MSetVarArray *, ltstr> SetVarArrays;
-
-struct MSpace::Private
-{
-	Private()
-	{
-		description = new MBranchingDesc;;
-	}
-	
-	~Private()
-	{
-// 		{
-// 			IntVarArrays::iterator it, eend = intArrays.end();
-// 			
-// 			for(it = intArrays.begin(); it != eend; it++)
-// 			{
-// 				delete (*it).second;
-// 			}
-// 		}
-// 		{
-// 			SetVarArrays::iterator it, eend = setArrays.end();
-// 			
-// 			for(it = setArrays.begin(); it != eend; it++)
-// 			{
-// 				delete (*it).second;
-// 			}
-// 		}
-// 		
-// 		{
-// 			BoolVarArrays::iterator it, eend = boolArrays.end();
-// 			
-// 			for(it = boolArrays.begin(); it != eend; it++)
-// 			{
-// 				delete (*it).second;
-// 			}
-// 		}
-		
-		delete description;
-	}
-	
-	IntVarArrays intArrays;
-	BoolVarArrays boolArrays;
-	SetVarArrays setArrays;
-	
-	MBranchingDesc *description;
-};
-
-MSpace::MSpace() : d(new Private())
-{
-}
-
-MSpace::MSpace(MSpace& s, bool share) : Gecode::Space(share, s), d(new Private)
-{
-	{
-		IntVarArrays::iterator it, eend = s.d->intArrays.end();
-		
-		for(it = s.d->intArrays.begin(); it != eend; it++)
-		{
-			Gecode::MIntVarArray *iva = new Gecode::MIntVarArray(this, (*it).second->ptr()->size());
-			
-			iva->ptr()->update(this, share, *(*it).second->ptr() );
-			
-			own(iva, (*it).first);
-		}
-	}
-	{
-		BoolVarArrays::iterator it, eend = s.d->boolArrays.end();
-		
-		for(it = s.d->boolArrays.begin(); it != eend; it++)
-		{
-			Gecode::MBoolVarArray *bva = new Gecode::MBoolVarArray(this, (*it).second->ptr()->size());
-			
-			bva->ptr()->update(this, share, *(*it).second->ptr() );
-			
-			own(bva, (*it).first);
-		}
-	}
-	{
-		SetVarArrays::iterator it, eend = s.d->setArrays.end();
-		
-		for(it = s.d->setArrays.begin(); it != eend; it++)
-		{
-			Gecode::MSetVarArray *sva = new Gecode::MSetVarArray(this, (*it).second->ptr()->size());
-			sva->ptr()->update(this, share, *(*it).second->ptr() );
-			
-			own(sva, (*it).first);
-		}
-	}
-}
-
-
-
-MSpace::~MSpace()
-{
-	delete d;
-}
-
-Gecode::Space *MSpace::copy(bool share)
-{
-	return new MSpace(*this,share);
-}
-
-void MSpace::own(Gecode::MIntVarArray *iva, const char *name)
-{
-	d->intArrays[name] = iva;
-}
-
-void MSpace::own(Gecode::MBoolVarArray *bva, const char *name)
-{
-	d->boolArrays[name] = bva;
-}
-
-void MSpace::own(Gecode::MSetVarArray *sva, const char *name)
-{
-	d->setArrays[name] = sva;
-}
-
-void MSpace::gc_mark()
-{
-  {
-		IntVarArrays::iterator it, eend = d->intArrays.end();
-		for(it = d->intArrays.begin(); it != eend; it++)
-		{
-			rb_gc_mark(Rust_gecode::cxx2ruby((*it).second));
-		}
-	}
-	{
-		BoolVarArrays::iterator it, eend = d->boolArrays.end();
-		for(it = d->boolArrays.begin(); it != eend; it++)
-		{
-			rb_gc_mark(Rust_gecode::cxx2ruby((*it).second));
-		}
-	}
-	{
-		SetVarArrays::iterator it, eend = d->setArrays.end();
-		for(it = d->setArrays.begin(); it != eend; it++)
-		{
-			rb_gc_mark(Rust_gecode::cxx2ruby((*it).second));
-		}
-	}
-}
-
-// For BAB.
-void MSpace::constrain(MSpace* s)
-{
-  // Call Ruby's constrain.
-  rb_funcall(Rust_gecode::cxx2ruby(this), rb_intern("constrain"), 1,
-    Rust_gecode::cxx2ruby(s, false)); 
-}
-
-Gecode::MIntVarArray *MSpace::intVarArray(const char *name) const
-{
-	if ( d->intArrays.find(name) == d->intArrays.end() ) return 0;
-	return d->intArrays[name];
-}
-
-Gecode::MBoolVarArray *MSpace::boolVarArray(const char *name ) const
-{
-	if ( d->boolArrays.find(name) == d->boolArrays.end() ) return 0;
-	return d->boolArrays[name];
-}
-
-Gecode::MSetVarArray *MSpace::setVarArray(const char *name ) const
-{
-	if ( d->setArrays.find(name) == d->setArrays.end() ) return 0;
-	return d->setArrays[name];
-}
-
-Gecode::MBranchingDesc *MSpace::mdescription()
-{
-	if(!this->failed() || !d->description->ptr() )
-	{
-		d->description->setPtr(this->description());
-	}
-	return d->description;
-}
-
-void MSpace::debug()
-{
-	std::cout << "DEBUG: "<< d->intArrays["default"]->ptr()->size() << std::endl;
-}
-
-
-// DFS
-MDFS::MDFS(MSpace *space, unsigned int c_d, unsigned int a_d, Search::Stop* st) : Gecode::Search::DFS(space, c_d, a_d, st, sizeof(space))
-{
-}
-
-MDFS::~MDFS()
-{
-}
-
-
-// BAB
-MBAB::MBAB(MSpace *space, const Search::Options &o) : Gecode::BAB<MSpace>(space, o)
-{
-}
-
-MBAB::~MBAB()
-{
-}
-
-namespace Search {
-
-// Stop
-
-struct MStop::Private
-{
-	Gecode::Search::TimeStop *ts;
-    Gecode::Search::FailStop *fs;
-};
-
-MStop::MStop() : d(new Private)
-{
-	d->ts = 0;
-	d->fs = 0;
-}
-
-MStop::MStop(int fails, int time) : d(new Private)
-{
-	d->ts = new Search::TimeStop(time);
-	d->fs = new Search::FailStop(fails);
-}
-
-MStop::~MStop()
-{
-}
-
-bool MStop::stop(const Gecode::Search::Statistics &s)
-{
-	if (!d->fs || d->ts)
-		return false;
-	return d->fs->stop(s) || d->ts->stop(s);
-}
-
-Gecode::Search::Stop* MStop::create(int fails, int time)
-{
-	if (fails < 0 && time < 0) return 0;
-	if (fails < 0) return new Search::TimeStop( time );
-	
-	if (time  < 0) return new Search::FailStop(fails);
-	
-	return new MStop(fails, time);
-}
-
-
-}
-
-}

data/ext/missing.h

@@ -1,120 +0,0 @@
-/**
- * Gecode/R, a Ruby interface to Gecode.
- * Copyright (C) 2007 The Gecode/R development team.
- * 
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-**/
-
-#ifndef __MISSING_CLASSES_H
-#define __MISSING_CLASSES_H
-
-#include <ruby.h>
-
-#include <gecode/kernel.hh>
-#include <gecode/int.hh>
-#include <gecode/search.hh>
-#include <gecode/minimodel.hh>
-#include <gecode/set.hh>
-
-#include "vararray.h"
-
-namespace Gecode {
-
-class MBranchingDesc
-{
-	public:
-		MBranchingDesc();
-		~MBranchingDesc();
-		
-		void setPtr(const Gecode::BranchingDesc *);
-		const Gecode::BranchingDesc *ptr() const;
-		
-		int alternatives() const;
-		int size() const;
-		
-	private:
-		struct Private;
-		Private *const d;
-};
-
-class MSpace : public Space
-{
-	public:
-		MSpace();
-		explicit MSpace(MSpace& s, bool share=true);
-		~MSpace();
-		Gecode::Space *copy(bool share);
-		
-		void own(Gecode::MIntVarArray *iva, const char *name);
-		void own(Gecode::MBoolVarArray *bva, const char *name);
-		void own(Gecode::MSetVarArray *sva, const char *name);
-		
-		void gc_mark();
-		
-		void constrain(MSpace* s);
-		
-		Gecode::MIntVarArray *intVarArray(const char *name ) const;
-		Gecode::MBoolVarArray *boolVarArray(const char *name ) const;
-		Gecode::MSetVarArray *setVarArray(const char *name) const;
-		
-		Gecode::MBranchingDesc *mdescription();
-		
-		void debug();
-		
-	private:
-		struct Private;
-		Private *const d;
-};
-
-class MDFS : public Gecode::Search::DFS
-{
-	public:
-		MDFS(MSpace *space, unsigned int c_d, unsigned int a_d, Search::Stop* st = 0);
-		~MDFS();
-};
-class MBAB : public Gecode::BAB<MSpace>
-{
-	public:
-		MBAB(MSpace* space, const Search::Options &o);
-		~MBAB();
-};
-
-namespace Search {
-class MStop : public Gecode::Search::Stop
-{
-	private:
-		MStop(int fails, int time);
-		
-	public:
-		MStop();
-		~MStop();
-		
-		bool stop (const Gecode::Search::Statistics &s);
-		static Gecode::Search::Stop* create(int fails, int time);
-		
-		
-	private:
-		struct Private;
-		Private *const d;
-};
-
-}
-
-
-}
-
-#endif
-
-

data/specs/binding_changes.rb

@@ -1,76 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'Space', :shared => true do
-  it 'should give different indices when creating int variables' do
-    @space.new_int_vars([0, 17]).should_not equal(@space.new_int_vars([0, 17]))
-  end
-  
-  it 'should give different indices when creating bool variables' do
-    @space.new_bool_vars().should_not equal(@space.new_bool_vars())
-  end
-  
-  it 'should give different indices when creating multiple int variables' do
-    @space.new_int_vars([0, 17], 17).uniq.size.should equal(17)
-  end
-  
-  it 'should give different indices when creating multiple bool variables' do
-    @space.new_bool_vars(17).uniq.size.should equal(17)
-  end
-  
-  it 'should not return nil for created int variables' do
-    @space.new_int_vars([0, 17], 4).each do |i|
-      @space.int_var(i).should_not be_nil
-    end
-  end
-  
-  it 'should not return nil for created int variables' do
-    @space.new_bool_vars(4).each do |i|
-      @space.bool_var(i).should_not be_nil
-    end
-  end
-  
-  it 'should return nil when requesting int variables with negative indices' do
-    @space.int_var(-1).should be_nil
-  end
-  
-  it 'should return nil when requesting bool variables with negative indices' do
-    @space.bool_var(-1).should be_nil
-  end
-  
-  it 'should raise an error if given a domain of incorrect type' do
-    lambda{ @space.new_int_vars(17) }.should raise_error(TypeError)
-  end
-end
-
-describe Gecode::Raw::Space, ' (new)' do
-  before do
-    @space = Gecode::Raw::Space.new
-  end
-  
-  it 'should return nil when requesting int variables' do
-    @space.int_var(0).should be_nil
-  end
-  
-  it 'should return nil when requesting bool variables' do
-    @space.bool_var(0).should be_nil
-  end
-  
-  it_should_behave_like 'Space'
-end
-
-describe Gecode::Raw::Space, ' (with items)' do
-  before do
-    @space = Gecode::Raw::Space.new
-    @first = @space.new_int_vars([1, 4]).first
-    @second = @space.new_int_vars([-5, 5]).first
-  end
-  
-  it_should_behave_like 'Space'
-  
-  it 'should give int variables with the correct domains' do
-    @space.int_var(@first).min.should equal(1)
-    @space.int_var(@first).max.should equal(4)
-    @space.int_var(@second).min.should equal(-5)
-    @space.int_var(@second).max.should equal(5)
-  end
-end