Changeset 3365

Timestamp:

05/15/08 15:12:51 (2 months ago)

Author:

hana

Message:

(hana) a bug in remove_rows_from_data fixed

Files:

• trunk/opus_core/choice_model.py (modified) (3 diffs)

trunk/opus_core/choice_model.py

@@ -646 +646 @@
         return self.submodel_coefficients[submodel]
         
-    def remove_rows_from_data(self, where_not_remove, submodel):
-        self.data[submodel] = compress(where_not_remove, self.data[submodel], axis=0)
+    def remove_rows_from_data(self, where_not_remove, submodel, idx):
+        self.data[submodel][idx] = compress(where_not_remove, self.data[submodel][idx], axis=0)
         
     def get_data(self, submodel):
@@ -703 +703 @@
             if False in where_not_remove:
                 is_submodel_selected_choice[i] = compress(where_not_remove, is_submodel_selected_choice[i], axis=0)
-                self.remove_rows_from_data(where_not_remove, submodel)
+                self.remove_rows_from_data(where_not_remove, submodel, i)
 
         if self.number_of_choice_sets == 1:
@@ -720 +720 @@
     def is_there_data(self, submodel):
         for i in range(self.number_of_choice_sets):
-           if (self.data[submodel][i].shape[0] <= 0) or (self.data[submodel][i].size <= 0):
-               return False
+            if (self.data[submodel][i].shape[0] <= 0) or (self.data[submodel][i].size <= 0):
+                return False
         return True