Dan Davison
1e4c3389b6
As was just done for branch master, removing all support for hlines/colnames -- they persist in branch rowcolnames. Also removing comments. These should never have been present in this branch.
2009-06-06 18:12:42 -04:00
Eric Schulte
b533d9d446
cleaned up org-babel-comint and removed helper functions
2009-06-03 20:52:01 -07:00
Eric Schulte
fe75562a64
org-babel-comint is basically working
2009-06-03 20:51:36 -07:00
Eric Schulte
e1aeec8ab1
begun implementing org-babel-comint
...
a collection of functions to simplify interaction with comint-mode
buffers
2009-06-03 20:18:18 -07:00
Eric Schulte
c175d3ce0d
playing with org-babel-script and comint buffers/functions
2009-06-03 17:37:50 -07:00
Eric Schulte
2a663b9e09
R is now using last output (with default session) and passing all tests
2009-06-03 15:59:27 -07:00
Eric Schulte
49db1e523c
Merge branch 'master' into session
...
Conflicts:
org-babel.org
2009-06-03 15:30:10 -07:00
Eric Schulte
39f7174884
Revert "Revert "Make org table result have header row and hline when appropriate...""
...
This reverts commit dff01091dc
.
Yes, this is a reversion of a reversion, as the original commit has
been reverted in the master branch, I'm now just going to revert the
reversion and then merge with master to maintain inter-branch
cohesion.
oh, did I mention... "revert"
2009-06-03 15:26:32 -07:00
Eric Schulte
b1c103890c
*even more* discussion of session implementation issues
2009-06-03 15:23:45 -07:00
Dan Davison
8ac2a7daa6
Added another multilingual example. One issue is that spaces in the string cause vector output.
2009-06-03 12:33:58 -04:00
Dan Davison
02b265b2e3
Reverted tentative and hackish support for hline in R output. I have left a commented line and an unused function while I am thinking about this, and pending me learning git better. However I haven't yet reverted the ability of R to recognise hlines in var references, so the grades example still works. All sbe tests are passed.
2009-06-03 12:09:52 -04:00
Dan Davison
21d01aea91
Some notes on possible support for named fields / rows / columns in org-babel and supported languages. These are just preliminary and don't outline a solution. My feeling is that this will require a bit more thought to avoid being an unrigorous hack.
2009-06-03 11:32:24 -04:00
Eric Schulte
bbf89dea08
fixed type in org-babel.org
2009-06-02 20:50:10 -07:00
Eric Schulte
dccbe633c9
discuss complication of mixing functional and imperative block evaluation
2009-06-02 20:34:20 -07:00
Eric Schulte
dff01091dc
Revert "Make org table result have header row and hline when appropriate..."
...
This reverts commit e4263daf76
.
I'm reverting this commit in the sesion branch because it is breaking
the tests for R, as it no longer allows R source code blocks to return
scalar values. Hopefully this issue will be fixed in the master
branch before I merge the session branch back in.
2009-06-02 16:29:30 -07:00
Eric Schulte
517253a2d0
beginning to add sessions
2009-06-02 16:28:56 -07:00
Eric Schulte
bba80bb837
working on sessions
2009-06-02 16:26:57 -07:00
Eric Schulte
f383f7e30c
added integration directory for org-tangle (from Eric N.'s into email)
2009-06-02 15:31:26 -07:00
Dan Davison
0df550d84c
Minor updates and responses in the sessions planning subtree.
2009-06-02 16:45:31 -04:00
Eric Schulte
37758310e0
planning *session* task order, and separating "*Org Edit Src Example* buffer" tasks
2009-06-01 17:58:37 -07:00
Eric Schulte
fcd5e8f272
fleshing out the *sessions* discussion and TODOs
2009-06-01 17:28:34 -07:00
Eric Schulte
c38294d21f
DONE Remove protective commas from # comments before evaluating
2009-06-01 16:56:59 -07:00
Dan Davison
8fef1f0509
More notes on sessions: need for header arg evaluation when we edit code, and need for removing protective commas
2009-06-01 15:14:35 -04:00
Dan Davison
f03e3ed603
Further notes on org-babel session and ESS and *Org Edit Src Example* buffers.
2009-05-31 18:07:13 -04:00
Dan Davison
ce96d45374
Added reminder/request that we bear ESS in mind when designing org-babel 'sessions'
2009-05-31 17:48:00 -04:00
Dan Davison
e4263daf76
Make org table result have header row and hline when appropriate. (This should have been included with commit a39d68640e
). The approach I've taken is to make R always write the column names into the tsv file. If the result does not have user-supplied column-names, then R writes default column names of the form V1,V2,...,V$numcols. After reading the tsv back into lisp, we check whether it has "real" column names or the R defaults. If it has real column names, then I give the org table an hline.
...
I expect this will conflict with Eric's work on sessions, but we can deal with that.
There is a remaining quoting issue that needs to be dealt
with. E.g. with an unquoted string in the input, it comes out as
quoted in the result. This seems bad, since if you use the output as
new input you get something different (with extra
quoting). (non-idempotence if that's the right term).
| col1 | col2 | col3 |
|------+---------+------|
| 1 | 2 | 3 |
| 4 | schulte | 6 |
tabel
| "col1" | "col2" | "col3" |
|--------+-----------+--------|
| 1 | 2 | 3 |
| 4 | "schulte" | 6 |
2009-05-30 16:45:26 -04:00
Dan Davison
eb29bef93f
Made org-babel-remove-result interactive. Eric if you agree do you want to decide on a binding?
2009-05-30 15:59:46 -04:00
Dan Davison
e7f860cb19
Altered the python code in the chained references example. AIui the example was producing the correct answer (ruby class Array) but for the wrong reason (python was returning None)
2009-05-30 15:01:55 -04:00
Dan Davison
a39d68640e
Allowing org-tables with hline to be referred to and passed into R. If hline is present, the first row of the table becomes the column names in R. This allows the grades example to run for me which was not true before. Eric: any commits I make should be viewed as tentative -- feel free to reject or recode them.
2009-05-30 15:00:06 -04:00
Dan Davison
2ca59eaa0f
Preventing end of buffer error when no newline after #+end_src
2009-05-29 23:34:50 -04:00
Eric Schulte
f87a673c9c
replacing parts of org-babel lost in a merge
...
namely some extended discussion of environments and sessions under
the "Create objects in top level (global) environment in R?" header
2009-05-29 18:01:38 -07:00
Eric Schulte
d49084b73d
small additions to org-babel-comint.el
2009-05-29 17:45:40 -07:00
Eric Schulte
2fe76cd094
adding discussion to PROPOSED conversion between org-babel and noweb (e.g. .Rnw) format
2009-05-29 17:45:25 -07:00
Eric Schulte
986fcb4652
DONE pass multiple reference arguments into R
...
This should be working, see the following example...
n + m
: 10
2009-05-29 16:45:03 -07:00
Eric Schulte
8967366a3b
back to the working version
2009-05-29 16:44:33 -07:00
Dan Davison
fe22667f78
proposed org-babel <-> noweb interconversions
2009-05-29 16:22:09 -04:00
Dan Davison
8deae3517b
Trying to resolve conflict while understanding very little about git
2009-05-29 16:21:12 -04:00
Dan Davison
2adb00f678
proposed org-babel <-> noweb interconversions
2009-05-29 16:17:03 -04:00
Eric Schulte
e8e24c024b
added TODO fully purge org-babel-R of direct comint interaction
2009-05-27 19:01:29 -07:00
Eric Schulte
c5a58ad6aa
moving generalized comint functions to new file org-babel-comint.el
2009-05-27 19:00:13 -07:00
Eric Schulte
a54c27ec91
attempts at improving sb snippet
2009-05-27 18:42:15 -07:00
Eric Schulte
aca19b2efc
added my session thoughts for global variables
2009-05-27 16:40:47 -07:00
Eric Schulte
906c524234
Merge branch 'master' of git@github.com:eschulte/org-babel
...
Conflicts:
org-babel.org
2009-05-27 16:40:26 -07:00
Eric Schulte
2c3c91ed12
removed org-babel-ui (tabbing blocks) as the functionality will be included in org-mode core
2009-05-27 16:34:48 -07:00
Eric Schulte
2d1a5405d1
added task for improving the sb snippet
2009-05-27 16:33:22 -07:00
Dan Davison
5db027b3e1
Noted in hline TODO that plotting histogram in the grades example is blocked by not being able to deal with hline in the input table. (AIUI)
2009-05-26 19:40:47 -04:00
Dan Davison
57783f9ce2
A few new TODOS: deal with hlines in tables, how do we pass multiple args in R, and some extended wittering about scoping issues in R: basically I want to argue for not abandoning the Sweave-style mode where objects created in code blocks are persisten across different blocks.
2009-05-26 19:16:46 -04:00
Eric Schulte
db9f189649
fixed bug: DONE R-code broke on "org-babel" rename
2009-05-25 19:23:30 -07:00
Eric Schulte
aec7ec05d3
more fleshing out of the introduction
2009-05-25 18:20:32 -07:00
Eric Schulte
b5174f5a7d
misc changes
2009-05-25 15:13:56 -07:00