[mlpack-svn] r10882 - mlpack/trunk/src/mlpack/core/optimizers/lbfgs
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Sat Dec 17 02:22:40 EST 2011
Author: rcurtin
Date: 2011-12-17 02:22:40 -0500 (Sat, 17 Dec 2011)
New Revision: 10882
Modified:
mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp
mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp
Log:
Fix formatting for L-BFGS.
Modified: mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp 2011-12-17 07:20:13 UTC (rev 10881)
+++ mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.cpp 2011-12-17 07:22:40 UTC (rev 10882)
@@ -14,9 +14,9 @@
RosenbrockFunction::RosenbrockFunction()
{
- initial_point.set_size(2, 1);
- initial_point[0] = -1.2;
- initial_point[1] = 1;
+ initialPoint.set_size(2, 1);
+ initialPoint[0] = -1.2;
+ initialPoint[1] = 1;
}
/**
@@ -52,7 +52,7 @@
const arma::mat& RosenbrockFunction::GetInitialPoint() const
{
- return initial_point;
+ return initialPoint;
}
//
@@ -61,11 +61,11 @@
WoodFunction::WoodFunction()
{
- initial_point.set_size(4, 1);
- initial_point[0] = -3;
- initial_point[1] = -1;
- initial_point[2] = -3;
- initial_point[3] = -1;
+ initialPoint.set_size(4, 1);
+ initialPoint[0] = -3;
+ initialPoint[1] = -1;
+ initialPoint[2] = -3;
+ initialPoint[3] = -1;
}
/**
@@ -116,7 +116,7 @@
const arma::mat& WoodFunction::GetInitialPoint() const
{
- return initial_point;
+ return initialPoint;
}
//
@@ -125,13 +125,13 @@
GeneralizedRosenbrockFunction::GeneralizedRosenbrockFunction(int n) : n(n)
{
- initial_point.set_size(n, 1);
+ initialPoint.set_size(n, 1);
for (int i = 0; i < n; i++) // Set to [-1.2 1 -1.2 1 ...].
{
if (i % 2 == 1)
- initial_point[i] = -1.2;
+ initialPoint[i] = -1.2;
else
- initial_point[i] = 1;
+ initialPoint[i] = 1;
}
}
@@ -172,7 +172,7 @@
const arma::mat& GeneralizedRosenbrockFunction::GetInitialPoint() const
{
- return initial_point;
+ return initialPoint;
}
//
@@ -181,9 +181,9 @@
RosenbrockWoodFunction::RosenbrockWoodFunction() : rf(4), wf()
{
- initial_point.set_size(4, 2);
- initial_point.col(0) = rf.GetInitialPoint();
- initial_point.col(1) = wf.GetInitialPoint();
+ initialPoint.set_size(4, 2);
+ initialPoint.col(0) = rf.GetInitialPoint();
+ initialPoint.col(1) = wf.GetInitialPoint();
}
/**
@@ -217,5 +217,5 @@
const arma::mat& RosenbrockWoodFunction::GetInitialPoint() const
{
- return initial_point;
+ return initialPoint;
}
Modified: mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp 2011-12-17 07:20:13 UTC (rev 10881)
+++ mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp 2011-12-17 07:22:40 UTC (rev 10882)
@@ -56,7 +56,7 @@
const arma::mat& GetInitialPoint() const;
private:
- arma::mat initial_point;
+ arma::mat initialPoint;
};
/**
@@ -85,7 +85,7 @@
const arma::mat& GetInitialPoint() const;
private:
- arma::mat initial_point;
+ arma::mat initialPoint;
};
/**
@@ -115,7 +115,7 @@
const arma::mat& GetInitialPoint() const;
private:
- arma::mat initial_point;
+ arma::mat initialPoint;
int n; // Dimensionality
};
@@ -135,7 +135,7 @@
const arma::mat& GetInitialPoint() const;
private:
- arma::mat initial_point;
+ arma::mat initialPoint;
GeneralizedRosenbrockFunction rf;
WoodFunction wf;
};
More information about the mlpack-svn
mailing list