From fc8b2e601f61ea56d71caa88ad7554ed7f62ba02 Mon Sep 17 00:00:00 2001 From: flatberg Date: Mon, 14 Aug 2006 11:52:26 +0000 Subject: [PATCH] update --- workflows/test_workflow.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/workflows/test_workflow.py b/workflows/test_workflow.py index 1293fc2..0a653d8 100644 --- a/workflows/test_workflow.py +++ b/workflows/test_workflow.py @@ -101,9 +101,10 @@ class TestDataFunction(workflow.Function): def run(self): logger.log('notice', 'Injecting foo test data') - x = randn(20,30) + x = randn(500,30) X = dataset.Dataset(x) - p = plots.ScatterPlot(X, X, 'rows', 'rows', '0_1', '0_2') + p = plots.ScatterMarkerPlot(X, X, 'rows', 'rows', '0_1', '0_2',name='p') + p2 = plots.ScatterMarkerPlot(X, X, 'rows', 'rows', '0_1', '0_2',name='p2') graph = networkx.XGraph() for x in 'ABCDEF': for y in 'ADE': @@ -112,8 +113,8 @@ class TestDataFunction(workflow.Function): ds_plot = plots.NetworkPlot(ds) print ds.get_dim_name() - ds_scatter = plots.ScatterPlot(ds, ds, 'rows_0', 'rows_0', '0_1', '0_2') - return [X, ds, plots.SinePlot(), p, ds_plot, ds_scatter] + ds_scatter = plots.ScatterMarkerPlot(ds, ds, 'rows_0', 'rows_0', '0_1', '0_2') + return [X, ds, plots.SinePlot(), p, ds_plot, ds_scatter,p2] class DatasetLog(workflow.Function): def __init__(self): @@ -259,7 +260,7 @@ class PCAFunction(workflow.Function): # cleanup rpy.r.rm(["t", "m"]) - loading_plot = plots.ScatterPlot(P, P, 'ids','component','1','2', "Loadings") - score_plot = plots.ScatterPlot(T, T,'filename','component','1','2', "Scores") + loading_plot = plots.ScatterMarkerPlot(P, P, 'ids','component','1','2', "Loadings") + score_plot = plots.ScatterMarkerPlot(T, T,'filename','component','1','2', "Scores") return [T, P, loading_plot, score_plot]