Changeset 554 for trunk/test/crossvalidation_test.cc

Timestamp:

Mar 7, 2006, 3:22:29 PM (17 years ago)

Author:

Markus Ringnér

Message:

added small test

File:

• trunk/test/crossvalidation_test.cc (modified) (3 diffs)

trunk/test/crossvalidation_test.cc

@@ -145 +145 @@
       }     
 
+      std::vector<size_t> tv_sample_count(6,0);
       for (size_t i=0; i<t_index.size(); i++) {
         assert(t_index[i]<t_sample_count.size());
+        tv_sample_count[t_index[i]]++;
         t_sample_count[t_index[i]]++;
         t_class_count[t_target(i)]++;
         t_class_count2[tv_target(t_index[i])]++;
         t_value[0]+=t_view(0,i);
-        t_value[t_target(i)+1]+=t_view(0,i);
+        t_value[t_target(i)+1]+=t_view(0,i);        
       }
       for (size_t i=0; i<v_index.size(); i++) {
         assert(v_index[i]<v_sample_count.size());
+        tv_sample_count[v_index[i]]++;
         v_sample_count[v_index[i]]++;
         v_class_count[v_target(i)]++;
@@ -160 +163 @@
         v_value[v_target(i)+1]+=v_view(0,i);
       }
+  
+      sample_count_test(tv_sample_count,error,ok);      
 
       cv_training.next();     
@@ -240 +245 @@
     if (sample_count[i]!=1){
       ok = false;
-      *error << "ERROR: sample " << i << " was validated " << sample_count[i] 
+      *error << "ERROR: sample " << i << " was in a group " << sample_count[i] 
              << " times." << " Expected to be 1 time" << std::endl;
     }