version 0.2.2.5

cran · Apr 3, 2009 · 3a9858f · 3a9858f
1 parent 7808132
commit 3a9858f
Show file tree

Hide file tree

Showing 48 changed files with 1,715 additions and 1,214 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,13 +1,15 @@
-Title: dynamicGraph
-Package: dynamicGraph
-Namespace: dynamicGraph
-Description: Interactive graphical tool for manipulating graphs
-Version: 0.2.2.4
-Date: 2007/10/14
-Author: Jens Henrik Badsberg <coco@badsberg.eu>
-Maintainer: Jens Henrik Badsberg <coco@badsberg.eu>
-Depends: R (>= 1.8.1), methods, ggm, tcltk
-License: GPL Version 2 or later.
-URL: http://www.badsberg.eu
-Address: Andreas Bjorns Gade 21, 2. tv, 1428 Kobenhavn K, Denmark
-Packaged: Sun Oct 14 22:13:53 2007; CoCo
+Title: dynamicGraph
+Package: dynamicGraph
+Namespace: dynamicGraph
+Description: Interactive graphical tool for manipulating graphs
+Version: 0.2.2.5
+Date: 2009/04/03
+Author: Jens Henrik Badsberg <coco@badsberg.eu>
+Maintainer: Jens Henrik Badsberg <coco@badsberg.eu>
+Depends: R (>= 1.8.1), methods, ggm, tcltk
+License: GPL (>= 2)
+URL: http://www.badsberg.eu
+Address: Andreas Bjorns Gade 21, 2. tv, 1428 Kobenhavn K, Denmark
+Packaged: Fri Apr 3 23:25:55 2009; Jens Henrik Badsberg
+Repository: CRAN
+Date/Publication: 2009-04-04 20:40:28
diff --git a/INDEX b/INDEX
@@ -1,54 +1,52 @@
 blockTreeToList         Extract the list of blocks from a block tree
-dg.Block-class          Class "dg.Block"
-dg.BlockEdge-class      Class "dg.BlockEdge"
+dg.Block-class          Class dg.Block
+dg.BlockEdge-class      Class dg.BlockEdge
 dg.control              Options of dynamicGraphMain and
                         simpleGraphtoGraph
 dg.DiscreteVertex-class
-                        Classses "dg.DiscreteVertex",
-                        "dg.ContinuousVertex", and "dg.OrdinalVertex"
-dg.Edge-class           Class "dg.Edge"
-dg.ExtraEdge-class      Class "dg.ExtraEdge"
-dg.FactorEdge-class     Class "dg.FactorEdge"
-dg.FactorVertex-class   Class "dg.FactorVertex"
-dg.Generator-class      Classses "dg.Generator",
-                        "dg.DiscreteGenerator",
-                        "dg.Linear"\-"Generator", and
-                        "dg.QuadraticGenerator"
-dg.graph-class          Class "dg.graph"
-dg.graphedges-class     Class "dg.graphedges"
-dg.list-class           Class "dg.list", "dg.NodeList", and
-                        "dg.EdgeList"
-dg.Model-class          Class "dg.Model"
-dg.Node-class           Class "dg.Node"
-dg.simple.graph-class   Class "dg.simple.graph"
-dg.Test-class           Class "dg.Test"
-dg.TextVertex-class     Class "dg.TextVertex"
-dg.Vertex-class         Class "dg.Vertex"
-dg.VertexEdge-class     Class "dg.VertexEdge"
+                        Classes dg.DiscreteVertex, dg.ContinuousVertex,
+                        and dg.OrdinalVertex
+dg.Edge-class           Class dg.Edge
+dg.ExtraEdge-class      Class dg.ExtraEdge
+dg.FactorEdge-class     Class dg.FactorEdge
+dg.FactorVertex-class   Class dg.FactorVertex
+dg.Generator-class      Classes dg.Generator, dg.DiscreteGenerator,
+                        dg.Linear\-Generator, and dg.QuadraticGenerator
+dg.graph-class          Class dg.graph
+dg.graphedges-class     Class dg.graphedges
+dg.list-class           Classes dg.list, dg.NodeList, and dg.EdgeList
+dg.Model-class          Class dg.Model
+dg.Node-class           Class dg.Node
+dg.simple.graph-class   Class dg.simple.graph
+dg.Test-class           Class dg.Test
+dg.TextVertex-class     Class dg.TextVertex
+dg.Vertex-class         Class dg.Vertex
+dg.VertexEdge-class     Class dg.VertexEdge
 drawModel               DEPRECATED: Draw the dynamicGraph window and
                         slaves
 DynamicGraph            DEPRECATED: Simple interface to dynamicGraph
-DynamicGraph-class      Class "DynamicGraph"
+DynamicGraph-class      Class DynamicGraph
+dynamicGraph-package    dynamicGraph
 dynamicGraphMain        Dynamic Graph
 DynamicGraphModel-class
-                        Class "DynamicGraphModel"
+                        Class DynamicGraphModel
 DynamicGraphView-class
-                        Class "DynamicGraphView"
+                        Class DynamicGraphView
 modalDialog             Modal dialog window for returning a text string
 nameToVertexIndex       The indices of vertices
 replaceBlockList        Replace the block list of model frame
 replaceControls         Replace the controls of model frame
 replaceVertexList       Replace the vertex list of model frame
-returnBlockEdgeList     Class "dg.BlockEdgeList": The block edge list
-returnEdgeList          Class "dg.VertexEdgeList": The edge list
-returnExtraEdgeList     Class "dg.ExtraEdgeList": The extra edge list
-returnFactorEdgeList    Class "dg.FactorEdgeList": The factor edge list
+returnBlockEdgeList     Class dg.BlockEdgeList: The block edge list
+returnEdgeList          Class dg.VertexEdgeList: The edge list
+returnExtraEdgeList     Class dg.ExtraEdgeList: The extra edge list
+returnFactorEdgeList    Class dg.FactorEdgeList: The factor edge list
 returnFactorVerticesAndEdges
-                        Class "dg.FactorVertexList": The factor vertex
+                        Class dg.FactorVertexList: The factor vertex
                         list
-returnVertexList        Class "dg.VertexList": The vertex list
+returnVertexList        Class dg.VertexList: The vertex list
 selectDialog            Dialog window for selection between items
-setBlocks               Class "dg.BlockList": The block list
+setBlocks               Class dg.BlockList: The block list
 setTreeBlocks           The block tree
 simpleGraphToGraph      simple graph to graph
 validEdgeClasses        Valid edge classes

diff --git a/R/checkList.R b/R/checkList.R
@@ -2,24 +2,20 @@
 function (classList, classObjects, Args = NULL, list = Args[[1]], 
     txt = "in initialize") 
 {
-    myPossibleExtends <- function(class1, class2) {
+    "myPossibleExtends" <- function(class1, class2) {
         if (class1 == class2) 
             return(TRUE)
-        else return(!(class(possibleExtends(class1, class2)) == 
-            "logical"))
+        else return(!(class(possibleExtends(class1, class2)) == "logical"))
     }
     result <- list()
     if (myPossibleExtends(class(list), "list")) {
-        if (all(unlist(lapply(list, function(i) myPossibleExtends(class(i), 
-            classObjects))))) 
+        if (all(unlist(lapply(list, 
+                  function(i) myPossibleExtends(class(i), classObjects))))) 
             result <- list
-        else message(paste("Invalid list", txt, "'", classList, 
-            "'"))
+        else message(paste("Invalid list", txt, "'", classList, "'"))
         if (length(Args) > 1) 
-            message(paste("Ignored arguments", txt, "'", classList, 
-                "'"))
+            message(paste("Ignored arguments", txt, "'", classList, "'"))
     }
-    else message(paste("Invalid argument", txt, "'", classList, 
-        "'"))
+    else message(paste("Invalid argument", txt, "'", classList, "'"))
     return(result)
 }