Changeset 3322

Timestamp:

Jul 12, 2006, 8:39:02 PM (18 years ago)

Author:

steve

Message:

change to gnuplot

File:

• development/pyvolution-1d/quantity.py (modified) (5 diffs)

development/pyvolution-1d/quantity.py

@@ -614 +614 @@
 
 
+def newLinePlot(title='Simple Plot'):
+    import Gnuplot
+    g = Gnuplot.Gnuplot()
+    g.title(title)
+    g('set data style linespoints') 
+    g.xlabel('x')
+    g.ylabel('y')
+    return g
+
+def linePlot(g,x,y):
+    import Gnuplot
+    g.plot(Gnuplot.PlotItems.Data(x.flat,y.flat))
+
+
+
+
 
 if __name__ == "__main__":
     from domain import Domain
-
+    from Numeric import arange
+    
     points1 = [0.0, 1.0, 2.0, 3.0]
     vertex_values = [[1.0,2.0],[4.0,5.0],[-1.0,2.0]]
@@ -641 +658 @@
     print Q1.centroid_values
 
-    def fun(x):
-        return x**2
-
+    class FunClass:
+        def __init__(self,value):
+            self.value = value
+
+        def __call__(self,x):
+            return self.value*(x**2)
+
+
+    fun = FunClass(1.0)
     Q1.set_values(fun,'vertices')
 
@@ -660 +683 @@
     Q1.limit()
 
-    from pylab import *
-    plot(Xc,Qc)
-
-    show()
+    g1 = newLinePlot('plot 1')
+    linePlot(g1,Xc,Qc)
 
     points2 = arange(10)
-
-
     D2 = Domain(points2)
 
@@ -674 +693 @@
     Xc = Q2.domain.vertices
     Qc = Q2.vertex_values
-    plot(Xc,Qc)
-
-    show()
+
+    g2 = newLinePlot('plot 2')
+    linePlot(g2,Xc,Qc)
+
+
+    
     Q2.extrapolate_second_order()
     Q2.limit()
@@ -685 +707 @@
     print Qc
 
-    plot(Xc,Qc)
-
-    show()
-
-
-
-
-
-
-
-
+    g3 = newLinePlot('plot 3')
+    linePlot(g3,Xc,Qc)
+    raw_input('press return')
+
+
+    for i in range(10):
+        fun = FunClass(i/10.0)
+        Q2.set_values(fun,'vertices')
+        Qc = Q2.vertex_values
+        linePlot(g3,Xc,Qc)
+
+    raw_input('press return')
+
+
+
+
+
+
+