##// END OF EJS Templates
added recarray conversion -- may still be copying
Jonathan Taylor -
Show More
@@ -184,6 +184,10 b' class RMagics(Magics):'
184 '''
184 '''
185 outputs = line.split(' ')
185 outputs = line.split(' ')
186 for output in outputs:
186 for output in outputs:
187 if self.r("is.data.frame({0})".format(output))[0]:
188 o = np.rec.fromarrays(self.r(output), names = tuple(self.r(output).names))
189 self.shell.push({output:self.Rconverter(o)})
190 else:
187 self.shell.push({output:self.Rconverter(self.r(output))})
191 self.shell.push({output:self.Rconverter(self.r(output))})
188
192
189
193
@@ -371,7 +375,10 b' class RMagics(Magics):'
371
375
372 if args.output:
376 if args.output:
373 for output in ','.join(args.output).split(','):
377 for output in ','.join(args.output).split(','):
374 # with self.shell, we assign the values to variables in the shell
378 if self.r("is.data.frame({0})".format(output))[0]:
379 o = np.rec.fromarrays(self.r(output), names = tuple(self.r(output).names))
380 self.shell.push({output:self.Rconverter(o)})
381 else:
375 self.shell.push({output:self.Rconverter(self.r(output))})
382 self.shell.push({output:self.Rconverter(self.r(output))})
376
383
377 for tag, disp_d in display_data:
384 for tag, disp_d in display_data:
General Comments 0
You need to be logged in to leave comments. Login now