Mercurial > hg > octave-nkf

diff liboctave/LPsolve.h @ 1528:dc527156c38c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1995-10-05 01:44:18 by jwe]
author jwe
date Thu, 05 Oct 1995 01:45:30 +0000
parents 611d403c7f3d
children 503a75f6b9bc
line wrap: on
line diff
--- a/liboctave/LPsolve.h
+++ b/liboctave/LPsolve.h
@@ -32,10 +32,6 @@
 
 #include "LP.h"
 
-#ifndef Vector
-#define Vector ColumnVector
-#endif
-
 class LPsolve : public LP
 {
  public:
@@ -43,19 +39,19 @@
   LPsolve (void) : LP ()
     { set_default_options (); }
 
-  LPsolve (const Vector& c) : LP (c)
+  LPsolve (const ColumnVector& c) : LP (c)
     { set_default_options (); }
 
-  LPsolve (const Vector& c, const Bounds& b) : LP (c, b)
+  LPsolve (const ColumnVector& c, const Bounds& b) : LP (c, b)
     { set_default_options (); }
 
-  LPsolve (const Vector& c, const Bounds& b, const LinConst& lc)
+  LPsolve (const ColumnVector& c, const Bounds& b, const LinConst& lc)
     : LP (c, b, lc) { set_default_options (); }
 
-  LPsolve (const Vector& c, const LinConst& lc) : LP (c, lc)
+  LPsolve (const ColumnVector& c, const LinConst& lc) : LP (c, lc)
     { set_default_options (); }
 
-  virtual Vector minimize (double& objf, int& inform, Vector& lambda);
+  ColumnVector do_minimize (double& objf, int& inform, ColumnVector& lambda);
 
  private: