From 3d0de6e276eb4e1fc54b03bf97f1b544ea42e2e3 Mon Sep 17 00:00:00 2001 From: "Ryan A. Rossi" Date: Wed, 22 May 2013 00:57:15 -0700 Subject: [PATCH] .. --- dynamic_pagerank.m | 11 ++++++++++- forecasting/twitter_preds.m | 18 +++++++++--------- preds_readme.m | 4 ++++ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dynamic_pagerank.m b/dynamic_pagerank.m index b1c21d1..09b9dea 100644 --- a/dynamic_pagerank.m +++ b/dynamic_pagerank.m @@ -94,6 +94,8 @@ options.x0 = v(:,1); end +nnz(A) + % fix dangling vertices %out_deg = A*ones(size(A,1)); out_deg = sum(A,2)'; % outdegree = row sum of A @@ -103,10 +105,17 @@ fprintf('found dangling vertices, patching them\n'); d = zeros(n,1); % dangling indicator vector d(d_verts) = 1; - A = A + d*ones(1,n)/n; + + Pbar = normout(A) + P = Pbar + d*ones(1,n)/n; + + + A = sparse(A + d*ones(1,n)/n); toc end +nnz(A) + %out_degree = sum(A,2)'; %assert(length(find(out_degree == 0)) == 0) diff --git a/forecasting/twitter_preds.m b/forecasting/twitter_preds.m index f8dac79..4de0719 100644 --- a/forecasting/twitter_preds.m +++ b/forecasting/twitter_preds.m @@ -1,14 +1,14 @@ graphlist = { % timescale = 1 -'twitter','twitter-i1-th01-rk45',1,0.5,'rk45-smooth',0.01,1000,10,'default','diff'; -'twitter','twitter-i1-th5-rk45',1,0.5,'rk45-smooth',0.5,1000,10,'default','diff'; -'twitter','twitter-i1-th10-rk45',1,0.5,'rk45-smooth',1,1000,10,'default','diff'; +'twitter','twitter-i1-th01-rk45',1,0.5,'rk45-smooth',0.01,1000,1,'default','diff'; +'twitter','twitter-i1-th5-rk45',1,0.5,'rk45-smooth',0.5,1000,1,'default','diff'; +'twitter','twitter-i1-th10-rk45',1,0.5,'rk45-smooth',1,1000,1,'default','diff'; % timescale = 2; -'twitter','twitter-i2-th01-rk45',2,1,'rk45-smooth',0.01,1000,10,'default','diff'; -'twitter','twitter-i2-th5-rk45',2,1,'rk45-smooth',0.5,1000,10,'default','diff'; -'twitter','twitter-i2-th10-rk45',2,1,'rk45-smooth',1,1000,10,'default','diff'; +'twitter','twitter-i2-th01-rk45',2,1,'rk45-smooth',0.01,1000,1,'default','diff'; +'twitter','twitter-i2-th5-rk45',2,1,'rk45-smooth',0.5,1000,1,'default','diff'; +'twitter','twitter-i2-th10-rk45',2,1,'rk45-smooth',1,1000,1,'default','diff'; % timescale = 6 -'twitter','twitter-i6-th01-rk45',6,3,'rk45-smooth',0.01,1000,10,'default','diff'; -'twitter','twitter-i6-th5-rk45',6,2,'rk45-smooth',0.5,1000,10,'default','diff'; -'twitter','twitter-i6-th10-rk45',6,2,'rk45-smooth',1,1000,10,'default','diff'; +'twitter','twitter-i6-th01-rk45',6,3,'rk45-smooth',0.01,1000,1,'default','diff'; +'twitter','twitter-i6-th5-rk45',6,2,'rk45-smooth',0.5,1000,1,'default','diff'; +'twitter','twitter-i6-th10-rk45',6,2,'rk45-smooth',1,1000,1,'default','diff'; }; diff --git a/preds_readme.m b/preds_readme.m index 2ce5615..eac9205 100644 --- a/preds_readme.m +++ b/preds_readme.m @@ -32,7 +32,11 @@ % Dynamic PageRank %-------------------------------------- +run_twitter_smoothing +run_twitter_timescales + +preds