release: 0.0.28

[lilypond.git] / flower / vector.hh

diff --git a/flower/vector.hh b/flower/vector.hh
index 1929c674a9d702364bbaf18297a8aee136ec9655..c039d5ce89276d024cf6d187b5b4e3122a633f76 100644 (file)
--- a/flower/vector.hh
+++ b/flower/vector.hh
@@ -3,7 +3,7 @@
 
 #include <math.h>
 #include "real.hh"
-#include "vray.hh"
+#include "varray.hh"
 
 class Dstream;
 class String;
@@ -11,11 +11,12 @@ void set_matrix_debug(Dstream&ds);
 
 /// a row of numbers
 class Vector  {
-    svec<Real> dat;
+    Array<Real> dat;
 public:
     void OK() const { dat.OK();}
-    int dim() const { return dat.sz(); }
+    int dim() const { return dat.size(); }
     Vector() { }
+    Vector(Array<Real> d );
     Vector(const Vector&n);
     Vector(int n) {
        dat.set_size(n);
@@ -69,13 +70,13 @@ public:
     Real norm_sq() {
        return ((*this) * (*this));
     }
-    operator svec<Real> () { return dat; }
+    operator Array<Real> () { return dat; }
     void print() const;
     /// set to j-th element of unit-base
     void set_unit(int j) ;
 };
 /**
-    a vector. Storage is handled in svec, Vector only does the mathematics.
+    a vector. Storage is handled in Array, Vector only does the mathematics.
  */
 
 inline Vector