[Thuban-list] [Patch] Custom+automatic classifiers

[Moritz Lennert]

Daniel Calvelo Aros said:
> Hi.
>
> And last but not least, the custom breaks classifier. This one needs
support
> files contained in the tar.gz archive, and this patch should be applied
*after* the previous two.
>

I just tried applying the patch directly to a fresh cvs tree without
applying one of the other two patches and it seems that the
incompatibility is with the cvs tree and not with class-discont.patch:

patch -p0 < class-custom+auto.patch
patching file thuban/Thuban/Model/classgen.py
Hunk #1 FAILED at 336.
Hunk #2 succeeded at 311 with fuzz 2 (offset -199 lines).
1 out of 2 hunks FAILED -- saving rejects to file
thuban/Thuban/Model/classgen.py.rej
patching file thuban/Thuban/UI/classgen.py
Hunk #1 succeeded at 18 (offset -1 lines).
Hunk #2 FAILED at 27.
Hunk #3 FAILED at 49.
Hunk #4 FAILED at 107.
Hunk #5 FAILED at 235.
Hunk #6 FAILED at 300.
Hunk #7 FAILED at 326.
Hunk #8 FAILED at 972.
Hunk #9 succeeded at 1066 with fuzz 2 (offset -145 lines).
7 out of 9 hunks FAILED -- saving rejects to file
thuban/Thuban/UI/classgen.py.rej

with thuban/Thuban/Model/classgen.py.rej:

***************
*** 336,341 ****
                  [(q, (q - minIndex+1) / float(numValues)) \
                   for q in quantiles])

  # TODO: implement Jenks & Caspall completely.

  if not  __builtins__.has_key("sum"): # Python < 2.3
--- 336,342 ----
                  [(q, (q - minIndex+1) / float(numValues)) \
                   for q in quantiles])

+
  # TODO: implement Jenks & Caspall completely.


and thuban/Thuban/UI/classgen.py.rej attached.


So, Daniel, would it be possible to create one patch containing all your
latest changes against a fresh CVS tree ? Right now, I cannot combine the
new version of the discont method with your other classification methods,
not with the hsv patch.

Moritz

Moritz

-------------- next part --------------
A non-text attachment was scrubbed...
Name: classgen.py.rej
Type: application/octet-stream
Size: 11312 bytes
Desc: not available
Url : http://www.intevation.de/pipermail/thuban-list/attachments/20040223/53bd109f/classgen.py.rej