Changeset 816

Timestamp:

09/06/07 11:40:09 (3 years ago)

Author:

luc

Message:

It compiles, but does it work?

Location:

luc/trunk

Files:

• calc_prob.cpp (modified) (3 diffs)
• gen_seq.hpp (modified) (1 diff)
• gen_seq_mod.cpp (modified) (1 diff)
• vectorized_gen_seq.cpp (modified) (2 diffs)

luc/trunk/calc_prob.cpp

@@ -9 +9 @@
                         construire_Taux(taux_eve,
                                                         an_array[0]*((double) iter->count-1)/((double) num_cas - 1) ,
-                                                                                  2,iter->id,iter1->id,iter->id,0) ;
+                                                                                  2,iter->id,iter->id,iter->id,0) ;
                                 
                         vect.push_back(taux_eve) ;
@@ -28 +28 @@
 
 vector<Taux> calc_prob_C_inter(vector<Taux> &vect, vector<Count> n_conta, vector<Famille> fami, double * an_array, int num_cas, int num_control) {
+        
+        Count first_seq, second_seq ;
+        
         for (vector<Famille>::iterator iter = fami.begin() ; iter != fami.end() ; ++iter) {
                 
-                if (n_conta[iter->type1].count > 1 && n_conta[iter->type2].count >1) {
+                first_seq = n_conta[iter->type1] ;
+                second_seq = n_conta[iter->type2] ;
+                if (first_seq.count > 1 && second_seq.count >1) {
                         
                         Taux taux_eve ;
-                        vector<Count>::iterator my_iter = quel_type(n_conta, iter->valeur_item[], iter1->valeur_item[]) ;
+                        vector<Count>::iterator my_iter = quel_type(n_conta, first_seq.valeur_item, second_seq.valeur_item) ;
                         
-                        if (n_conta[iter->type1].valeur_item[4] == 2) {  
+                        if (first_seq.valeur_item[4] == 2) {  
+                                                                
+                                if (my_iter != n_conta.end()) {// Question : Est-ce que *vec.end() retourne tjrs 0?
+                                        construire_Taux(taux_eve,
+                                                                        an_array[0]*2*((double) my_iter->count+1-indic((double) first_seq.id,(double) my_iter->id)- (double) indic((double) second_seq.id,my_iter->id)) / ((double) num_cas - 1),
+                                                                                        2,first_seq.id,second_seq.id,my_iter->id,0) ; 
+                                } 
                                 
-                                
-                                if (my_iter != n_conta.end()) // Question : Est-ce que *vec.end() retourne tjrs 0?
+                                else {
                                         construire_Taux(taux_eve,
-                                                                        an_array[0]*2*((double) my_iter->count+1-(double) indic_iter(iter,my_iter)- (double) indic_iter(iter1,my_iter))/ ((double) num_cas - 1),
-                                                                                        0,iter->id,iter->id) ;
-                                else construire_Taux(taux_eve,
                                                                          an_array[0]*2 / ((double) num_cas - 1),
-                                                                                         0,iter->id,iter->id) ;
-                        } ;
+                                                                                         2,first_seq.id,second_seq.id,my_iter->id,0) ;
+                                } 
+                        }  
                         
                         else {
                                 
-                                if (my_iter != n_conta.end()) // Question : Est-ce que *vec.end() retourne tjrs 0?
+                                if (my_iter != n_conta.end()) { // Question : Est-ce que *vec.end() retourne tjrs 0?
                                         construire_Taux(taux_eve,
-                                                                        an_array[1]*2*((double) my_iter->count+1-(double) indic_iter(iter,my_iter)- (double) indic_iter(iter1,my_iter))/ ((double) num_control - 1),
-                                                                                        0,iter->id,iter->id) ;
+                                                                        an_array[1]*2*((double) my_iter->count+1-indic((double) first_seq.id,(double) my_iter->id)- (double) indic((double) second_seq.id,my_iter->id))/ ((double) num_control - 1),
+                                                                                        3,first_seq.id,second_seq.id,my_iter->id,0) ;
+                                } 
+                                
                                 else construire_Taux(taux_eve,
-                                                                         an_array[1]*2 / ((double) num_control - 1),
-                                                                                         0,iter->id,iter->id) ;
+                                                                        an_array[1]*2 / ((double) num_control - 1),
+                                                                                                3,first_seq.id,second_seq.id,my_iter->id,0) ;
+                                
                         }
                         
@@ -61 +72 @@
                 }
         }
-        return(vect) ;
+return(vect) ;
 }
         

luc/trunk/gen_seq.hpp

@@ -206 +206 @@
 
 vector<Count>::iterator quel_type(vector<Count> n_conta, int * id1, int * id2) ;
+
+bool indic_iter(vector<Count>::iterator itera1,vector<Count>::iterator itera2) ;

luc/trunk/gen_seq_mod.cpp

@@ -430 +430 @@
         objet.taux = T ;
         objet.type_eve = ty ;
-        objet.enfant1 = nom1 ;
-        objet.enfant2 = nom2 ;
+        objet.enfant1 = enf1 ;
+        objet.enfant2 = enf2 ;
         objet.parent1 = par1 ;
         objet.parent2 = par2 ;

luc/trunk/vectorized_gen_seq.cpp

@@ -144 +144 @@
         return(Proba) ;
 }
-        
 
 vector<Count>::iterator quel_type(vector<Count> n_conta, int * id1, int * id2) {
@@ -151 +150 @@
         
         for (int i = 0 ; i<9; i++) {
-                if (id1[i] == 0) id_glob_tot = id_glob_tot + id2[i]*pow(10,i) ;
-                else id_glob_tot = id_glob_tot + id1[i]*pow(10,i) ;
+                if (id1[i] == 0) id_glob_tot = id_glob_tot + id2[i]*(int) pow(10,i) ;
+                else id_glob_tot = id_glob_tot + id1[i]* (int) pow(10,i) ;
         }
         
         return (find_count(n_conta, id_glob_tot)) ;
 }
-                                                
-