Просмотр исходного кода

cycle: continue even no mechanisms but break if no behaviour

Bastien Sevajol 8 лет назад
Родитель
Сommit
1b8ab31f8a
1 измененных файлов: 17 добавлений и 15 удалений
  1. 17 15
      synergine2/cycle.py

+ 17 - 15
synergine2/cycle.py Просмотреть файл

198
 
198
 
199
         for subject in subjects:
199
         for subject in subjects:
200
             mechanisms = self.get_mechanisms_to_compute(subject)
200
             mechanisms = self.get_mechanisms_to_compute(subject)
201
-            if not mechanisms:
202
-                break
203
-
204
-            self.logger.info('Subject {}: {} mechanisms'.format(
205
-                str(subject.id),
206
-                str(len(mechanisms)),
207
-            ))
208
 
201
 
209
-            if self.logger.is_debug:
210
-                self.logger.info('Subject {}: mechanisms are: {}'.format(
202
+            if mechanisms:
203
+                self.logger.info('Subject {}: {} mechanisms'.format(
211
                     str(subject.id),
204
                     str(subject.id),
212
-                    str([m.repr_debug for m in mechanisms])
205
+                    str(len(mechanisms)),
213
                 ))
206
                 ))
214
 
207
 
208
+                if self.logger.is_debug:
209
+                    self.logger.info('Subject {}: mechanisms are: {}'.format(
210
+                        str(subject.id),
211
+                        str([m.repr_debug for m in mechanisms])
212
+                    ))
213
+
215
             mechanisms_data = {}
214
             mechanisms_data = {}
216
             behaviours_data = {}
215
             behaviours_data = {}
217
 
216
 
226
 
225
 
227
                 mechanisms_data[type(mechanism)] = mechanism_data
226
                 mechanisms_data[type(mechanism)] = mechanism_data
228
 
227
 
229
-            if self.logger.is_debug:
230
-                self.logger.info('Subject {}: mechanisms data are: {}'.format(
231
-                    str(subject.id),
232
-                    str(mechanisms_data),
233
-                ))
228
+            if mechanisms:
229
+                if self.logger.is_debug:
230
+                    self.logger.info('Subject {}: mechanisms data are: {}'.format(
231
+                        str(subject.id),
232
+                        str(mechanisms_data),
233
+                    ))
234
 
234
 
235
             subject_behaviours = self.get_behaviours_to_compute(subject)
235
             subject_behaviours = self.get_behaviours_to_compute(subject)
236
+            if not subject_behaviours:
237
+                break
236
 
238
 
237
             self.logger.info('Subject {}: have {} behaviours'.format(
239
             self.logger.info('Subject {}: have {} behaviours'.format(
238
                 str(subject.id),
240
                 str(subject.id),