Merge branch 'master' into xp/A1-synthetic-raw-long-1

arcades/environment/states/datasource/labelled/AnnotatedLabelledDataProvider.lua

@@ -11,20 +11,25 @@ local class, super = torch.class(
   'DataSource',
   module)
 
-function class:__init(args)
-  super.__init(self, args)
+function class:__init(args, dump)
+  super.__init(self, args, dump)
+  args = args or {}; dump = dump or {}
   self.environment_model = args.environment_model
   self.data_path = args.data_path
-  self.logger:debug("Loading data from '%s'", self.data_path)
-  self.data = self:_parse_data(self.data_path)
+  if dump.data then
+    self.data = dump.data
+  else
+    self._logger:debug("Loading data from '%s'", self.data_path)
+    self.data = self:_parse_data(self.data_path)
+  end
   --- ID (subject index, event index) of the last returned state
   -- @within Attributes
   -- @tfield number self.last_state[1] Subject ID
   -- @tfield number self.last_state[2] Event ID
   -- @table self.last_state
-  self.last_state = {1,0}
+  self.last_state = dump.last_state or {1,0}
   self.max_tries = args.max_tries or 1
-  self.remaining_tries = args.remaining_tries or self.max_tries
+  self.remaining_tries = dump.remaining_tries or self.max_tries
 end