| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** JLP has quit IRC | 00:01 | |
| CIA-28 | pluskid schemepy * r9a13c89637cf / (3 files in 2 dirs): | 00:12 |
|---|---|---|
| CIA-28 | Fixed the circular list problem in mzscheme backend. | 00:12 |
| CIA-28 | A circular list shouldn't cause the backend going | 00:12 |
| CIA-28 | into an infinite loop. | 00:12 |
| *** jmtan has joined #tp | 00:18 | |
| mithro | hey jmtan | 00:27 |
| mithro | ~seen Epyon_ | 00:27 |
| tpb | mithro: Epyon_ was last seen in #tp 2 hours, 43 minutes, and 19 seconds ago: <Epyon_> Pain | 00:27 |
| jmtan | hi | 00:27 |
| mithro | how goes everything? | 00:27 |
| jmtan | i'm downloading vega strike now, i plan to try out the ship models | 00:28 |
| mithro | okay | 00:28 |
| mithro | jmtan: can you poke Epyon a bit | 00:28 |
| mithro | he has some cool models we should be using | 00:29 |
| jmtan | oh okay | 00:29 |
| mithro | but using vega strike models is okay too | 00:29 |
| jmtan | are his models for download somewhere? | 00:29 |
| mithro | I think we have them in our media repository | 00:30 |
| mithro | http://svn.thousandparsec.net/cgi-bin/viewcvs.cgi/media/concepts/ships/ | 00:31 |
| tpb | <http://ln-s.net/1tv5> (at svn.thousandparsec.net) | 00:31 |
| mithro | http://svn.thousandparsec.net/cgi-bin/viewcvs.cgi/media/concepts/ships/battleship/renders/tp_battleship_01.png?rev=26&view=markup | 00:32 |
| tpb | <http://ln-s.net/1tv6> (at svn.thousandparsec.net) | 00:32 |
| jmtan | cool, i will put those in! | 00:32 |
| mithro | they might not be in a format you can use at the moment | 00:33 |
| jmtan | that's ok | 00:34 |
| jmtan | i think there are converters for 3ds to ogre | 00:34 |
| mithro | there possible are, but I think you need 3ds? | 00:35 |
| jmtan | there is a 3ds converter http://www.ogre3d.org/wiki/index.php/3DS2Mesh but i have not tried it before | 00:37 |
| tpb | Title: 3DS2Mesh - Ogre Wiki (at www.ogre3d.org) | 00:37 |
| mithro | guess we will find out what happens :) | 00:39 |
| mithro | any chance of some impressive looking planet/start graphics too? | 00:49 |
| mithro | s/starts/stars/ | 00:49 |
| jmtan | yeah, i will definitely change those as well, once the ships are in | 00:51 |
| jmtan | weird, i thought i saw the files as .3ds instead of .max format :( | 00:57 |
| jmtan | i'm asking my friend to help me convert it now | 01:00 |
| mithro | okay cool | 01:08 |
| pluskid | mithro: have you installed mzscheme on your Ubuntu box? (Ubuntu IIRC) | 01:13 |
| mithro | I can install it pretty easily | 01:13 |
| pluskid | so what version is it in Ubuntu? | 01:13 |
| pluskid | mine is version 360 | 01:14 |
| pluskid | mithro: and what's the result of "ls /usr/lib/libmz*" ? | 01:14 |
| *** JLafont has quit IRC | 01:14 | |
| mithro | installing now | 01:14 |
| pluskid | cool | 01:15 |
| mithro | Get:1 http://au.archive.ubuntu.com hardy/universe mzscheme 1:372-1ubuntu1 [5749kB] | 01:15 |
| tpb | Title: Index of / (at au.archive.ubuntu.com) | 01:15 |
| mithro | do you want me to run tests? | 01:17 |
| pluskid | no | 01:18 |
| pluskid | I just want to know what version is common | 01:18 |
| pluskid | there are two memory model in mzscheme: CGC and 3m | 01:18 |
| pluskid | it is said in the doc 3m is popular those days and is the default one | 01:19 |
| *** JLafont has joined #tp | 01:19 | |
| pluskid | but I have only CGC on my Debian box | 01:19 |
| pluskid | with apt-get installed mzscheme | 01:19 |
| pluskid | of course it is not the latest version | 01:19 |
| mithro | http://pastebin.ca/1036529 | 01:19 |
| tpb | Title: general pastebin - Something - post number 1036529 (at pastebin.ca) | 01:19 |
| mithro | morning JLafont | 01:19 |
| pluskid | mithro: so you don't have libmzscheme ? | 01:21 |
| *** Alklomion has joined #tp | 01:21 | |
| mithro | tim@vaio:~$ dpkg --listfiles mzscheme | grep libmzscheme | 01:22 |
| mithro | /usr/lib/libmzscheme3m-372.so | 01:22 |
| mithro | /usr/lib/libmzscheme3m.la | 01:22 |
| mithro | /usr/lib/libmzscheme3m.so | 01:22 |
| pluskid | Oops, yours are 3m files | 01:22 |
| mithro | hi Alklomion | 01:22 |
| Alklomion | hi mithro | 01:22 |
| mithro | what is 3m? | 01:22 |
| pluskid | a newer memory model of mzscheme | 01:23 |
| pluskid | mithro: what is mzscheme -v ? | 01:23 |
| mithro | tim@vaio:~/oss/tp/schemepy/schemepy/mzscheme$ mzscheme -v | 01:23 |
| mithro | Welcome to MzScheme v372 [3m], Copyright (c) 2004-2007 PLT Scheme Inc. | 01:23 |
| pluskid | hmm, seems mine is too old. | 01:23 |
| mithro | what happens if I just link against the 3m version? | 01:24 |
| pluskid | I don't know. Maybe crash... | 01:24 |
| pluskid | I'm writing a followup of status report. I'll explain this in that post | 01:25 |
| pluskid | maybe I'll need to find a newer version of mzscheme and re-write some parts of the backend | 01:25 |
| mithro | it segfaults :( | 01:25 |
| pluskid | mzscheme should keep backward compatibility and keep the old CGC model even if he think 3m model is more advanced. :/ | 01:26 |
| mithro | http://pastebin.ca/1036532 | 01:26 |
| tpb | Title: general pastebin - Something - post number 1036532 (at pastebin.ca) | 01:26 |
| mithro | Alklomion: I'm assuming you got my email? | 01:28 |
| Alklomion | When did you send it? | 01:31 |
| Alklomion | aah - 15 minutes ago | 01:32 |
| mithro | pluskid: did you see the stuff above? | 01:36 |
| mithro | (the pastebin) | 01:36 |
| pluskid | mithro: yes, I see. | 01:36 |
| pluskid | mithr: you said it segfaulted. | 01:36 |
| mithro | okay | 01:36 |
| mithro | oh, sorry | 01:37 |
| mithro | I thought I had included the traceback | 01:37 |
| pluskid | alright, I just found the newer version of mzscheme in the unstable Debian repo | 01:37 |
| pluskid | I'll try to fix them later (though it seems some parts may need totally re-written) | 01:38 |
| mithro | http://pastebin.ca/1036557 | 01:40 |
| tpb | Title: general pastebin - Something - post number 1036557 (at pastebin.ca) | 01:40 |
| mithro | that is a traceback | 01:40 |
| mithro | do you know if you are compatible with guile 1.6 and 1.8 or only 1.8? | 01:40 |
| pluskid | only 1.8 currently | 01:41 |
| pluskid | it seems to be failed at the very begining of initializing mzscheme | 01:44 |
| Alklomion | Mithro: there was only one action item: to have the libtpproto-midp compiling by the end of this week? | 01:44 |
| mithro | Alklomion: and the other status report bits | 01:44 |
| mithro | http://www.thousandparsec.net/~irc/logs/%23tp.2008-05-29.log.html#t2008-05-29T21:30:57 | 01:46 |
| tpb | <http://ln-s.net/1tv:> (at www.thousandparsec.net) | 01:46 |
| Alklomion | mithro: its looking better than friday, I've only been home ~30 minutes, but i whacked out a lot of errors while i'm thinking well :) | 01:47 |
| mithro | Alklomion: that is good | 01:48 |
| Alklomion | there's a few major errors left in URI. | 01:49 |
| Alklomion | References to some regex stuff that doesn't exist in J2ME, URL class and a Pattern class | 01:50 |
| mithro | Alklomion: we went over what you need to do with the regex stuff | 01:56 |
| CIA-28 | pluskid schemepy * r679ffa95f8d0 /doc/log_book/todo/06-02-handle-exception-when-calling-python-from-scheme.txt: Added task for handling exceptions from Python in Scheme. | 01:56 |
| Alklomion | yep - rewrite URI so it doesn't use regex | 01:58 |
| mithro | Alklomion: yeah | 01:59 |
| Alklomion | So... | 01:59 |
| Alklomion | Now i need to work out what it is using the regex for and change it | 02:00 |
| Alklomion | obviously for string patterns | 02:00 |
| mithro | to split apart a string which looks like this | 02:00 |
| mithro | protocol://username:password@host:port/location | 02:01 |
| mithro | where username, password and port are all optional | 02:01 |
| llnz | bbl | 02:02 |
| *** llnz has quit IRC | 02:02 | |
| mithro | jmtan: a good background image might be good too :) | 02:06 |
| Alklomion | mithro: those are the only elements i need to be concerned with? | 02:07 |
| mithro | Alklomion: I'm pretty sure there are not any more | 02:07 |
| jmtan | mithro: very true, i'm deciding between a better skybox or a particle system for stars | 02:08 |
| mithro | ohh, particle system - shiny ;) | 02:08 |
| mithro | You have till thursday | 02:09 |
| jmtan | yeah i know, would that be friday in singapore? :) | 02:09 |
| Alklomion | mithro: i think there's a query element on the end | 02:09 |
| Alklomion | that uses ? | 02:09 |
| mithro | Alklomion: we don't use that | 02:09 |
| mithro | jmtan: i'm currently still on Sunday 11:17pm | 02:10 |
| jmtan | wow it's like monday 2pm here | 02:10 |
| jmtan | thank goodness i guess | 02:11 |
| CIA-28 | alklomion /tmp/7os2qdH0i5/qMgwy0F1Iz-midp * rf9077cea3c4b /src/net/thousandparsec/util/URI.java: | 02:22 |
| CIA-28 | Initial version of a URI class that will be changed to reflect the needs of libtpproto-midp | 02:22 |
| CIA-28 | via git-CVS emulator | 02:22 |
| CIA-28 | alklomion /tmp/dO00Wz1gHP/U3VWk0yjek-midp * r455979750720 /src/net/thousandparsec/util/URI.java: | 02:26 |
| CIA-28 | CPStringBuilder replaced with StringBuffers | 02:26 |
| CIA-28 | all StringBuffer.indexOf() replaced with StringBuffer.toString().indexOf(); so that code accesses the underlying string to work out the index of the pattern, as there is no indexOf() class in StringBuffer | 02:26 |
| CIA-28 | via git-CVS emulator | 02:26 |
| *** zzorn_laptop has joined #tp | 02:27 | |
| CIA-28 | alklomion /tmp/rqweyzZqqf/ZVVrsNqTC6-midp * rbabe21864f11 /src-generated/net/thousandparsec/netlib/tp03/TP03Decoder.java: | 02:37 |
| CIA-28 | Commented out some of the currently useless exception types, leaving only the implemented ones. | 02:37 |
| CIA-28 | via git-CVS emulator | 02:37 |
| CIA-28 | alklomion /tmp/SuYVORWa1q/skjN6T40B4-midp * r3eb0e10a49a9 /src/net/thousandparsec/netlib/Connection.java: | 02:38 |
| CIA-28 | Commented out some of the currently useless exception types, leaving only the implemented ones. | 02:38 |
| CIA-28 | via git-CVS emulator | 02:38 |
| CIA-28 | alklomion /tmp/8M19Rizx4o/0gUFkwZE7a-midp * rd5c934ccab59 /src/net/thousandparsec/netlib/PipelinedConnection.java: | 02:40 |
| CIA-28 | Changed the format of one of the missed mal-formed strings. | 02:40 |
| CIA-28 | Commented out some useless exceptions. | 02:40 |
| CIA-28 | Removed another generic that was previously missed. | 02:40 |
| CIA-28 | via git-CVS emulator | 02:40 |
| mithro | well I'm heading to bed | 02:42 |
| mithro | any last comments before I log off? | 02:42 |
| Alklomion | mithro: sending the status reporrt now, its pretty short, i hope that's all you need | 02:44 |
| pluskid | mithro: I've also write a follow up of the previous status report (pretty long) | 02:47 |
| mithro | reading it now | 02:47 |
| mithro | pluskid: btw, you might want to run your benchmarks for a little longer | 02:51 |
| mithro | the values are on the small side | 02:52 |
| mithro | which means it would be hard to make sure they are valid | 02:52 |
| pluskid | Yes | 02:52 |
| pluskid | I repeated them in the benchmark and the result is the mean value | 02:52 |
| mithro | how many times? | 02:52 |
| pluskid | 10 :p | 02:53 |
| pluskid | should be more :D | 02:53 |
| mithro | I recommend atleast 1,000 | 02:53 |
| mithro | I think some more self-reflection would be good too | 02:53 |
| mithro | (in your status report) | 02:53 |
| mithro | are things interesting? etc | 02:53 |
| mithro | it's looking pretty good otherwise | 02:54 |
| pluskid | OK, thanks! | 02:54 |
| mithro | you forgot to tag your follow up piece | 02:54 |
| pluskid | hn? I think I DO tagged as thousand parsec | 02:55 |
| mithro | hrm, it doesn't seem to be appearing in the GSoC feed | 02:55 |
| pluskid | don't know, maybe problem with wordpress or planet SOC feed aggregator | 02:55 |
| pluskid | or maybe it will take some time | 02:56 |
| mithro | well, I'll check again tommorrow | 02:56 |
| pluskid | OK, I'll also add some stuffs | 02:56 |
| pluskid | I forgot to write about the circular list problem | 02:57 |
| pluskid | And is it bearable to have a benchmark run 2~3 hours ? | 02:57 |
| mithro | sure, you don't run benchmarks all that often | 02:57 |
| pluskid | OK, I see | 02:57 |
| mithro | how long to the current benchmarks run? | 02:58 |
| pluskid | for the bm_tak it takes 11 sec for guile backend to run each pass | 02:58 |
| pluskid | if repeat 1000 times | 02:58 |
| pluskid | it would be 10000 sec and 166 minutes | 02:59 |
| mithro | maybe 100 times them? | 02:59 |
| mithro | or take the number of times as an argument | 02:59 |
| pluskid | hm, it can also be easily changed by modifying one number in the code | 03:00 |
| mithro | pluskid: I think we need to add some "malicious tests" | 03:00 |
| mithro | IE Tests which deliberately try and break the vm or do naughty stuff | 03:01 |
| pluskid | hmm, that would be useful for sandbox model | 03:01 |
| mithro | As one target use for schemepy is sandboxing | 03:01 |
| mithro | things like cross vm pollution should also be checked (it might already?) | 03:02 |
| pluskid | yes, already checked (at least basic check) | 03:02 |
| mithro | we also need to make sure that scheme can not "break into" python | 03:02 |
| pluskid | what's that? | 03:03 |
| mithro | because once it has unrestricted access to python the sandbox is broken | 03:03 |
| pluskid | oh, I understand | 03:03 |
| mithro | might be an idea to look into various security threads and stuff | 03:03 |
| pluskid | yes | 03:04 |
| mithro | and see what type of attacks might be possible | 03:04 |
| pluskid | we'll add some restricted profiles other than scheme-report-environment before we can test sandbox | 03:04 |
| mithro | okay | 03:04 |
| mithro | anyway I need to be in bed | 03:04 |
| mithro | got lots to do tommorrow | 03:05 |
| pluskid | good night | 03:05 |
| mithro | so have a good day/night/etc | 03:05 |
| pluskid | day :) | 03:05 |
| *** pluskid has quit IRC | 03:09 | |
| *** Alklomion has quit IRC | 03:28 | |
| *** mithro has quit IRC | 03:31 | |
| *** jmtan has left #tp | 04:01 | |
| *** CIA-28 has quit IRC | 04:49 | |
| *** CIA-54 has joined #tp | 04:49 | |
| *** peres has joined #tp | 05:16 | |
| *** peres has quit IRC | 05:58 | |
| *** Iwanowitch has joined #tp | 06:08 | |
| *** llnz has joined #tp | 06:23 | |
| *** JLafont has quit IRC | 06:58 | |
| *** JLafont has joined #tp | 07:02 | |
| *** CIA-54 has quit IRC | 07:43 | |
| *** CIA-54 has joined #tp | 07:44 | |
| *** peres has joined #tp | 08:19 | |
| * llnz wanders off | 08:35 | |
| llnz | later all | 08:35 |
| *** llnz has quit IRC | 08:35 | |
| *** JLafont has quit IRC | 09:11 | |
| *** JLafont has joined #tp | 09:14 | |
| *** JLafont has quit IRC | 09:17 | |
| CIA-54 | aaron tpserver-cpp-config * r3f7664f15d62 /tpserver/ (5 files): Added Command and CommandManager classes with partial functionality. | 09:30 |
| *** peres has quit IRC | 09:49 | |
| *** JLafont has joined #tp | 10:01 | |
| *** bddebian has joined #tp | 10:16 | |
| bddebian | Howdy | 10:18 |
| *** peres has joined #tp | 10:22 | |
| *** zzorn_laptop has quit IRC | 10:24 | |
| *** Iwanowitch has quit IRC | 10:24 | |
| *** JLafont has quit IRC | 10:26 | |
| *** JLafont has joined #tp | 10:31 | |
| *** mithro has joined #tp | 10:39 | |
| mithro | morning people | 10:40 |
| bddebian | Hello mithro | 10:51 |
| *** mithro has quit IRC | 11:05 | |
| *** peres has quit IRC | 11:23 | |
| *** Erroneous has joined #tp | 11:32 | |
| *** Iwanowitch has joined #tp | 11:50 | |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 11:55 |
| *** mithro has joined #tp | 11:58 | |
| mithro | morning people | 12:03 |
| mithro | Iwanowitch: sorry about sending you the email instead of Victor | 12:03 |
| * mithro pokes Epyon_ | 12:04 | |
| Iwanowitch | mithro: No problem | 12:13 |
| tpb | aloril has joined on worldforge | 12:14 |
| *** zzorn has quit IRC | 12:14 | |
| *** jphr has joined #tp | 12:51 | |
| jphr | mithro: ping? | 12:51 |
| CIA-54 | juanmy777 tpserver-py-dronesec * r2abd80f3dddf /tp/server/rules/dronesec/orders/ProduceDrones.py: Cleaned up Dronesec to us the Fleet module. | 12:57 |
| CIA-54 | juanmy777 tpserver-py-dronesec * r857edd944428 /tp/server/rules/dronesec/__init__.py: Removed Fleet Combat from the order list to make it simpler to debug the ruleset | 12:57 |
| CIA-54 | juanmy777 tpserver-py-dronesec * r1697e6f2d843 /tp/server/rules/dronesec/objects/Planet.py: Copied base Planet code into dronesec Planet code | 12:57 |
| mithro | jphr: pong | 13:01 |
| jphr | mithro: hey I have a question | 13:02 |
| mithro | shoot | 13:02 |
| jphr | I intend to store a 2d array, the adjacency matrix, to do lookups of connectivity. I need some way to assign names to array indices. Should I create an enum that translates each name into an array index? It doesn't seem like a very portable way to do things, but it may be the best way | 13:03 |
| jphr | And should I create a helper class for the matrix to return lists of adjacent elements, etc? | 13:05 |
| mithro | I think you should probably just be using the IDs? | 13:09 |
| CIA-54 | juanmy777 tpserver-py-dronesec * r60f5cf9cf398 /tp/server/rules/dronesec/ (6 files in 5 dirs): Converted from spaces to Tabs | 13:12 |
| jphr | I thought that too, is there any way I will know what the IDs will be before the code runs? | 13:13 |
| mithro | jphr: I don't know enough about tpserver-cpp but I think you can probably force the ID to be a known number when generating the universe (as you have complete control) | 13:15 |
| mithro | this is probably something you want to chat to llnz about | 13:15 |
| mithro | JLafont: ping? | 13:15 |
| jphr | I'll hit llnz when I can | 13:16 |
| jphr | thanks | 13:16 |
| JLafont | mithro: pong | 13:16 |
| mithro | JLafont: you didn't end up doing the branch thing? | 13:16 |
| JLafont | for tabs? | 13:16 |
| JLafont | I thought I did | 13:16 |
| mithro | JLafont: I have to go to a meeting now | 13:17 |
| mithro | we should sit down and sort it out | 13:17 |
| mithro | after I get back | 13:17 |
| JLafont | mithro: Sure | 13:17 |
| mithro | opps, I think that meeting was canceled | 13:18 |
| mithro | so what did you do? | 13:18 |
| JLafont | I think I merged dronesec to master, then created a tabs branch. Changed all the spaces to tabs and then merged it into master again | 13:19 |
| JLafont | then I deleted the tabs branch since I didn't think I would be needing it anymore. | 13:19 |
| mithro | that doesn't sound right | 13:21 |
| mithro | and infact you could not do the cleanup without my help | 13:22 |
| mithro | (as it requires me to remove the branch from the server | 13:22 |
| mithro | ) | 13:22 |
| mithro | what you where suppose to do is the following steps | 13:23 |
| mithro | 1. create a new branch based on master | 13:23 |
| mithro | 2. replay changes manually without the whole tab/space conversion stuff | 13:24 |
| mithro | 3. ask me to remove dronesec branch | 13:24 |
| mithro | 4. push your new branch as dronesec | 13:24 |
| JLafont | oh | 13:25 |
| JLafont | ok so how do I fix it? | 13:25 |
| mithro | that make more sense? | 13:25 |
| JLafont | yeah | 13:25 |
| mithro | no merging or anything | 13:27 |
| jphr | mithro: hehe, IGObjects all have a setID method | 13:28 |
| JLafont | alright | 13:28 |
| mithro | so | 13:29 |
| mithro | you need to do the following | 13:29 |
| mithro | git branch dronesec-new d556aa10f45ec66ef22b2a3edd60c3c93be2a74d | 13:29 |
| mithro | which creates a new branch | 13:29 |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 13:29 |
| mithro | JLafont: done? | 13:30 |
| JLafont | yes | 13:31 |
| mithro | git-cherry-pick b28162b3138b2d452880de66135e3f6e53bfbd8e -n # cherry pick the first commit - but do not commit it right away | 13:31 |
| mithro | # fix up any problems | 13:31 |
| mithro | git add <files which you have changed> | 13:31 |
| mithro | git commit | 13:31 |
| JLafont | alright | 13:31 |
| mithro | if you want to combind to patchs | 13:32 |
| mithro | cherry pick both before committing | 13:32 |
| mithro | (this is a good lesson is rewriting/fixing up changes) | 13:33 |
| Iwanowitch | What madness. | 13:34 |
| JLafont | ok I'm a little confused now. All the iles are using tab instead of spaces now though | 13:34 |
| * Epyon_ pokes mithro | 13:37 | |
| mithro | Epyon! | 13:37 |
| mithro | JLafont: what do you mean? | 13:37 |
| mithro | Epyon_: did you see we have a cool 3d client now? | 13:38 |
| JLafont | my local directory has the same files I used to have before the cherry pick. | 13:38 |
| mithro | oh sorry | 13:39 |
| mithro | maybe there should have been a "git checkout dronsec-new" after the git branch? | 13:40 |
| JLafont | alrighty | 13:41 |
| JLafont | that kidna worked | 13:42 |
| mithro | git-diff --cached | 13:44 |
| mithro | after the cherry pick | 13:44 |
| mithro | will show you what you have cherry picked so far | 13:45 |
| tpb | aloril has joined on worldforge | 13:45 |
| mithro | git diff will show changes which have yet to be git added | 13:45 |
| Epyon_ | mithro, link to pics? | 14:05 |
| CIA-54 | jphr tpserver-cpp-risk * r697106bbc83e /modules/games/risk/ (constellations.txt risk.cpp risk.h): Modified createUniverse and functions it calls to statically set IDs. This is in preparation of implementing an adjacency matrix | 14:06 |
| mithro | Epyon_: http://devhobby.blogspot.com/ | 14:28 |
| tpb | Title: Dev Hobby (at devhobby.blogspot.com) | 14:28 |
| *** JLP_ has quit IRC | 14:29 | |
| mithro | JLafont: any luck? | 14:31 |
| * mithro pokes JLafont with something pointy | 14:42 | |
| JLafont | mithro: not particularly. The tab/space conversions seem to be scattered throughout some of my commits | 14:44 |
| mithro | JLafont: yes, that is why I want you to clean it up | 14:47 |
| mithro | where are you stuck? | 14:47 |
| Iwanowitch | Just a question... Is it wrong to have spaces instead of tabs or what? | 14:48 |
| mithro | Iwanowitch: in python you should be using exactly what the rest of the code is using | 14:49 |
| mithro | mixing spaces and tabs is BAD | 14:49 |
| Iwanowitch | Well, yeah, but if I use spaces in my client which is basically separated, that's not a big problem is it? | 14:50 |
| mithro | well, you have two options either use a single tab (which most thousand parsec programs use) | 14:51 |
| mithro | or use 4 spaces, which is describes in PEP8 | 14:51 |
| Iwanowitch | I use 4 spaces for about all my coding, so that's what I defaulted to. | 14:51 |
| mithro | Iwanowitch: then as you are not coding as part of another project, feel free to continue | 14:52 |
| mithro | JLafont: so, I'm about to head to lunch - ask now or wait for 5 hours before I can answer (have meetings right after lunch) | 14:53 |
| * ezod uses vim... set tabstop=4, set shiftwidth=4, set expandtab | 14:54 | |
| ezod | also, try man expand ;) | 14:55 |
| JLafont | mithro: ok. Lets say I cherry-picked to a patch and make my changes. I'm not entirely sure how to combine those two patches | 14:56 |
| mithro | JLafont: so you cherry picked the patch | 14:57 |
| mithro | git diff --cached | 14:58 |
| mithro | should show you the patch right? | 14:58 |
| JLafont | yeah, I'm using gitk | 14:58 |
| JLafont | yeah | 14:58 |
| mithro | and "git diff" shows some updates to the patch, right? | 14:59 |
| JLafont | yeah | 15:00 |
| mithro | Epyon_: checkout this as well - http://www.thousandparsec.net/~irc/logs/%23tp.2008-06-02.log.html#t2008-06-02T00:18:24 | 15:00 |
| mithro | so | 15:00 |
| tpb | <http://ln-s.net/1u0R> (at www.thousandparsec.net) | 15:00 |
| mithro | now you just do a "git add <files I want to commit>" | 15:01 |
| mithro | after that | 15:01 |
| mithro | git diff should show nothing | 15:01 |
| mithro | and git diff --cached should show your updated patch | 15:01 |
| JLafont | ahhh ok | 15:02 |
| mithro | when you are happy - you can either do a | 15:03 |
| mithro | "git commit -c <ID of patch you cherry picked>" - if you want to use the same message and timestamp | 15:03 |
| mithro | or a | 15:03 |
| mithro | just a "git commit" - if you want to create a new message | 15:03 |
| JLafont | ok. Now I think I got it | 15:04 |
| mithro | when you do a "git add" it adds stuff to the cache | 15:05 |
| mithro | which allows you to review the patch with "git diff --cached" before you commit | 15:05 |
| mithro | and hence make better patches | 15:06 |
| mithro | so after you cherry pick your changes which include tab mangling, you can undo the tab mangling | 15:06 |
| mithro | do a "git add" and you should see the "real changes" | 15:06 |
| mithro | once you are happy you can commit it | 15:07 |
| JLafont | alright | 15:07 |
| mithro | the lesson to learn here is never combind reformatting patches with functionality changes | 15:07 |
| mithro | :) | 15:07 |
| mithro | and review your patches | 15:07 |
| mithro | atleast git makes this pretty easy to do | 15:09 |
| mithro | that working okay now? | 15:11 |
| JLafont | yeah I think it is | 15:15 |
| mithro | okay heading to lunch | 15:16 |
| mithro | don't know when I will be back | 15:16 |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 15:20 |
| CIA-54 | juanmy777 tpserver-py * rb28162b3138b /TODO: | 15:28 |
| CIA-54 | Testing git. Added some small tasks on the Todo | 15:28 |
| CIA-54 | Signed-off-by: Juan Lafont <juan@juan-laptop.(none)> | 15:28 |
| CIA-54 | juanmy777 tpserver-py * r375b778e579e /tp/server/ (15 files in 6 dirs): | 15:28 |
| CIA-54 | Dronesec init. PlanetGenerator Added | 15:28 |
| CIA-54 | Just a copy of minisec with some small changes so far. | 15:28 |
| CIA-54 | Previously made PlanetGenerator also added. | 15:28 |
| CIA-54 | Signed-off-by: Juan Lafont <[email protected]> | 15:28 |
| CIA-54 | juanmy777 tpserver-py * rdb4659b4c420 /tp/server/rules/dronesec/drones/Dronepedia.py: Fixed Dronepedia to work with tpserver-py and standalone | 15:28 |
| CIA-54 | juanmy777 tpserver-py * re08dbcd09806 /tp/server/rules/dronesec/__init__.py: Popuate and new players added ignore systems | 15:28 |
| CIA-54 | juanmy777 tpserver-py * r8471b8f8123f /tp/server/rules/dronesec/ (7 files in 3 dirs): Dronepedia implemented to work correctly. Should have turns come out infallibly. | 15:28 |
| CIA-54 | juanmy777 tpserver-py * rb19f60cd44da /tp/server/utils/planetGenerator.py: Fixes to the PlanetGenerator | 15:28 |
| CIA-54 | juanmy777 tpserver-py * r9542b086b700 /tp/server/rules/dronesec/ (__init__.py objects/Drone.py orders/ProduceDrones.py): Cleaned up drone productions | 15:29 |
| CIA-54 | juanmy777 tpserver-py * rc417cc6a4599 /tp/server/rules/dronesec/ (__init__.py actions/AddResource.py objects/Planet.py): Planets produce resources | 15:29 |
| CIA-54 | juanmy777 tpserver-py * rff37a64e23f1 /tp/server/rules/dronesec/ (4 files in 3 dirs): Fixed bug with drones. Was causing packets to be invalid | 15:29 |
| CIA-54 | juanmy777 tpserver-py * r2abd80f3dddf /tp/server/rules/dronesec/orders/ProduceDrones.py: Cleaned up Dronesec to us the Fleet module. | 15:29 |
| JLafont | hmm somehow this does not appear to be what I told git to do :( | 15:29 |
| CIA-54 | juanmy777 tpserver-py * r857edd944428 /tp/server/rules/dronesec/__init__.py: Removed Fleet Combat from the order list to make it simpler to debug the ruleset | 15:29 |
| CIA-54 | juanmy777 tpserver-py * r1697e6f2d843 /tp/server/rules/dronesec/objects/Planet.py: Copied base Planet code into dronesec Planet code | 15:29 |
| CIA-54 | juanmy777 tpserver-py * r60f5cf9cf398 /tp/server/rules/dronesec/ (6 files in 5 dirs): Converted from spaces to Tabs | 15:29 |
| *** think_tank has joined #tp | 15:30 | |
| *** think_tank has left #tp | 15:30 | |
| *** jphr has left #tp | 15:39 | |
| *** jphr has joined #tp | 15:39 | |
| mithro | JLafont: ping? | 15:42 |
| mithro | JLafont: patch c417cc6a4599ba03f92f3b48e400da034a78260b is still wrong | 15:44 |
| mithro | JLafont: I have reset the master branch back to before when you pushed | 15:47 |
| mithro | JLafont: lets sit down later tonight and we can get this right | 15:48 |
| mithro | bblr | 15:48 |
| CIA-54 | jphr tpserver-cpp-risk * r0c05459f10b7 /modules/games/risk/risk.cpp: Modified planets to be id 1 to #Planets instead of planet systems, since Planets will issue orders, not systems. | 15:51 |
| CIA-54 | jphr tpserver-cpp-risk * r52559868ecab /modules/games/risk/ (move.cpp planet.cpp risk.cpp riskturn.cpp): Modified some TODO, ASK comments. | 15:51 |
| jphr | mithro: you gone now? | 15:52 |
| jphr | dangit, just missed him | 15:52 |
| tpb | aloril has joined on worldforge | 15:54 |
| mithro | i'm still hear | 15:55 |
| mithro | s/hear/here/ | 15:57 |
| mithro | jphr: ping? | 15:59 |
| jphr | mithro: pong | 16:00 |
| mithro | jphr: you where after me? | 16:00 |
| jphr | yes, can I use boost in my ruleset? | 16:00 |
| mithro | that would be a question for llnz | 16:01 |
| jphr | the boost graphs library has an adjacency matrix that would make my life so much easier | 16:01 |
| jphr | ok | 16:01 |
| mithro | but I'm pretty sure it will be yes | 16:01 |
| jphr | i would hope so:P I was pulling my hair out trying to figure out how to implement those connections between planets | 16:02 |
| mithro | you just want a map | 16:06 |
| mithro | the map returns which planets a given planet is connected too | 16:06 |
| jphr | oh | 16:08 |
| mithro | there may be a datastructure which means this is easy to do | 16:08 |
| mithro | (so when you have an A->B you automatically have a link B->A) | 16:09 |
| jphr | from what I have read on AdjacencyMatrix you can set the mode to unidirectional, and simply add edges. I can probably write a wrapper class for it to work a little more nicely | 16:11 |
| jphr | http://www.boost.org/doc/libs/1_35_0/libs/graph/doc/adjacency_matrix.html | 16:11 |
| tpb | <http://ln-s.net/1u1$> (at www.boost.org) | 16:11 |
| ezod | jphr: sounds like you're looking for a graph implementation of some kind? | 16:16 |
| ezod | jphr: boost has one actually | 16:16 |
| jphr | yes, I need to keep track of connectivity between planets | 16:16 |
| *** zzorn has joined #tp | 16:17 | |
| ezod | http://www.boost.org/doc/libs/1_35_0/libs/graph/doc/index.html | 16:17 |
| jphr | yeah I was actually wanting to use theirs | 16:17 |
| tpb | <http://ln-s.net/1u1:> (at www.boost.org) | 16:17 |
| Iwanowitch | An adjencency matrix has the advantage you can multiply it with itself or other vectors. | 16:17 |
| jphr | the adjacency matrix is a subset of that library | 16:17 |
| ezod | ah | 16:17 |
| ezod | way ahead of me then :) | 16:18 |
| ezod | i just finished doing a bunch of graph-related stuff for my master's thesis | 16:18 |
| mithro | I know nothing! | 16:18 |
| mithro | :) | 16:18 |
| jphr | my only question is how to properly include boost/graphs lib in my source? | 16:20 |
| ezod | jphr: i think llnz is using boost in libtpproto-cpp | 16:21 |
| jphr | k I will look there | 16:21 |
| mithro | #include <boost/blah.> | 16:21 |
| ezod | jphr: maybe not in the tree yet though | 16:22 |
| mithro | some of the core stuff uses boost | 16:22 |
| mithro | just grep for it | 16:22 |
| jphr | It appears to work with a simple include "boost/graph/adjacency_matrix.hpp" | 16:31 |
| CIA-54 | aaron tpserver-cpp-config * reea401bdc1e2 /tpserver/ (6 files): | 16:36 |
| CIA-54 | AdminConnection connects to CommandManager, response frames mostly formed. | 16:36 |
| CIA-54 | Starting base command set implementation. | 16:36 |
| mithro | jphr: actually, come to think about there are probably existing formats for describing what you want | 16:54 |
| CIA-54 | jphr tpserver-cpp-risk * r772806e5a310 /modules/games/risk/risk.cpp: Reworked constellation layout to make the differentiation between constellations more obvious. | 16:55 |
| jphr | mithro: within TP already? | 16:55 |
| mithro | no, but within either the gaming or mapping community | 16:56 |
| mithro | maybe KML? | 16:56 |
| jphr | I thought/think the adjacency matrix is just what I am looking for | 16:56 |
| mithro | I mean for loading the "map" from a file | 16:56 |
| jphr | oh yes, I think you may be right | 16:57 |
| jphr | there was also something I saw called vizgraph, that has a markup language to express connectivity and graphs | 16:58 |
| jphr | its actually part of boost/graphs, and can be parsed into graph data structures | 16:58 |
| mithro | cool | 17:07 |
| jphr | http://www.boost.org/doc/libs/1_35_0/libs/graph/doc/read_graphviz.html | 17:09 |
| tpb | <http://ln-s.net/1u1_> (at www.boost.org) | 17:09 |
| jphr | it might not do all I want, but I will have to see when I get there | 17:10 |
| jphr | if I have a typedef in a class header, will it follow through to the cpp file? | 17:13 |
| mithro | if you include that header file | 17:18 |
| jphr | ok | 17:18 |
| mithro | there are lots of things which generate graphviz files | 17:19 |
| CIA-54 | nuleren tpserver-cpp-tae * rc4d92f1f2248 /modules/games/tae/ (Makefile.am fleet.cpp fleet.h tae.cpp): Added a stripped down fleet object | 17:19 |
| *** Demitar has quit IRC | 17:40 | |
| mithro | jphr: actually it's probably an idea to try drawing up your map in something like graphvis | 17:40 |
| mithro | it should be pretty looking :) | 17:41 |
| mithro | http://www.graphviz.org/Gallery.php | 17:42 |
| tpb | Title: Graphviz (at www.graphviz.org) | 17:42 |
| jphr | yeah the only thing I would need to figure out is where to place the graph items. But that may be a seperately imported file, since connectivity and position aren't exactly related for risk. (connectivity only applies to orders) | 17:47 |
| mithro | I think graphviz can also store position | 17:49 |
| jphr | hmm, that may be the be all end all then | 17:50 |
| jphr | (man I really need to find a good tutorial for iterators in c++, never used them before) | 17:51 |
| mithro | http://www.graphviz.org/doc/info/attrs.html#d:pos | 17:51 |
| tpb | <http://ln-s.net/1u1s> (at www.graphviz.org) | 17:51 |
| mithro | jphr: they are really simple | 17:51 |
| jphr | i just need the syntax | 17:51 |
| jphr | all the examples I've seen are terribly convoluted, etc. | 17:52 |
| mithro | for (thing::Iterator *it = thing.begin(); it < thing.end(); it++) { cout << *it << endl; } | 17:52 |
| mithro | just like you would use a pointer | 17:53 |
| jphr | oh, well if I would have seen that in the first place then I wouldn't be confused | 17:54 |
| jphr | this is good, with boost/graphs I can simply grab an iterator of connected items, and do what I please | 17:55 |
| mithro | I wouldn't have expected any less | 17:59 |
| mithro | using already existing formats is always great :) | 18:04 |
| mithro | Epyon_: ping? | 18:10 |
| mithro | I recommend the following website | 18:11 |
| *** bddebian has quit IRC | 18:13 | |
| mithro | http://www.cppreference.com/ and http://www.cplusplus.com/reference/stl/map/ | 18:13 |
| tpb | Title: C++ Reference (at www.cppreference.com) | 18:13 |
| mithro | they are quite useful for STL references | 18:14 |
| Iwanowitch | And that C++ lite faq is useful for the stranger parts of C++ | 18:20 |
| Iwanowitch | Which you probably will encounter if you dive into STL | 18:20 |
| Iwanowitch | http://www.parashift.com/c++-faq-lite/ | 18:21 |
| tpb | Title: C++ FAQ LITE (at www.parashift.com) | 18:21 |
| *** peres has joined #tp | 18:25 | |
| mithro | JLafont: ping? | 18:40 |
| jphr | mithro Iwanowitch: I will check out those sites, thanks (writing blog post atm) | 18:41 |
| mithro | the two I linked two are good for finding the correct methods and stuff on stl | 18:45 |
| mithro | (specially if you are not using something with intellisense | 18:45 |
| *** JLafont has quit IRC | 18:57 | |
| mithro | bblr | 18:57 |
| Asmm | heya | 18:57 |
| *** JLafont has joined #tp | 18:57 | |
| Asmm | anyone ever tried tpsai-py? | 19:02 |
| Iwanowitch | Yes, kinda. It's out of date. | 19:10 |
| Iwanowitch | Out of date in a broken way, that is. | 19:11 |
| Asmm | ok, that explains :) | 19:19 |
| *** llnz has joined #tp | 19:23 | |
| CIA-54 | verhoevenv daneel-ai * r6fc378024cba /chr.py: Unification of logical terms seems to be working | 19:57 |
| CIA-54 | verhoevenv daneel-ai * r88bbe01b766a /chr.py: Parsing strings into logical terms works. | 19:57 |
| CIA-54 | verhoevenv daneel-ai * r2799e9340a5f /chr.py: Evaluation of PythonTerms works | 19:57 |
| CIA-54 | verhoevenv daneel-ai * rd9403a08218e /chr.py: Created explicit eval and exec methods on PythonTerm | 19:57 |
| CIA-54 | verhoevenv daneel-ai * r519431e0a9cf /chr.py: Various bugs squashed | 19:57 |
| CIA-54 | verhoevenv daneel-ai * r60f23f10ced7 /chrtest.py: Added some unit tests because it was quite necessary | 19:57 |
| CIA-54 | verhoevenv daneel-ai * re76c3c3930d1 /chrtest.py: Eval test added | 19:58 |
| CIA-54 | verhoevenv daneel-ai * rf333ea996438 /chrtest.py: Another small testcase | 19:58 |
| Iwanowitch | Worked enough today. | 19:58 |
| nash | Iwanowitch: I read your update btw ;-) | 20:02 |
| nash | Looks cool ;-) | 20:02 |
| *** jphr has quit IRC | 20:02 | |
| nash | So are you going to dump a real prolog interpreter in there? | 20:03 |
| Iwanowitch | Half of one. | 20:10 |
| Iwanowitch | nash: The pushed changes contain most of the unification code... If you want to see it in action, I suggest you take a look at chrtest.py | 20:11 |
| Iwanowitch | It's not guaranteed to be bug-free though. | 20:12 |
| nash | Iwanowitch: Shall do what I can later today | 20:12 |
| Iwanowitch | But I still have some time to work that out. | 20:12 |
| nash | And get it on my laptop so I can play on the train | 20:12 |
| nash | Iwanowitch: Did you look at grabbing iprolog or something and dumping that in? | 20:12 |
| Iwanowitch | nash: No... I thought it would be easily done myself. It's a bit more subtle than I thought, but I got it mostly nailed I hope. | 20:13 |
| nash | heh, okay | 20:14 |
| nash | Keep it in mind if you do hit problems | 20:14 |
| Iwanowitch | Yeah, indeed. | 20:14 |
| Iwanowitch | Thanks. | 20:14 |
| Asmm | heya, just wondering what you ultimately want to do with the latest update? | 20:16 |
| Iwanowitch | Asmm: That latest commit? It's going to be the Ultimate AI Bot. Or probably something you can laugh a bit at while it clumsily tries to build an empire. | 20:18 |
| Iwanowitch | It's one of the two (I think?) AI projects for Summer of Code. | 20:19 |
| nash | two | 20:22 |
| Asmm | yeah, i know about the two | 20:35 |
| Asmm | you want to try "logical" implementatyion via prolog? | 20:35 |
| *** Erroneous has quit IRC | 20:36 | |
| Iwanowitch | Asmm: Yep, or rather, via production rules. | 20:39 |
| Iwanowitch | I'm actually only stealing the matching/unification from Prolog. | 20:40 |
| Asmm | aha | 20:41 |
| Asmm | will b intertesting too see how this approach works | 20:42 |
| Iwanowitch | I'm off. Night all. | 20:51 |
| *** Iwanowitch has quit IRC | 20:52 | |
| *** bddebian has joined #tp | 21:03 | |
| CIA-54 | pluskid schemepy * r206dde9f0211 /schemepy/mzscheme/ (Makefile mzhelper.c mzscheme.py): Modified the init and build file for 3m model of mzscheme. | 21:03 |
| CIA-54 | pluskid schemepy * r8ae671dd60d3 /schemepy/mzscheme/mzhelper.c: Added traverser functions for PyObj_t | 21:03 |
| *** greywhind has joined #tp | 21:39 | |
| mithro | hey greywhind | 21:46 |
| greywhind | hey | 21:46 |
| *** greywhind has left #tp | 22:01 | |
| llnz | bbl | 22:52 |
| *** llnz has quit IRC | 22:52 | |
| *** mithro has quit IRC | 22:58 | |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 22:58 |
| *** bddebian has quit IRC | 23:33 | |
| *** peres has quit IRC | 23:44 | |
| *** mithro has joined #tp | 23:48 | |
| mithro | heyo people | 23:49 |
| * mithro is pondering bed | 23:49 | |
| mithro | ~seenJL | 23:49 |
| mithro | ~seen JLP | 23:49 |
| tpb | mithro: JLP was last seen in #tp 1 day, 19 hours, 41 minutes, and 54 seconds ago: <JLP> good morning everyone | 23:49 |
| mithro | ~seen Epyon_ | 23:49 |
| tpb | mithro: Epyon_ was last seen in #tp 9 hours, 43 minutes, and 54 seconds ago: <Epyon_> mithro, link to pics? | 23:49 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!
