Author: vive
Date: 2009-02-16 13:47:32 +0000 (Mon, 16 Feb 2009)
New Revision: 25658
Modified:
trunk/apps/simsalabim/Darknet.java
trunk/apps/simsalabim/DarknetRoute.java
Log:
Fix constants and route length
Modified: trunk/apps/simsalabim/Darknet.java
===================================================================
--- trunk/apps/simsalabim/Darknet.java 2009-02-16 09:17:03 UTC (rev 25657)
+++ trunk/apps/simsalabim/Darknet.java 2009-02-16 13:47:32 UTC (rev 25658)
@@ -244,7 +244,7 @@
CACHE_SIZE = st.getInt("dnCacheSize",STORE_SIZE);
// Default: same size as store
VARDIST_RESOLUTION = st.getInt("varDistResolution", 100);
N_BEST = st.getInt("dnNBest",3);
- MAXPEERS = st.getInt("dnMaxPeers",50);
+ MAXPEERS = st.getInt("dnMaxPeers",20);
RECACHE_PROB = (float) st.getDouble("dnRecacheProb",0.0);
// Whether to recache data after each successful request
RELINK_PROB = (float) st.getDouble("dnRelinkProb",1.0);
DARKLINKS_ONLY_PROB = (float)
st.getDouble("dnLinksOnlyProb",1.0);
@@ -315,9 +315,9 @@
// Not depending on oldNode (linking to a living node) at the moment...
public boolean join(DarknetNode newNode, DarknetNode oldNode, Feedback
fb) {
- int cost = newNode.join();
+ int cost = newNode.join(); // Always connect
friends
- if (newNode.isOpennet()) {
+ if (newNode.isOpennet()) { // Maybe connect
strangers
opennetBootstrap(newNode, OPENNET_MINPEERS);
n_opennet_active++;
}
@@ -549,7 +549,7 @@
int srcNet = n.person().network(), origNet =
ds.getData(k).sourceNetwork();
- fb.feedback(RunTask.SEARCH, d != null, new double[]
{route.size(), d != null ? route.size() : 0, srcNet, origNet});
+ fb.feedback(RunTask.SEARCH, d != null, new double[]
{route.size(), d != null ? route.sizeForward() : 0, srcNet, origNet});
return d;
}
Modified: trunk/apps/simsalabim/DarknetRoute.java
===================================================================
--- trunk/apps/simsalabim/DarknetRoute.java 2009-02-16 09:17:03 UTC (rev
25657)
+++ trunk/apps/simsalabim/DarknetRoute.java 2009-02-16 13:47:32 UTC (rev
25658)
@@ -62,6 +62,11 @@
return route.size();
}
+ // Number of steps until this route found its destination (or gave up)
+ public int sizeForward() {
+ return route.size() - retpath().size();
+ }
+
public Iterator<DarknetNode> iterator() {
return route.iterator();
}
@@ -124,7 +129,7 @@
//}
/**
- * ASSUMES: a successful query route (source ... dest ... source)
+ * ASSUMES: a successful request/insert route (source ... dest ...
source)
*
* Returns the return path (dest to source)
*/
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
