rename subspace_dim to vector_storage, since not necessarily a subspace (and can...

darcs-hash:20101120183759-c8de0-48667b8ad265694082acd9cc926b02c5746941e0.gz

diff --git a/api/f77funcs_.h b/api/f77funcs_.h
index 9a2dd94dc80c869dcb6f77e2ed83cccda39708b9..a8b612bd813ea1fe53388b26cf46caa5e4416b0f 100644 (file)
--- a/api/f77funcs_.h
+++ b/api/f77funcs_.h
@@ -157,7 +157,7 @@ void F77_(nlo_force_stop,NLO_FORCE_STOP)(int *ret, nlopt_opt *opt) {
 
 F77_SET(local_optimizer, LOCAL_OPTIMIZER, nlopt_opt)
 F77_GETSET(population, POPULATION, unsigned)
-F77_GETSET(subspace_dim, SUBSPACE_DIM, unsigned)
+F77_GETSET(vector_storage, SUBSPACE_DIM, unsigned)
 
 F77_SETA(default_initial_step, DEFAULT_INITIAL_STEP, double)
 F77_SETA(initial_step, INITIAL_STEP, double)

diff --git a/api/nlopt-in.hpp b/api/nlopt-in.hpp
index 09215fdc9fcd51eecf79788452fc01c161bb9a0a..ac98b138c2b039f716b2e8f3045269a64589195d 100644 (file)
--- a/api/nlopt-in.hpp
+++ b/api/nlopt-in.hpp
@@ -476,7 +476,7 @@ namespace nlopt {
     }
 
     NLOPT_GETSET(unsigned, population)
-    NLOPT_GETSET(unsigned, subspace_dim)
+    NLOPT_GETSET(unsigned, vector_storage)
     NLOPT_GETSET_VEC(initial_step)
 
     void set_default_initial_step(const std::vector<double> &x) {

diff --git a/api/nlopt-internal.h b/api/nlopt-internal.h
index 388d4e5b014226a515033d9b059533e0d45f7167..4f7c344d63b2e64d53b3e5c7176685469a30ac83 100644 (file)
--- a/api/nlopt-internal.h
+++ b/api/nlopt-internal.h
@@ -69,7 +69,7 @@ struct nlopt_opt_s {
      nlopt_opt local_opt; /* local optimizer */
      unsigned stochastic_population; /* population size for stochastic algs */
      double *dx; /* initial step sizes (length n) for nonderivative algs */
-     unsigned subspace_dim; /* max subspace dimension (0 for default) */
+     unsigned vector_storage; /* max subspace dimension (0 for default) */
 
      double *work; /* algorithm-specific workspace during optimization */
 };

diff --git a/api/nlopt.h b/api/nlopt.h
index 5f09f2a0b0e44d09725e56bd198984e7963e5f7e..bff57abe18ea5ff7400cab96580fd14a32b0c795 100644 (file)
--- a/api/nlopt.h
+++ b/api/nlopt.h
@@ -268,8 +268,8 @@ NLOPT_EXTERN(nlopt_result) nlopt_set_local_optimizer(nlopt_opt opt,
 NLOPT_EXTERN(nlopt_result) nlopt_set_population(nlopt_opt opt, unsigned pop);
 NLOPT_EXTERN(unsigned) nlopt_get_population(const nlopt_opt opt);
 
-NLOPT_EXTERN(nlopt_result) nlopt_set_subspace_dim(nlopt_opt opt, unsigned dim);
-NLOPT_EXTERN(unsigned) nlopt_get_subspace_dim(const nlopt_opt opt);
+NLOPT_EXTERN(nlopt_result) nlopt_set_vector_storage(nlopt_opt opt, unsigned dim);
+NLOPT_EXTERN(unsigned) nlopt_get_vector_storage(const nlopt_opt opt);
 
 NLOPT_EXTERN(nlopt_result) nlopt_set_default_initial_step(nlopt_opt opt, 
                                                         const double *x);

diff --git a/api/optimize.c b/api/optimize.c
index 8c8612c3cdd86da6f9ac8d1673d07b45fc8038c2..e36d9e306f3c3d361e5b4bde1c4d381541420991 100644 (file)
--- a/api/optimize.c
+++ b/api/optimize.c
@@ -350,12 +350,12 @@ static nlopt_result nlopt_optimize_(nlopt_opt opt, double *x, double *minf)
 
         case NLOPT_LD_LBFGS: 
              return luksan_plis(ni, f, f_data, lb, ub, x, minf, 
-                                &stop, opt->subspace_dim);
+                                &stop, opt->vector_storage);
 
         case NLOPT_LD_VAR1: 
         case NLOPT_LD_VAR2: 
              return luksan_plip(ni, f, f_data, lb, ub, x, minf, 
-                                &stop, opt->subspace_dim,
+                                &stop, opt->vector_storage,
                                 algorithm == NLOPT_LD_VAR1 ? 1 : 2);
 
         case NLOPT_LD_TNEWTON: 
@@ -363,7 +363,7 @@ static nlopt_result nlopt_optimize_(nlopt_opt opt, double *x, double *minf)
         case NLOPT_LD_TNEWTON_PRECOND: 
         case NLOPT_LD_TNEWTON_PRECOND_RESTART: 
              return luksan_pnet(ni, f, f_data, lb, ub, x, minf,
-                                &stop, opt->subspace_dim,
+                                &stop, opt->vector_storage,
                                 1 + (algorithm - NLOPT_LD_TNEWTON) % 2,
                                 1 + (algorithm - NLOPT_LD_TNEWTON) / 2);
 

diff --git a/api/options.c b/api/options.c
index 19df40dc486c95e6ea71e330302751d5001fe8dd..e3709fd6a04c68d1e0cf0915572ac0f2b93737e7 100644 (file)
--- a/api/options.c
+++ b/api/options.c
@@ -88,7 +88,7 @@ nlopt_opt NLOPT_STDCALL nlopt_create(nlopt_algorithm algorithm, unsigned n)
 
          opt->local_opt = NULL;
          opt->stochastic_population = 0;
-         opt->subspace_dim = 0;
+         opt->vector_storage = 0;
          opt->dx = NULL;
          opt->work = NULL;
 
@@ -589,7 +589,7 @@ NLOPT_STDCALL nlopt_set_local_optimizer(nlopt_opt opt,
 /*************************************************************************/
 
 GETSET(population, unsigned, stochastic_population)
-GETSET(subspace_dim, unsigned, subspace_dim)
+GETSET(vector_storage, unsigned, vector_storage)
 
 /*************************************************************************/
 

diff --git a/octave/nlopt_optimize-mex.c b/octave/nlopt_optimize-mex.c
index 40af9011fe892fd8d55b580c450d7eec5e229ccb..925625c2aa01b95a1083210e99826a799eb91c61 100644 (file)
--- a/octave/nlopt_optimize-mex.c
+++ b/octave/nlopt_optimize-mex.c
@@ -151,7 +151,7 @@ nlopt_opt make_opt(const mxArray *opts, unsigned n)
      nlopt_set_maxtime(opt, struct_val_default(opts, "maxtime", 0.0));
 
      nlopt_set_population(opt, struct_val_default(opts, "population", 0));
-     nlopt_set_subspace_dim(opt, struct_val_default(opts, "subspace_dim", 0));
+     nlopt_set_vector_storage(opt, struct_val_default(opts, "vector_storage", 0));
 
      if (struct_arrval(opts, "initial_step", n, NULL))
          nlopt_set_initial_step(opt,

diff --git a/octave/nlopt_optimize-oct.cc b/octave/nlopt_optimize-oct.cc
index 9e11c4995dc505adebd0952e6b0235a97edfc481..1f24dde9a59ca50d94fadebdc4d66c0fe543e35c 100644 (file)
--- a/octave/nlopt_optimize-oct.cc
+++ b/octave/nlopt_optimize-oct.cc
@@ -177,7 +177,7 @@ nlopt_opt make_opt(Octave_map &opts, int n)
   nlopt_set_maxtime(opt, struct_val_default(opts, "maxtime", 0.0));
 
   nlopt_set_population(opt, struct_val_default(opts, "population", 0));
-  nlopt_set_subspace_dim(opt, struct_val_default(opts, "subspace_dim", 0));
+  nlopt_set_vector_storage(opt, struct_val_default(opts, "vector_storage", 0));
 
   if (opts.contains("initial_step")) {
     Matrix zeros(1, n, 0.0);

diff --git a/swig/nlopt-exceptions.i b/swig/nlopt-exceptions.i
index 6dac57a6d4a317784abce9757a1d204eadb4a822..625914a30d86a07d7d06df76d829aa5a012e49da 100644 (file)
--- a/swig/nlopt-exceptions.i
+++ b/swig/nlopt-exceptions.i
@@ -62,7 +62,7 @@ GETSET_EXCEPT(force_stop, int)
 %catches(std::bad_alloc,std::invalid_argument) nlopt::opt::set_local_optimizer(const opt &lo);
 
 GETSET_EXCEPT(population, unsigned)
-GETSET_EXCEPT(subspace_dim, unsigned)
+GETSET_EXCEPT(vector_storage, unsigned)
 GETSETVEC_EXCEPT(initial_step)
 
 %catches(std::bad_alloc,std::invalid_argument) nlopt::opt::set_default_initial_step(const std::vector<double> &x);