genmodel 0.0.22 → 0.0.23

data/ext/Genmodel/extconf.rb

@@ -2,7 +2,7 @@ require 'mkmf'
 require 'rbconfig'
 require 'find'
 
-extension_name = 'GenModel/GenModel'
+extension_name = 'Genmodel/Genmodel'
 dir_config(extension_name)
 
 #abort "missing malloc()" unless have_func "malloc"
@@ -129,7 +129,7 @@ if is_darwin
     
     path = "/usr/lib:/usr/local/lib/"
     puts "Looking for OsiClp (function main) in "+path
-    if(is_osi && find_library("Osi",nil,path))
+    if(is_osi && find_library("OsiClp",nil,path))
         puts "found"
     else
         puts "not found"
@@ -213,7 +213,7 @@ elsif is_linux
     
     path = "/usr/lib:/usr/local/lib/"
     puts "Looking for OsiClp (function main) in "+path
-    if(is_osi && find_library("Osi",nil,path))
+    if(is_osi && find_library("OsiClp",nil,path))
         puts "found"
     else
         puts "not found"

data/lib/Genmodel.rb

@@ -1,5 +1,5 @@
 module Genmodel
-    VERSION = "0.0.21"
+    VERSION = "0.0.23"
 end
 
 require "Genmodel/Genmodel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Mathieu Bouchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies: []
 description: A generic tool to solve optimization model with different solvers
 email: mathbouchard@gmail.com
@@ -26,8 +26,6 @@ files:
 - ext/Genmodel/GenModelOsiInterface.cpp
 - ext/Genmodel/GenModelOsiInterface.h
 - ext/Genmodel/Genmodel.cpp
-- ext/Genmodel/InterfaceObject.cpp
-- ext/Genmodel/InterfaceObject.h
 - ext/Genmodel/ProblemReaderOsi.cpp
 - ext/Genmodel/ProblemReaderOsi.h
 - ext/Genmodel/extconf.rb

data/ext/Genmodel/InterfaceObject.cpp

@@ -1,70 +0,0 @@
-//
-//  InterfaceObject.cpp
-//  
-//
-//  Created by Mathieu Bouchard on 2014-03-19.
-//
-//
-
-#include <stdio.h>
-//#include <stdlib.h>
-#include "InterfaceObject.h"
-
-template<class T> InterfaceVector<T>::InterfaceVector()
-{
-    val = NULL;
-    size = 0;
-    //printf("\tC++: Adress at creation is %p size = %d\n", val, size);
-}
-
-template<class T> InterfaceVector<T>::InterfaceVector(int _size)
-{
-    size = _size;
-    val = new T[size];
-    //printf("\tC++: Adress at creation is %p size = %d\n", val, size);
-    //memset(val, 0, sizeof(T));
-}
-
-template<class T> InterfaceVector<T>::~InterfaceVector()
-{
-    Delete();
-}
-
-template<class T> void InterfaceVector<T>::SetSize(int _size)
-{
-    Delete();
-    size = _size;
-    val = new T[size];
-}
-template<class T> void InterfaceVector<T>::Delete()
-{
-    size = 0;
-    if(val != NULL)
-        delete[] val;
-}
-
-template<class T> void InterfaceVector<T>::Set(int index, T inval)
-{
-    if(index < 0 || index >= size)
-        printf("Index out of bound (%d not in 0..%d)\n", index, size);
-    else
-        val[index] = inval;
-}
-
-template<class T> T InterfaceVector<T>::Get(int index)
-{
-    if(index < 0 || index >= size)
-        printf("Index out of bound (%d not in 0..%d)\n", index, size);
-    else
-        return val[index];
-    return 0.0;
-}
-
-template<class T> T* InterfaceVector<T>::Ptr()
-{
-    return val;
-}
-
-template class InterfaceVector<int>;
-template class InterfaceVector<long>;
-template class InterfaceVector<double>;

data/ext/Genmodel/InterfaceObject.h

@@ -1,28 +0,0 @@
-//
-//  InterfaceObject.h
-//  
-//
-//  Created by Mathieu Bouchard on 2014-03-19.
-//
-//
-
-#ifndef _InterfaceObject_h
-#define _InterfaceObject_h
-
-template<class T> class InterfaceVector {
-public:
-    InterfaceVector();
-    InterfaceVector(int size);
-    ~InterfaceVector();
-    void SetSize(int size);
-    void Delete();
-    void Set(int index, T val);
-    T Get(int index);
-    T* Ptr();
-    
-private:
-    int size;
-    T * val;
-};
-
-#endif