[ff-cvs] fenfire/org/fenfire fenmm/MindNet.java fenmm/Mi...

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/17 21:07:15

Modified files:
        org/fenfire/fenmm: MindNet.java MindNet.test 
        org/fenfire/view/lava: mindMapView2D.py 

Log message:
        test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MindNet.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MindNet.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenmm/MindNet.java
diff -u fenfire/org/fenfire/fenmm/MindNet.java:1.3 
fenfire/org/fenfire/fenmm/MindNet.java:1.4
--- fenfire/org/fenfire/fenmm/MindNet.java:1.3  Sun Aug 17 20:50:20 2003
+++ fenfire/org/fenfire/fenmm/MindNet.java      Sun Aug 17 21:07:15 2003
@@ -83,7 +83,7 @@
         ((ArrayList)net.get(a)).add(b);
     }
 
-    public Object set(Object a, Object pl, int depth) {
+    public Object put(Object a, Object pl, int depth) {
        return data.put(a, new MMNode(pl, depth));
     }
     
Index: fenfire/org/fenfire/fenmm/MindNet.test
diff -u fenfire/org/fenfire/fenmm/MindNet.test:1.2 
fenfire/org/fenfire/fenmm/MindNet.test:1.3
--- fenfire/org/fenfire/fenmm/MindNet.test:1.2  Sun Aug 17 15:55:01 2003
+++ fenfire/org/fenfire/fenmm/MindNet.test      Sun Aug 17 21:07:15 2003
@@ -29,6 +29,27 @@
     """
 
     net = MindNet()
+    
+    a = ff.swamp.Nodes.N()
+    b = ff.swamp.Nodes.N()
+    c = ff.swamp.Nodes.N()
+
+    net.put('a', a, 1)
+    net.put('b', b, 2)
+    net.put('b', c, 3)
+
+    print net.get('a'), net.get('a').depth, net.getDepth('a'), a
+    print net.get('b'), net.get('b').object, net.getPlace('b'), c
+
+    assert net.get('a').depth == net.getDepth('a') == 1
+    assert net.get('b').object == net.getPlace('b') == c
+
+def testMindNetLink():
+    """
+    Test FenMM's MindNet link table.
+    """
+
+    net = MindNet()
 
     a = ff.swamp.Nodes.N()
     b = ff.swamp.Nodes.N()
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.26 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.27
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.26 Sun Aug 17 20:50:20 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Sun Aug 17 21:07:15 2003
@@ -190,7 +190,7 @@
 
         ### Get the cs for center node
         pl = self.getPlace(vs, paper2screen, 0,0, node, 0,0)
-        self.net.set(node, pl, 0)
+        self.net.put(node, pl, 0)
 
         # If update interpolation help data only, if has moved
         if self.current['centerNode'] != node: self.previous = 
self.current.copy()
@@ -208,7 +208,6 @@
             except ValueError: pass
 
         if len(links) == 0:
-            self.net.setDepth(node, 0)
             self.net.link(node, node) # XXX probably not the right way
         if len(links) > 0:
             rotationAngle = 2*Math.PI / float(len(links))
@@ -286,7 +285,7 @@
                 if self.net.getPlace(link) == None:
                     pl = self.getPlace(vs, into, x, y, link, 
startAngle+rotationAngle*i, depth)
                     if dbg: p('new node', pl)
-                    self.net.set(link, pl, depth)
+                    self.net.put(link, pl, depth)
                 else:
                     pl = self.net.getPlace(link)
                     if dbg: p('old node', pl)