[mlpack-svn] r11452 - mlpack/trunk/src/mlpack/methods/linear_regression

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: jcline3
Date: 2012-02-09 19:07:50 -0500 (Thu, 09 Feb 2012)
New Revision: 11452

Modified:
   mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.cpp
   mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.hpp
Log:
Default and copy constructors.

This is so a user can do:
LinearRegression lr;

if(CLI option)
  // create model
  lr = LinearRegression(data)
else if(CLI option)
  // load model from file
  lr = LinearRegression(file)

// predict



Modified: mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.cpp	2012-02-09 23:25:31 UTC (rev 11451)
+++ mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.cpp	2012-02-10 00:07:50 UTC (rev 11452)
@@ -47,9 +47,14 @@
 
 LinearRegression::LinearRegression(const std::string& filename)
 {
-  parameters.load(filename);
+  data::Load(filename, parameters, true);
 }
 
+LinearRegression::LinearRegression(const LinearRegression& linearRegression)
+{
+  parameters = linearRegression.parameters;
+}
+
 LinearRegression::~LinearRegression()
 { }
 

Modified: mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.hpp	2012-02-09 23:25:31 UTC (rev 11451)
+++ mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression.hpp	2012-02-10 00:07:50 UTC (rev 11452)
@@ -34,6 +34,19 @@
   LinearRegression(const std::string& filename);
 
   /**
+   * Copy constructor.
+   *
+   * @param linearRegression the other instance to copy parameters from.
+   */
+  LinearRegression(const LinearRegression& linearRegression);
+
+  /**
+   * Default constructor.
+   */
+  LinearRegression() {}
+
+
+  /**
    * Destructor - no work done.
    */
   ~LinearRegression();