genmodel 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 841759fecd601b6fe9986e0066c9719a556a4d56
-  data.tar.gz: 1813d26c133f042f4f46936f1e99947dc57e6f2d
+  metadata.gz: a9ecfce60cb4852dff351de92129d555959004a4
+  data.tar.gz: fd88d9cb1469685672c7fc1e59d822ab4dd04f36
 SHA512:
-  metadata.gz: 7bdf45893f13bccd8b9243c1039f09f67f023f88e0c16b757f570e5032710e5b611dd031dd13590768f4f3ba133f75bcb06f34a6f4e0d16e1edd2d32ddb11966
-  data.tar.gz: a4aad7481b5da167147239fa0c907586336e656856e3188e22ec075f3d5c403a9fb4048a90df2250a40614dec38607deba62013b4dc1ac960e1393a2643890aa
+  metadata.gz: 6b16522b8794f7b1deed5a82c8ef5af7c8aed4c14c1ce585c45c7caef012105eb969ed9b052ada89023d9ec293df2771330eaeec7b84d44889bce7471103f5ca
+  data.tar.gz: 7168d402a3ab1cb92748291a487bde12d1bd3bca8d546f524c9cf4f608b807716c75decc405a498ec068e6337da6adaf42b0b6d446143eadd12b98c1d8ed8c64

data/ext/Genmodel/HyperGraph.cpp

@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include "HyperGraph.h"
 
-void checkbound(uint i, uint ub);
+void checkbound(size_t i, size_t ub);
 
-int HyperGraph::SetQty(uint n, uint e)
+int HyperGraph::SetQty(size_t n, size_t e)
 {
 	hnodes.resize(n);
 	hnodes.assign(n, HyperGen(0.0));
@@ -29,16 +29,16 @@ int HyperGraph::SetTopologicalOrder()
 {
     vector<bool> nvis;
 	nvis.resize(hn, false);
-	vector<uint> nnext;
+	vector<size_t> nnext;
     
-	list<uint> tocheck;
-	for(uint i = 0; i < hn; i++)
+	list<size_t> tocheck;
+	for(size_t i = 0; i < hn; i++)
 		tocheck.push_back(i);
     
-	uint nodecount = 0;
+	size_t nodecount = 0;
     
-	layers.push_back(vector<uint>());
-	list<uint>::iterator it;
+	layers.push_back(vector<size_t>());
+	list<size_t>::iterator it;
 	for(it = tocheck.begin(); it != tocheck.end();)
 	{
 		if(hnodes[*it].dout == 0)
@@ -52,26 +52,26 @@ int HyperGraph::SetTopologicalOrder()
 			it++;
 	}
     
-	uint iter = 0;
+	size_t iter = 0;
 	is_cyclic = false;
     
 	while(!tocheck.empty() && iter < hn)
 	{
-		layers.push_back(vector<uint>());
+		layers.push_back(vector<size_t>());
         
 		vector<bool> tempvis;
 		tempvis.resize(hn, true);
         
 		for(it = tocheck.begin(); it != tocheck.end();)
 		{
-			uint in = *it;
+			size_t in = *it;
             
-			for(uint j = 0; j < hnodes[in].dout; j++)
+			for(size_t j = 0; j < hnodes[in].dout; j++)
 			{
-				uint ie = hnodes[in].all[hnodes[in].out[j]];
-				for(uint k = 0; k < hedges[ie].dout; k++)
+				size_t ie = hnodes[in].all[hnodes[in].out[j]];
+				for(size_t k = 0; k < hedges[ie].dout; k++)
 				{
-					uint inn = hedges[ie].all[hedges[ie].out[k]];
+					size_t inn = hedges[ie].all[hedges[ie].out[k]];
 					if(!nvis[inn])
 						tempvis[in] = false;
 				}
@@ -92,7 +92,7 @@ int HyperGraph::SetTopologicalOrder()
 			break;
 		}
         
-		for(uint i = 0; i < (uint)(nnext.size()); i++)
+		for(size_t i = 0; i < (size_t)(nnext.size()); i++)
 			nvis[nnext[i]] = true;
 		nnext.clear();
         
@@ -103,15 +103,15 @@ int HyperGraph::SetTopologicalOrder()
     
     order.clear();
     order.resize(hn, 0);
-    uint index = 0;
-    for(uint i = 0; i < layers.size(); ++i)
-		for(uint j = 0; j < layers[i].size(); ++j, ++index)
+    size_t index = 0;
+    for(size_t i = 0; i < layers.size(); ++i)
+		for(size_t j = 0; j < layers[i].size(); ++j, ++index)
             order[index] = layers[i][j];
     
     return 0;
 }
 
-int HyperGraph::PairNodeAndEdge(uint ni, uint ei, double t, bool force)
+int HyperGraph::PairNodeAndEdge(size_t ni, size_t ei, double t, bool force)
 {
 	if(!force && t == 0.0)
 		return 0;
@@ -143,7 +143,7 @@ int HyperGraph::PairNodeAndEdge(uint ni, uint ei, double t, bool force)
 	return 0;
 }
 
-int AddGens(uint nq, vector<HyperGen>* vhg, uint* cq)
+int AddGens(size_t nq, vector<HyperGen>* vhg, size_t* cq)
 {
 	if(nq == 1)
 		vhg->push_back(HyperGen(0.0));
@@ -153,46 +153,46 @@ int AddGens(uint nq, vector<HyperGen>* vhg, uint* cq)
 	return 0;
 }
 
-int SetGenVal(uint i, double nval, vector<HyperGen>* vhg, uint s)
+int SetGenVal(size_t i, double nval, vector<HyperGen>* vhg, size_t s)
 {
 	checkbound(i, s);
 	(*vhg)[i].val = nval;
 	return 0;
 }
 
-int SetGenUb(uint i, double nub, vector<HyperGen>* vhg, uint s)
+int SetGenUb(size_t i, double nub, vector<HyperGen>* vhg, size_t s)
 {
 	checkbound(i, s);
 	(*vhg)[i].ub = nub;
 	return 0;
 }
 
-int SetGenLb(uint i, double nlb, vector<HyperGen>* vhg, uint s)
+int SetGenLb(size_t i, double nlb, vector<HyperGen>* vhg, size_t s)
 {
 	checkbound(i, s);
 	(*vhg)[i].lb = nlb;
 	return 0;
 }
 
-int SetGenName(uint i, string name, vector<HyperGen>* vhg, uint s)
+int SetGenName(size_t i, string name, vector<HyperGen>* vhg, size_t s)
 {
 	checkbound(i, s);
 	(*vhg)[i].name = name;
 	return 0;
 }
 
-int RemoveGen(uint n1, vector<HyperGen>* hv1, vector<HyperGen>* hv2, uint* hq)
+int RemoveGen(size_t n1, vector<HyperGen>* hv1, vector<HyperGen>* hv2, size_t* hq)
 {
-	for(uint i = 0; i < (*hv1)[n1].dall; i++)
+	for(size_t i = 0; i < (*hv1)[n1].dall; i++)
 	{
-		uint n2 = (*hv1)[n1].all[i];
-		vector<uint>::iterator ita = (*hv2)[n2].all.begin();
+		size_t n2 = (*hv1)[n1].all[i];
+		vector<size_t>::iterator ita = (*hv2)[n2].all.begin();
 		vector<double>::iterator itt = (*hv2)[n2].tau.begin();
-		vector<uint>::iterator iti = (*hv2)[n2].in.begin();
-		vector<uint>::iterator ito = (*hv2)[n2].out.begin();
+		vector<size_t>::iterator iti = (*hv2)[n2].in.begin();
+		vector<size_t>::iterator ito = (*hv2)[n2].out.begin();
 
-		uint remindex = 0;
-		uint indexcnt = 0;
+		size_t remindex = 0;
+		size_t indexcnt = 0;
 		while(ita != (*hv2)[n2].all.end())
 		{
 			if(n1 == *ita)
@@ -235,7 +235,7 @@ int RemoveGen(uint n1, vector<HyperGen>* hv1, vector<HyperGen>* hv2, uint* hq)
 	}
 
 	vector<HyperGen>::iterator it = hv1->begin();
-	for(uint i = 0; i < n1; i++)
+	for(size_t i = 0; i < n1; i++)
 		it++;
 
 	hv1->erase(it);
@@ -244,80 +244,80 @@ int RemoveGen(uint n1, vector<HyperGen>* hv1, vector<HyperGen>* hv2, uint* hq)
 	return 0;
 }
 
-int HyperGraph::AddNodes(uint n)
+int HyperGraph::AddNodes(size_t n)
 {
 	return AddGens(n, &hnodes, &hn);
 }
 
-int HyperGraph::SetNodeVal(uint i, double nval)
+int HyperGraph::SetNodeVal(size_t i, double nval)
 {
 	return SetGenVal(i, nval, &hnodes, hn);
 }
 
-int HyperGraph::SetNodeUb(uint i, double nub)
+int HyperGraph::SetNodeUb(size_t i, double nub)
 {
 	return SetGenUb(i, nub, &hnodes, hn);
 }
 
-int HyperGraph::SetNodeLb(uint i, double nlb)
+int HyperGraph::SetNodeLb(size_t i, double nlb)
 {
 	return SetGenLb(i, nlb, &hnodes, hn);
 }
 
 
-int HyperGraph::SetNodeName(uint i, string name)
+int HyperGraph::SetNodeName(size_t i, string name)
 {
 	return SetGenName(i, name, &hnodes, hn);
 }
 
-int HyperGraph::AddEdges(uint e)
+int HyperGraph::AddEdges(size_t e)
 {
 	return AddGens(e, &hedges, &he);
 }
 
-int HyperGraph::SetEdgeVal(uint i, double nval)
+int HyperGraph::SetEdgeVal(size_t i, double nval)
 {
 	return SetGenVal(i, nval, &hedges, he);
 }
 
-int HyperGraph::SetEdgeUb(uint i, double nub)
+int HyperGraph::SetEdgeUb(size_t i, double nub)
 {
 	return SetGenUb(i, nub, &hedges, he);
 }
 
-int HyperGraph::SetEdgeLb(uint i, double nlb)
+int HyperGraph::SetEdgeLb(size_t i, double nlb)
 {
 	return SetGenLb(i, nlb, &hedges, he);
 }
 
-int HyperGraph::SetEdgeName(uint i, string name)
+int HyperGraph::SetEdgeName(size_t i, string name)
 {
 	return SetGenName(i, name, &hedges, he);
 }
 
-int HyperGraph::RemoveEdge(uint e)
+int HyperGraph::RemoveEdge(size_t e)
 {
 	return RemoveGen(e, &hedges, &hnodes, &he);
 }
-int HyperGraph::RemoveNode(uint n)
+int HyperGraph::RemoveNode(size_t n)
 {
 	return RemoveGen(n, &hnodes, &hedges, &hn);
 }
 
 int HyperGraph::Clean(vector<bool>& exin, vector<bool>& exout)
 {
-	vector<uint> nstatus;
-	vector<uint> ndin;
-	vector<uint> ndout;
+	vector<size_t> nstatus;
+	vector<size_t> ndin;
+	vector<size_t> ndout;
 	for(long i = 0; i < hn; i++)
 	{
 		ndin.push_back(hnodes[i].din);
 		ndout.push_back(hnodes[i].dout);
 	}
 	nstatus.resize(hn, 0);
-	vector<uint> estatus;
-	vector<uint> edin;
-	vector<uint> edout;
+	vector<size_t> estatus;
+	vector<size_t> edin;
+	vector<size_t> edout;
 	for(long i = 0; i < he; i++)
 	{
 		edin.push_back(hedges[i].din);
@@ -325,15 +325,15 @@ int HyperGraph::Clean(vector<bool>& exin, vector<bool>& exout)
 	}
 	estatus.resize(he, 0);
 
-	vector<uint> nfinal;
+	vector<size_t> nfinal;
 	for(long i = 0; i < hn; i++)
 		nfinal[i] = i;
 
 
-	uint erem = 1;
-	uint nrem = 1;
-	uint terem = 1;
-	uint tnrem = 1;
+	size_t erem = 1;
+	size_t nrem = 1;
+	size_t terem = 1;
+	size_t tnrem = 1;
 
 //	list<double> rn;
 //	for(long i = 0; i < hn; i++)
@@ -347,14 +347,14 @@ int HyperGraph::Clean(vector<bool>& exin, vector<bool>& exout)
 		erem = 0;
 		nrem = 0;
 		// Analysing nodes
-		for(uint i = 0; i < hn; i++)
+		for(size_t i = 0; i < hn; i++)
 		{
 			if(nstatus[i] > 0)
 				continue;
 			if(ndin[i] == 0 && !exout[i])
 			{
 				nstatus[i] = 1;
-				for(uint j = 0; j < hnodes[i].dout; j++)
+				for(size_t j = 0; j < hnodes[i].dout; j++)
 					edin[hnodes[i].all[hnodes[i].out[j]]]--;
 				nrem++;
 				tnrem++;
@@ -362,7 +362,7 @@ int HyperGraph::Clean(vector<bool>& exin, vector<bool>& exout)
 			else if(ndout[i] == 0 && !exin[i])
 			{
 				nstatus[i] = 2;
-				for(uint j = 0; j < hnodes[i].din; j++)
+				for(size_t j = 0; j < hnodes[i].din; j++)
 					edin[hnodes[i].all[hnodes[i].in[j]]]--;
 				nrem++;
 				tnrem++;
@@ -370,16 +370,16 @@ int HyperGraph::Clean(vector<bool>& exin, vector<bool>& exout)
 		}
 
 		// Analysing edges
-		for(uint i = 0; i < he; i++)
+		for(size_t i = 0; i < he; i++)
 		{
 			if(estatus[i] > 0)
 				continue;
 			if(edin[i] == 0 || edout[i] == 0)
 			{
 				estatus[i] = 1;
-				for(uint j = 0; j < hedges[i].dout; j++)
+				for(size_t j = 0; j < hedges[i].dout; j++)
 					ndin[hedges[i].all[hedges[i].out[j]]]--;
-				for(uint j = 0; j < hedges[i].din; j++)
+				for(size_t j = 0; j < hedges[i].din; j++)
 					ndout[hedges[i].all[hedges[i].in[j]]]--;
 
 				erem++;
@@ -393,7 +393,7 @@ int HyperGraph::Clean(vector<bool>& exin, vector<bool>& exout)
 	return 0;
 }
 
-void checkbound(uint i, uint ub)
+void checkbound(size_t i, size_t ub)
 {
 	if(i > ub)
 		throw string("HyperGraph : index out of bound");

data/ext/Genmodel/HyperGraph.h

@@ -13,7 +13,6 @@
 #include <string>
 #include <list>
 #include <stdlib.h>
-#define uint unsigned long
 
 using namespace std;
 
@@ -25,32 +24,32 @@ class HyperGraph
 public:
 	HyperGraph() {hn=0; he = 0;}
 	~HyperGraph() {}
-	uint hn;
-	uint he;
+	size_t hn;
+	size_t he;
 
-	int SetQty(uint n, uint e);
-	int AddNodes(uint n);
-	int SetNodeUb(uint i, double nub);
-	int SetNodeLb(uint i, double nlb);
-	int SetNodeVal(uint i, double nval);
-	int SetNodeName(uint i, string name);
-	int SetEdgeUb(uint i, double nub);
-	int SetEdgeLb(uint i, double nlb);
-	int SetEdgeVal(uint i, double nval);
-	int SetEdgeName(uint i, string name);
+	int SetQty(size_t n, size_t e);
+	int AddNodes(size_t n);
+	int SetNodeUb(size_t i, double nub);
+	int SetNodeLb(size_t i, double nlb);
+	int SetNodeVal(size_t i, double nval);
+	int SetNodeName(size_t i, string name);
+	int SetEdgeUb(size_t i, double nub);
+	int SetEdgeLb(size_t i, double nlb);
+	int SetEdgeVal(size_t i, double nval);
+	int SetEdgeName(size_t i, string name);
     int SetTopologicalOrder();
-	int AddEdges(uint e);
-	int RemoveEdge(uint e);
-	int RemoveNode(uint e);
+	int AddEdges(size_t e);
+	int RemoveEdge(size_t e);
+	int RemoveNode(size_t e);
 	//int Contract();
 	int Clean(vector<bool>& exin, vector<bool>& exout);
-	int PairNodeAndEdge(uint ni, uint ei, double t, bool force = false);
+	int PairNodeAndEdge(size_t ni, size_t ei, double t, bool force = false);
 
 	vector<HyperGen> hnodes;
 	vector<HyperGen> hedges;
     
-    vector<uint> order;
-    vector<vector<uint> > layers;
+    vector<size_t> order;
+    vector<vector<size_t> > layers;
     bool is_cyclic;
 };
 
@@ -60,18 +59,18 @@ public:
 	HyperGen() {val = 0.0; dall=0; din=0; dout = 0; ub = numeric_limits<double>::infinity();}
 	HyperGen(double nval) {val = nval; dall=0; din=0; dout = 0; ub = numeric_limits<double>::infinity();}
 	~HyperGen() {}
-	uint dall;
-	uint din;
-	uint dout;
+	size_t dall;
+	size_t din;
+	size_t dout;
 	// max val x; Ax=b; lb <= x <= ub; min b y + ub c+ + lb c- A'y + c+ - c- = cost
 	double val; // cost for hedges, demand for hnodes
 	double ub;  // ub for hedges, positive complement cost for hnodes
 	double lb;  // lb for hedges, negative complement cost for hnodes
 	string name;
 //	GenFunction* f;
-	vector<uint> all;
-	vector<uint> in;
-	vector<uint> out;
+	vector<size_t> all;
+	vector<size_t> in;
+	vector<size_t> out;
 	vector<double> tau;
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Mathieu Bouchard