genmodel 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87097bd92b5a31dc1de71f69f33735ce94acc08e
-  data.tar.gz: 381a92e4bc1c49caf2232ebe9a478f8fb77867b3
+  metadata.gz: 80b1bb7189a1c9e2306ec09c5147261d392e846a
+  data.tar.gz: 429c9a6c5cf1c9b25ff02def102414c44f196a62
 SHA512:
-  metadata.gz: 17abb9bb1b2efe62898cddac14b96073c40d7340ca6798a32725761809647aa2b94156de56fa084564c3f09bcf06ce9eb7e94047fee4e3e569de669e2f05dc24
-  data.tar.gz: 1a0f0971ffb32edb5c85457572b577bcbf1a0507fda335749ff0443098d41948f70797db901c3742056807d4d729b05bb8ebe4f86163533b9b7a26fd7b6cdc69
+  metadata.gz: 37cea0d64109fd0831e07b0cae8ee67aafb8201a9a119e51bc902a4945b7707e68ffa33bb619667f9002e09fbd2eab886d684a0285017bb947e8d2f221f464c1
+  data.tar.gz: bd42525f466d8b05deb0ba2f61d92cd3d4aac25d55618382fd7e1d4f42a0af75f19ffd683dd308b4b131099876b7c548d249c2f9b0ffc0aeb664f2d6cf0b62d7

data/ext/Genmodel/GraphTools.cpp

@@ -16,8 +16,8 @@
 
 vector<vector<size_t> > GmGraph::GetCliqueCover()
 {
-    size_t n = countNodes(g);
-    size_t e = countEdges(g);
+    size_t n = g.n();//countNodes(g);
+    size_t e = g.e();//countEdges(g);
     vector<vector<size_t> > out;
 
     vector<bool> done(e,false);
@@ -38,8 +38,8 @@ vector<vector<size_t> > GmGraph::GetCliqueCover()
         vector<size_t> node_depth(n,0);
         
         vector<size_t> clique;
-        size_t curr_n = g.id(g.u(g.e_id(curr_e)));
-        size_t next_n = g.id(g.v(g.e_id(curr_e)));
+        size_t curr_n = u(curr_e);
+        size_t next_n = v(curr_e);
         
         //ve.push_back(e);
         
@@ -64,14 +64,13 @@ vector<vector<size_t> > GmGraph::GetCliqueCover()
             size_t next_nn = -1;
             for(size_t i = 0; i < de.size(); i++)
             {
-                size_t nn = (g.id(g.u(g.e_id(de[i]))) == curr_n ?  g.id(g.v(g.e_id(de[i]))) : g.id(g.u(g.e_id(de[i]))));
-                size_t onn = (g.id(g.u(g.e_id(de[i]))) == curr_n ?  g.id(g.u(g.e_id(de[i]))) : g.id(g.v(g.e_id(de[i]))));
+                size_t nn = u(de[i]) == curr_n ?  v(de[i]) : u(de[i]);
                 ++(node_depth[nn]);
                 if(node_in[nn] && !done[de[i]])
                 {
                     done[de[i]] = true;
                     added++;
-                    //printf("\t2-From %ld : Add edge %ld (depth %ld) [added = %ld] d=%ld --> %ld (other = %ld)\n", curr_n, de[i], depth, added, de.size(), nn, onn);
+                    //printf("\t2-From %ld : Add edge %ld (depth %ld) [added = %ld] d=%ld --> %ld\n", curr_n, de[i], depth, added, de.size(), nn);
                 }
                 if(node_depth[nn] == depth && next_n == -1 && !done[de[i]] && !node_in[nn])
                 {
@@ -103,96 +102,111 @@ vector<vector<size_t> > GmGraph::GetCliqueCover()
 
 vector<size_t> GmGraph::ie(size_t i)
 {
-    vector<size_t> out(di(i));
+    /*vector<size_t> out(di(i));
     size_t ii = 0;
     for (ListGraph::IncEdgeIt _e(g, g.n_id(i)); _e != INVALID; ++_e, ++ii)
         out[ii] = (g.id(_e)-g.id(_e)%2)/2;
-    return out;
+    return out;*/
+    return g.ie(i);
 }
 
 BitVector GmGraph::ie2bv(size_t i)
 {
-    BitVector out(countEdges(g)*2);
+    /*BitVector out(countEdges(g));
     for (ListGraph::IncEdgeIt _e(g, g.n_id(i)); _e != INVALID; ++_e)
         out.set((g.id(_e)-g.id(_e)%2)/2, true);
-    return out;
+    return out;*/
+    return g.ie2bv(i);
 }
 
 vector<size_t> GmGraph::in(size_t i)
 {
-    vector<size_t> out(di(i));
+    /*vector<size_t> out(di(i));
     size_t ii = 0;
     for (ListGraph::IncEdgeIt _e(g, g.n_id(i)); _e != INVALID; ++_e, ++ii)
         out[ii] = (g.id(g.u(_e)) == i ?  g.id(g.v(_e)) : g.id(g.u(_e)));
-    return out;
+    return out;*/
+    return g.in(i);
 }
 
 BitVector GmGraph::in2bv(size_t i)
 {
-    BitVector out(countNodes(g));
+    /*BitVector out(countNodes(g));
     for (ListGraph::IncEdgeIt _e(g, g.n_id(i)); _e != INVALID; ++_e)
         (g.id(g.u(_e)) == i ?  out.set(g.id(g.v(_e)),true) : out.set(g.id(g.u(_e)),true));
-    return out;
+    return out;*/
+    return g.in2bv(i);
 }
 
-
 size_t GmGraph::n()
 {
-    return countNodes(g);
+    //return countNodes(g);
+    return g.n();
 }
 
 size_t GmGraph::e()
 {
-    return countEdges(g);
+    //return countEdges(g);
+    return g.e();
 }
 
 size_t GmGraph::di(size_t i)
 {
-    return countIncEdges(g, g.n_id(i));
+    //return countIncEdges(g, g.n_id(i));
+    return g.di(i);
 }
 
 size_t GmGraph::AddNode()
 {
-    return g.id(g.addNode());
+    //return g.id(g.addNode());
+    return g.addNode();
 }
 
 size_t GmGraph::AddEdge(size_t i, size_t j)
 {
-    return g.id(g.addEdge(g.n_id(i), g.n_id(j)));
+    //return g.id(g.addEdge(g.n_id(i), g.n_id(j)));
+    return g.addEdge(i,j);
 }
 
 size_t GmGraph::u(size_t i)
 {
-    return g.id(g.u(g.e_id(i)));
+    //return g.id(g.u(g.e_id(i)));
+    return g.u(i);
 }
 size_t GmGraph::v(size_t i)
 {
-    return g.id(g.v(g.e_id(i)));
+    //return g.id(g.v(g.e_id(i)));
+    return g.v(i);
 }
 
 void GmGraph::EraseNode(size_t i)
 {
-    g.erase(g.n_id(i));
+    //g.erase(g.n_id(i));
+    g.eraseNode(i);
 }
 
 void GmGraph::EraseEdge(size_t i)
 {
-    g.erase(g.e_id(i));
+    //g.erase(g.e_id(i));
+    g.eraseNode(i);
 }
 
 void GmGraph::ChangeU(size_t i, size_t j)
 {
-    g.changeU(g.e_id(i),g.n_id(j));
+    //g.changeU(g.e_id(i),g.n_id(j));
+    g.changeU(i,j);
 }
 
 void GmGraph::ChangeV(size_t i, size_t j)
 {
-    g.changeV(g.e_id(i),g.n_id(j));
+    //g.changeV(g.e_id(i),g.n_id(j));
+    g.changeV(i,j);
 }
 
 void GmGraph::Contract(size_t i, size_t j, bool r)
 {
-    g.contract(g.n_id(i), g.n_id(j), r);
+    //g.contract(g.n_id(i), g.n_id(j), r);
+    g.contract(i, j, r);
 }
 
 void GmGraph::Clear()
@@ -207,5 +221,6 @@ void GmGraph::ReserveNode(size_t n)
 
 void GmGraph::ReserveEdge(size_t m)
 {
-    g.reserveEdge(2 * m);
+    //g.reserveEdge(2 * m);
+    g.reserveEdge(m);
 }

data/ext/Genmodel/GraphTools.h

@@ -9,11 +9,12 @@
 #ifndef _GraphTools_h
 #define _GraphTools_h
 
-#include <lemon/concepts/graph.h>
-#include <lemon/list_graph.h>
+//#include <lemon/concepts/graph.h>
+//#include <lemon/list_graph.h>
+#include "mygraph.h"
 #include "BitVector.h"
 
-using namespace lemon;
+//using namespace lemon;
 using namespace std;
 
 class GmGraph
@@ -43,7 +44,8 @@ public:
     
     vector<vector<size_t> > GetCliqueCover();
     
-    ListGraph g;
+    //ListGraph g;
+    myGraph g;
 };
 
 #endif

data/ext/Genmodel/extconf.rb

@@ -91,28 +91,28 @@ if is_darwin
         is_osi = false
     end
     
-    search_path = "/usr/local/Cellar/lemon-graph/"
-    search_file = "/include/lemon/core.h"
-    puts "Looking for lemon/core.h in "+search_path+"/*"
-    file_exist = nil
-    Find.find(search_path) do |path|
-        if (FileTest.directory?(path))
-            puts path+search_file
-            temp_name = (path).gsub(/\/usr\/local\/Cellar\/lemon-graph\//,'')
-            count = temp_name.count('/')
-            if ((count == 0) && (File.exist?(path+search_file)))
-                file_exist = "-I#{path}/include"
-                break
-            end
-        end
-    end
-    if(is_osi && file_exist != nil)
-        $INCFLAGS << " " << file_exist.quote
-        puts "found"
-    else
-        puts "not found"
-        is_osi = false
-    end
+    #search_path = "/usr/local/Cellar/lemon-graph/"
+    #search_file = "/include/lemon/core.h"
+    #puts "Looking for lemon/core.h in "+search_path+"/*"
+    #file_exist = nil
+    #Find.find(search_path) do |path|
+    #    if (FileTest.directory?(path))
+    #        puts path+search_file
+    #        temp_name = (path).gsub(/\/usr\/local\/Cellar\/lemon-graph\//,'')
+    #        count = temp_name.count('/')
+    #        if ((count == 0) && (File.exist?(path+search_file)))
+    #            file_exist = "-I#{path}/include"
+    #            break
+    #        end
+    #    end
+    #end
+    #if(is_osi && file_exist != nil)
+    #    $INCFLAGS << " " << file_exist.quote
+    #    puts "found"
+    #else
+    #    puts "not found"
+    #    is_osi = false
+    #end
     
     
     path = "/usr/lib:/usr/local/lib/"
@@ -169,14 +169,14 @@ if is_darwin
         #is_osi = false
     end
     
-    path = "/usr/lib:/usr/local/lib/"
-    puts "Looking for libemon.dylib (function main) in "+path
-    if(is_osi && find_library("emon",nil,path))
-        puts "found"
-        else
-        puts "not found"
-        is_osi = false
-    end
+    #path = "/usr/lib:/usr/local/lib/"
+    #puts "Looking for libemon.dylib (function main) in "+path
+    #if(is_osi && find_library("emon",nil,path))
+    #    puts "found"
+    #    else
+    #    puts "not found"
+    #    is_osi = false
+    #end
     
 elsif is_linux
     # path = Dir.home+"/ibm/ILOG/CPLEX_Studio126/cplex/include:/opt/ibm/ILOG/CPLEX_Studio126/cplex/include"

data/ext/Genmodel/mygraph.cpp

@@ -0,0 +1,134 @@
+//
+//  myGraph.cpp
+//  
+//
+//  Created by Mathieu Bouchard on 2014-03-21.
+//
+//
+
+#include "mygraph.h"
+
+vector<size_t> myGraph::ie(size_t i)
+{
+    vector<size_t> out(incs[i].size());
+    map<size_t, size_t>::iterator it;
+    size_t ii;
+    for (it = incs[i].begin(); it != incs[i].end(); ++it)
+        out[ii] = it->second;
+    return out;
+}
+
+BitVector myGraph::ie2bv(size_t i)
+{
+    BitVector out(_e);
+    map<size_t, size_t>::iterator it;
+    size_t ii;
+    for (it = incs[i].begin(); it != incs[i].end(); ++it)
+        out.set(it->second, true);
+    return out;
+}
+
+vector<size_t> myGraph::in(size_t i)
+{
+    vector<size_t> out(incs[i].size());
+    map<size_t, size_t>::iterator it;
+    size_t ii;
+    for (it = incs[i].begin(); it != incs[i].end(); ++it)
+        out[ii] = it->first;
+    return out;
+}
+
+BitVector myGraph::in2bv(size_t i)
+{
+    BitVector out(_n);
+    map<size_t, size_t>::iterator it;
+    for (it = incs[i].begin(); it != incs[i].end(); ++it)
+        out.set(it->first, true);
+    return out;
+}
+
+
+size_t myGraph::n()
+{
+    return _n;
+}
+
+size_t myGraph::e()
+{
+    return _e;
+}
+
+size_t myGraph::di(size_t i)
+{
+    return incs[i].size();
+}
+
+size_t myGraph::addNode()
+{
+    incs.push_back(map<size_t,size_t>());
+    return _n++;
+}
+
+size_t myGraph::addEdge(size_t i, size_t j)
+{
+    if(incs[i].count(j) > 0)
+        return incs[i][j];
+    else
+    {
+        edges.push_back(pair<size_t, size_t>(i,j));
+        return _e++;
+    }
+}
+
+size_t myGraph::u(size_t i)
+{
+    return edges[i].first;
+}
+
+size_t myGraph::v(size_t i)
+{
+    return edges[i].second;
+}
+
+void myGraph::eraseNode(size_t i)
+{
+    throw string("myGraph : Not implemented.");
+}
+
+void myGraph::eraseEdge(size_t i)
+{
+    throw string("myGraph : Not implemented.");
+}
+
+void myGraph::changeU(size_t i, size_t j)
+{
+    throw string("myGraph : Not implemented.");
+}
+
+void myGraph::changeV(size_t i, size_t j)
+{
+    throw string("myGraph : Not implemented.");
+}
+
+void myGraph::contract(size_t i, size_t j, bool r)
+{
+    throw string("myGraph : Not implemented.");
+}
+
+void myGraph::clear()
+{
+    _n=0;
+    _e=0;
+    edges.clear();
+    incs.clear();
+}
+
+void myGraph::reserveNode(size_t n)
+{
+    
+}
+
+void myGraph::reserveEdge(size_t m)
+{
+    edges.reserve(m);
+}

data/ext/Genmodel/mygraph.h

@@ -0,0 +1,52 @@
+//
+//  myGraph.h
+//  
+//
+//  Created by Mathieu Bouchard on 2014-03-21.
+//
+//
+
+#ifndef _myGraph_h
+#define _myGraph_h
+
+#include <vector>
+#include <map>
+#include "BitVector.h"
+
+using namespace std;
+
+class myGraph
+{
+public:
+    myGraph() : _n(0), _e(0) {}
+    ~myGraph() {}
+    size_t addNode();
+    size_t addEdge(size_t i, size_t j);
+    void eraseNode(size_t i);
+    void eraseEdge(size_t i);
+    void changeU(size_t i, size_t j);
+    void changeV(size_t i, size_t j);
+    size_t u(size_t i);
+    size_t v(size_t i);
+    size_t di(size_t i);
+    size_t n();
+    size_t e();
+    
+    void contract(size_t i, size_t j, bool r = true);
+    void clear();
+    void reserveNode(size_t n);
+    void reserveEdge(size_t m);
+    
+    vector<size_t> ie(size_t i);
+    BitVector ie2bv(size_t i);
+    vector<size_t> in(size_t i);
+    BitVector in2bv(size_t i);
+    
+    vector<pair<size_t,size_t> > edges;
+    vector<map<size_t, size_t> > incs;
+    
+    size_t _n;
+    size_t _e;
+};
+
+#endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Mathieu Bouchard
@@ -33,6 +33,8 @@ files:
 - ext/Genmodel/ProblemReaderOsi.cpp
 - ext/Genmodel/ProblemReaderOsi.h
 - ext/Genmodel/extconf.rb
+- ext/Genmodel/mygraph.cpp
+- ext/Genmodel/mygraph.h
 - lib/Genmodel.rb
 homepage: https://github.com/mathbouchard/GenModelGem
 licenses: