loooot of fixes nad SSE enhacement
This commit is contained in:
@@ -9,23 +9,26 @@ class X: public Shin::NeuronNetwork::Problem
|
||||
{
|
||||
public:
|
||||
X(const X& a) :q(a.q) {}
|
||||
X(const std::vector<bool> &a):q(a) {}
|
||||
std::vector<bool> representation() const
|
||||
X(const std::vector<float> &a):q(a) {}
|
||||
std::vector<float> representation() const
|
||||
{
|
||||
return q;
|
||||
}
|
||||
protected:
|
||||
std::vector<bool> q;
|
||||
std::vector<float> q;
|
||||
};
|
||||
|
||||
int main()
|
||||
{
|
||||
|
||||
srand(time(NULL));
|
||||
for (int test=0;test<3;test++)
|
||||
{
|
||||
Shin::NeuronNetwork::FeedForwardNetworkQuick q({2,6,1});
|
||||
Shin::NeuronNetwork::Learning::Reinforcement b(q);
|
||||
double targetQuality =1.2;
|
||||
b.setPropagator(new Shin::NeuronNetwork::Learning::OpticalBackPropagation(q));
|
||||
b.getPropagator().setLearningCoeficient(0.9);
|
||||
b.getPropagator().allowEntropy();
|
||||
double targetQuality =1.7;
|
||||
if(test==2)
|
||||
{
|
||||
targetQuality =1.62;
|
||||
@@ -35,10 +38,10 @@ int main()
|
||||
b.getPropagator().setLearningCoeficient(3);
|
||||
}
|
||||
b.setQualityFunction(
|
||||
[](const Shin::NeuronNetwork::Problem &pr,const Shin::NeuronNetwork::Solution &s)->double
|
||||
[](const Shin::NeuronNetwork::Problem &pr,const Shin::NeuronNetwork::Solution &s)->float
|
||||
{
|
||||
std::vector <bool> p=pr;
|
||||
double expect=0.0;
|
||||
std::vector <float> p=pr;
|
||||
float expect=0.0;
|
||||
if(p[0] && p[1])
|
||||
expect=0;
|
||||
else if(p[0] && !p[1])
|
||||
@@ -60,17 +63,15 @@ int main()
|
||||
|
||||
// std::cerr << " returnning " << expect*5.0 << "\n";
|
||||
|
||||
return expect*5.0;
|
||||
return expect*9.0;
|
||||
});
|
||||
|
||||
srand(time(NULL));
|
||||
|
||||
std::vector<Shin::NeuronNetwork::Problem*> p;
|
||||
|
||||
p.push_back(new X(std::vector<bool>({0,0})));
|
||||
p.push_back( new X(std::vector<bool>({1,0})));
|
||||
p.push_back( new X(std::vector<bool>({0,1})));
|
||||
p.push_back(new X(std::vector<bool>({1,1})));
|
||||
p.push_back(new X(std::vector<float>({0,0})));
|
||||
p.push_back( new X(std::vector<float>({1,0})));
|
||||
p.push_back( new X(std::vector<float>({0,1})));
|
||||
p.push_back(new X(std::vector<float>({1,1})));
|
||||
|
||||
if(test==1)
|
||||
{
|
||||
@@ -82,12 +83,13 @@ int main()
|
||||
}
|
||||
|
||||
for(int i=0;i < 500000000;i++)
|
||||
// for(int i=0;i < 5;i++)
|
||||
{
|
||||
double err=b.learnSet(p);
|
||||
|
||||
if(i%100000==0)
|
||||
srand(time(NULL));
|
||||
if(i%40000==0 || err > targetQuality)
|
||||
if(i%200000==0 || err > targetQuality)
|
||||
{
|
||||
std::cerr << i << " ("<< err <<").\n";
|
||||
for(int j=0;j<4;j++)
|
||||
|
||||
Reference in New Issue
Block a user