mirror of
https://github.com/Relintai/MLPP.git
synced 2025-03-14 18:18:51 +01:00
Minor optimization to LinReg.normalEquation
This commit is contained in:
parent
086b8bea31
commit
6dfa1cafe3
@ -141,10 +141,11 @@ namespace MLPP{
|
|||||||
LinAlg alg;
|
LinAlg alg;
|
||||||
Stat stat;
|
Stat stat;
|
||||||
std::vector<double> x_means;
|
std::vector<double> x_means;
|
||||||
|
std::vector<std::vector<double>> inputSetT = alg.transpose(inputSet);
|
||||||
|
|
||||||
x_means.resize(alg.transpose(inputSet).size());
|
x_means.resize(inputSetT.size());
|
||||||
for(int i = 0; i < alg.transpose(inputSet).size(); i++){
|
for(int i = 0; i < inputSetT.size(); i++){
|
||||||
x_means[i] = (stat.mean(alg.transpose(inputSet)[i]));
|
x_means[i] = (stat.mean(inputSetT[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
try{
|
try{
|
||||||
|
Binary file not shown.
6
main.cpp
6
main.cpp
@ -39,6 +39,7 @@
|
|||||||
#include "MLPP/Stat/Stat.hpp"
|
#include "MLPP/Stat/Stat.hpp"
|
||||||
#include "MLPP/LinAlg/LinAlg.hpp"
|
#include "MLPP/LinAlg/LinAlg.hpp"
|
||||||
#include "MLPP/Activation/Activation.hpp"
|
#include "MLPP/Activation/Activation.hpp"
|
||||||
|
#include "MLPP/Cost/Cost.hpp"
|
||||||
#include "MLPP/Data/Data.hpp"
|
#include "MLPP/Data/Data.hpp"
|
||||||
#include "MLPP/Convolutions/Convolutions.hpp"
|
#include "MLPP/Convolutions/Convolutions.hpp"
|
||||||
|
|
||||||
@ -51,6 +52,7 @@ int main() {
|
|||||||
Stat stat;
|
Stat stat;
|
||||||
LinAlg alg;
|
LinAlg alg;
|
||||||
Activation avn;
|
Activation avn;
|
||||||
|
Cost cost;
|
||||||
Data data;
|
Data data;
|
||||||
Convolutions conv;
|
Convolutions conv;
|
||||||
|
|
||||||
@ -142,12 +144,12 @@ int main() {
|
|||||||
// alg.printVector(model.modelSetTest((alg.transpose(inputSet))));
|
// alg.printVector(model.modelSetTest((alg.transpose(inputSet))));
|
||||||
// std::cout << "ACCURACY: " << 100 * model.score() << "%" << std::endl;
|
// std::cout << "ACCURACY: " << 100 * model.score() << "%" << std::endl;
|
||||||
|
|
||||||
// // LOGISTIC REGRESSION
|
// LOGISTIC REGRESSION
|
||||||
// std::vector<std::vector<double>> inputSet;
|
// std::vector<std::vector<double>> inputSet;
|
||||||
// std::vector<double> outputSet;
|
// std::vector<double> outputSet;
|
||||||
// data.setData(30, "/Users/marcmelikyan/Desktop/Data/BreastCancer.csv", inputSet, outputSet);
|
// data.setData(30, "/Users/marcmelikyan/Desktop/Data/BreastCancer.csv", inputSet, outputSet);
|
||||||
// LogReg model(inputSet, outputSet);
|
// LogReg model(inputSet, outputSet);
|
||||||
// model.SGD(0.001, 100000, 0);
|
// model.gradientDescent(0.0001, 100000, 0);
|
||||||
// model.MLE(0.1, 10000, 0);
|
// model.MLE(0.1, 10000, 0);
|
||||||
// alg.printVector(model.modelSetTest(inputSet));
|
// alg.printVector(model.modelSetTest(inputSet));
|
||||||
// std::cout << "ACCURACY: " << 100 * model.score() << "%" << std::endl;
|
// std::cout << "ACCURACY: " << 100 * model.score() << "%" << std::endl;
|
||||||
|
Loading…
Reference in New Issue
Block a user