update dag

- improve execution
- add charts

Author: grlloyd

DESCRIPTION

@@ -47,6 +47,7 @@ Collate:
     'model_list_class.R'
     'metric_class.R'
     'iterator_class.R'
+    'model_dag_chart_class.R'
     'model_dag_class.R'
     'model_node_class.R'
     'optimiser_class.R'
@@ -70,5 +71,5 @@ Suggests:
 VignetteBuilder: knitr
 Imports: methods,ontologyIndex,
     datasets, graphics, stats, utils, knitr, 
-    SummarizedExperiment, S4Vectors, rols
+    SummarizedExperiment, S4Vectors, rols, igraph
 biocViews: WorkflowStep

NAMESPACE

@@ -15,7 +15,6 @@ S3method(.DollarNames,resampler)
 S3method(.DollarNames,struct_class)
 S3method(.DollarNames,struct_node)
 export("data_value<-")
-export("edges<-")
 export("model<-")
 export("output_list<-")
 export("output_value<-")
@@ -36,7 +35,6 @@ export(citations)
 export(dag_execute)
 export(data_node)
 export(data_value)
-export(edges)
 export(entity)
 export(entity_stato)
 export(enum)
@@ -55,6 +53,7 @@ export(metric)
 export(model)
 export(model_apply)
 export(model_dag)
+export(model_dag_chart)
 export(model_node)
 export(model_predict)
 export(model_reverse)
@@ -106,7 +105,6 @@ exportMethods("+")
 exportMethods("[")
 exportMethods("[<-")
 exportMethods("data_value<-")
-exportMethods("edges<-")
 exportMethods("max_length<-")
 exportMethods("model<-")
 exportMethods("models<-")
@@ -130,7 +128,6 @@ exportMethods(chart_plot)
 exportMethods(citations)
 exportMethods(dag_execute)
 exportMethods(data_value)
-exportMethods(edges)
 exportMethods(evaluate)
 exportMethods(export_xlsx)
 exportMethods(is_output)
@@ -169,8 +166,14 @@ exportMethods(value)
 import(S4Vectors)
 import(SummarizedExperiment)
 import(datasets)
+import(ggplot2)
 import(methods)
 importFrom(graphics,plot)
+importFrom(igraph,graph_from_data_frame)
+importFrom(igraph,layout_as_tree)
+importFrom(igraph,layout_in_circle)
+importFrom(igraph,layout_randomly)
+importFrom(igraph,layout_with_sugiyama)
 importFrom(knitr,purl)
 importFrom(ontologyIndex,get_ontology)
 importFrom(stats,runif)