Ultimi ritocchi wiigesture: aggiunti parametri per tests automatizzati.

valdar · Dec 29, 2008 · cf9db99 · cf9db99
1 parent f90246b
commit cf9db99
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 19 deletions.
diff --git a/hmm/include/GestureModel.h b/hmm/include/GestureModel.h
@@ -19,10 +19,10 @@ class GestureModel
         void setQuantizer(Quantizer2* newQuant);
         Quantizer2* getQuantizer();
 
-        void trainQuantizer( std::vector<Gesture> dataset );
+        void trainQuantizer( std::vector<Gesture> dataset, int considered_gestures );
         bool isQuantizerTrained();
 
-        void trainHMM(std::vector<Gesture > trainSet);
+        void trainHMM( std::vector<Gesture > trainSet, int considered_gestures );
         std::vector<double > evaluateGestures(std::vector<Gesture >& testSet);
 
     protected:

diff --git a/hmm/include/quantizer2.h b/hmm/include/quantizer2.h
@@ -36,7 +36,7 @@ class Quantizer2{
     std::vector<int> getDiscreteSequence(Gesture& gesture);
 
     // addestra i centroidi
-    void train(std::vector<Gesture> gestures);
+    void train(std::vector<Gesture> gestures, int considered_gestures);
 
     ~Quantizer2();
 

diff --git a/hmm/src/GestureModel.cpp b/hmm/src/GestureModel.cpp
@@ -38,18 +38,26 @@ Quantizer2* GestureModel::getQuantizer(){
     return this->quant;
 }
 
-void GestureModel::trainQuantizer( std::vector<Gesture> dataset ){
-    quant->train(dataset);
+void GestureModel::trainQuantizer( std::vector<Gesture> dataset, int considered_gestures ){
+    quant->train(dataset, considered_gestures);
     this->quantizerTrained = true;
 }
 
 bool GestureModel::isQuantizerTrained(){
     return this->quantizerTrained;
 }
 
-void GestureModel::trainHMM(std::vector<Gesture > trainSet){
+void GestureModel::trainHMM(std::vector<Gesture > trainSet, int considered_gestures){
     std::vector<std::vector<int> > discreteTrainSet;
-    for(int i=0; i<trainSet.size(); i++){
+
+    int gesture_number;
+    if(considered_gestures<trainSet.size()){
+        gesture_number = considered_gestures;
+    }else{
+        gesture_number = trainSet.size();
+    }
+
+    for(int i=0; i<gesture_number; i++){
         discreteTrainSet.push_back( quant->getDiscreteSequence(trainSet.at(i)) );
     }
     gestureHMM->trainMS( discreteTrainSet );

diff --git a/hmm/src/crossvalidation.cpp b/hmm/src/crossvalidation.cpp
@@ -85,8 +85,8 @@ return dataset;
 int main(int argc, char** argv)
 {
     //parsing degli input
-    if(argc < 9){
-        std::cout<<"USO: wiiGesture <train_file1> <train_file2> <train_file3> <validation_file1> <validation_file2> <validation_file3> <num_stati> <span>"<<std::endl;
+    if(argc < 11){
+        std::cout<<"USO: wiiGesture <train_file1> <train_file2> <train_file3> <validation_file1> <validation_file2> <validation_file3> <num_stati> <span> <numero_epoche> <numero_gesture_considerate>"<<std::endl;
         return 1;
     }
 
@@ -106,7 +106,15 @@ int main(int argc, char** argv)
     int span;
     s_span >> span;
 
-    std::cout<<"numero stati: "<<stati<<" | span: "<<span<<std::endl;
+    std::istringstream s_epoche(argv[9]);
+    int required_epoche;
+    s_epoche >> required_epoche;
+
+    std::istringstream s_consGest(argv[10]);
+    int gesture_considerate;
+    s_consGest >> gesture_considerate;
+
+    std::cout<<"numero stati: "<<stati<<" | span: "<<span<<" | epoche: "<<required_epoche<<" | gesture considerate: "<<gesture_considerate<<std::endl;
 
     //Costruzione dei Trainset
     std::vector<Gesture> trainset1 = importDataFile(train1);
@@ -129,16 +137,18 @@ int main(int argc, char** argv)
     gesture3 = new GestureModel(stati, span);
 
     //Addestramento dei quantizzatore
-    gesture1->trainQuantizer(trainset1);
-    gesture2->trainQuantizer(trainset2);
-    gesture3->trainQuantizer(trainset3);
+    gesture1->trainQuantizer(trainset1, gesture_considerate);
+    gesture2->trainQuantizer(trainset2, gesture_considerate);
+    gesture3->trainQuantizer(trainset3, gesture_considerate);
 
     std::cout<<"quantizerS: OK"<<std::endl;
 
     //Addestramento HMMs
-    gesture1->trainHMM(trainset1);
-    gesture2->trainHMM(trainset2);
-    gesture3->trainHMM(trainset3);
+    for(int epoche =0; epoche<=required_epoche; epoche++){
+        gesture1->trainHMM(trainset1, gesture_considerate);
+        gesture2->trainHMM(trainset2, gesture_considerate);
+        gesture3->trainHMM(trainset3, gesture_considerate);
+    }
 
     std::cout<<"hmmS: TRAINED"<<std::endl;
 

diff --git a/hmm/src/discretizzazione.cpp b/hmm/src/discretizzazione.cpp
@@ -122,7 +122,7 @@ int main(int argc, char** argv){
     }
 
     Quantizer2 q;
-    q.train(dataset);
+    q.train(dataset, 90000);//da rivedere mettendo qualcosa di sensato come numero di gesture considerate così le considera tutte
 
     for(int k=0; k<dataset_size; k++){
 

diff --git a/hmm/src/quantizer2.cpp b/hmm/src/quantizer2.cpp
@@ -33,12 +33,18 @@ void Quantizer2::init(Gesture gesture){
 }
 
 
-void Quantizer2::train(std::vector<Gesture> gestures){
+void Quantizer2::train(std::vector<Gesture> gestures, int considered_gestures){
     //metagesture: contiene tutte le componenti di tutte le gesture.
     Gesture gesture;
 
     //costruzione della metagesture
-    for(int k=0; k<gestures.size(); k++){
+    int gesture_number;
+    if(considered_gestures<gestures.size()){
+        gesture_number = considered_gestures;
+    }else{
+        gesture_number = gestures.size();
+    }
+    for(int k=0; k<gesture_number; k++){
         std::vector<Sample_3d> curGesturData = gestures.at(k).getData();
         for(int w=0; w<curGesturData.size(); w++){
             gesture.add( curGesturData.at(w) );