error in calculating percentages in clocktables

error in calculating percentages in clocktables

[Joost Helberg]

ls,

I'm using clocktables and encountered an issue in calculating the
percentage in the last column. Some columns have moved 1 left in the
head-revision, but the generated formula was not changed. 
Hence the following patch. The percentages come out OK with this
patch. 

Can someone using clocktables verify that this patch is correct and
doesn't break other stuff? 

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index eb859df..0c7c73b 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2173,9 +2173,9 @@ from the dynamic block defintion."
 	     (format
 	      "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
 	      pcol
-	      (+ 2 (if narrow 1 0))
-	      (+ 3 (if multifile 1 0))
-	      (+ (if multifile 1 0) 3)
+	      (+ 1 (if narrow 1 0))
+	      (+ 2 (if multifile 1 0))
+	      (+ (if multifile 1 0) 2)
 	      (1- pcol)))
 	    (setq recalc t))
 	   ((stringp formula)

regards,

Joost Helberg

-- 
Snow B.V.        http://snow.nl

Re: error in calculating percentages in clocktables

[Carsten Dominik]

Hi Joost,

thanks for this, but the new tables are complex and the patch was not  
general enough.  I have just pushed a fix which I think is correct.   
Please verify.

- Carsten

On Nov 29, 2010, at 11:56 AM, Joost Helberg wrote:

> ls,
>
> I'm using clocktables and encountered an issue in calculating the
> percentage in the last column. Some columns have moved 1 left in the
> head-revision, but the generated formula was not changed.
> Hence the following patch. The percentages come out OK with this
> patch.
>
> Can someone using clocktables verify that this patch is correct and
> doesn't break other stuff?
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index eb859df..0c7c73b 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -2173,9 +2173,9 @@ from the dynamic block defintion."
> 	     (format
> 	      "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
> 	      pcol
> -	      (+ 2 (if narrow 1 0))
> -	      (+ 3 (if multifile 1 0))
> -	      (+ (if multifile 1 0) 3)
> +	      (+ 1 (if narrow 1 0))
> +	      (+ 2 (if multifile 1 0))
> +	      (+ (if multifile 1 0) 2)
> 	      (1- pcol)))
> 	    (setq recalc t))
> 	   ((stringp formula)
>
> regards,
>
> Joost Helberg
>
> -- 
> Snow B.V.        http://snow.nl
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

- Carsten

Re: error in calculating percentages in clocktables

[Joost Helberg]

Carsten,

your more general approach works fine for me. The pushed fix seems
allright. 

many regards,

Joost

>>>>> "Carsten" == Carsten Dominik <carsten.dominik@gmail.com> writes:
 > Subject: Re: [Orgmode] error in calculating percentages in clocktables
 > From: Carsten Dominik <carsten.dominik@gmail.com>
 > To: Joost Helberg <joost@snow.nl>
 > Cc: emacs-orgmode@gnu.org
 > Date: Fri, 3 Dec 2010 09:52:57 +0100

 > Hi Joost,

 > thanks for this, but the new tables are complex and the patch was not
 > general enough.  I have just pushed a fix which I think is correct.
 > Please verify.

 > - Carsten

 > On Nov 29, 2010, at 11:56 AM, Joost Helberg wrote:

 >> ls,
 >> 
 >> I'm using clocktables and encountered an issue in calculating the
 >> percentage in the last column. Some columns have moved 1 left in the
 >> head-revision, but the generated formula was not changed.
 >> Hence the following patch. The percentages come out OK with this
 >> patch.
 >> 
 >> Can someone using clocktables verify that this patch is correct and
 >> doesn't break other stuff?
 >> 
 >> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
 >> index eb859df..0c7c73b 100644
 >> --- a/lisp/org-clock.el
 >> +++ b/lisp/org-clock.el
 >> @@ -2173,9 +2173,9 @@ from the dynamic block defintion."
 >> (format
 >> "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
 >> pcol
 >> -	      (+ 2 (if narrow 1 0))
 >> -	      (+ 3 (if multifile 1 0))
 >> -	      (+ (if multifile 1 0) 3)
 >> +	      (+ 1 (if narrow 1 0))
 >> +	      (+ 2 (if multifile 1 0))
 >> +	      (+ (if multifile 1 0) 2)
 >> (1- pcol)))
 >> (setq recalc t))
 >> ((stringp formula)
 >> 
 >> regards,
 >> 
 >> Joost Helberg
 >> 
 >> -- 
 >> Snow B.V.        http://snow.nl
 >> 
 >> _______________________________________________
 >> Emacs-orgmode mailing list
 >> Please use `Reply All' to send replies to the list.
 >> Emacs-orgmode@gnu.org
 >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

 > - Carsten




-- 
Snow B.V.        http://snow.nl

Re: error in calculating percentages in clocktables

[Carsten Dominik]

Hi Joost,

thanks for your fast reaction and the testing.

- Carsten

On Dec 3, 2010, at 11:13 AM, Joost Helberg wrote:

> Carsten,
>
> your more general approach works fine for me. The pushed fix seems
> allright.
>
> many regards,
>
> Joost
>
>>>>>> "Carsten" == Carsten Dominik <carsten.dominik@gmail.com> writes:
>> Subject: Re: [Orgmode] error in calculating percentages in  
>> clocktables
>> From: Carsten Dominik <carsten.dominik@gmail.com>
>> To: Joost Helberg <joost@snow.nl>
>> Cc: emacs-orgmode@gnu.org
>> Date: Fri, 3 Dec 2010 09:52:57 +0100
>
>> Hi Joost,
>
>> thanks for this, but the new tables are complex and the patch was not
>> general enough.  I have just pushed a fix which I think is correct.
>> Please verify.
>
>> - Carsten
>
>> On Nov 29, 2010, at 11:56 AM, Joost Helberg wrote:
>
>>> ls,
>>>
>>> I'm using clocktables and encountered an issue in calculating the
>>> percentage in the last column. Some columns have moved 1 left in the
>>> head-revision, but the generated formula was not changed.
>>> Hence the following patch. The percentages come out OK with this
>>> patch.
>>>
>>> Can someone using clocktables verify that this patch is correct and
>>> doesn't break other stuff?
>>>
>>> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
>>> index eb859df..0c7c73b 100644
>>> --- a/lisp/org-clock.el
>>> +++ b/lisp/org-clock.el
>>> @@ -2173,9 +2173,9 @@ from the dynamic block defintion."
>>> (format
>>> "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
>>> pcol
>>> -	      (+ 2 (if narrow 1 0))
>>> -	      (+ 3 (if multifile 1 0))
>>> -	      (+ (if multifile 1 0) 3)
>>> +	      (+ 1 (if narrow 1 0))
>>> +	      (+ 2 (if multifile 1 0))
>>> +	      (+ (if multifile 1 0) 2)
>>> (1- pcol)))
>>> (setq recalc t))
>>> ((stringp formula)
>>>
>>> regards,
>>>
>>> Joost Helberg
>>>
>>> -- 
>>> Snow B.V.        http://snow.nl
>>>
>>> _______________________________________________
>>> Emacs-orgmode mailing list
>>> Please use `Reply All' to send replies to the list.
>>> Emacs-orgmode@gnu.org
>>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>
>> - Carsten
>
>
>
>
> -- 
> Snow B.V.        http://snow.nl

- Carsten