[pypy-svn] rev 1945 - pypy/trunk/doc/funding
alastair at codespeak.net
alastair at codespeak.net
Wed Oct 15 10:04:43 CEST 2003
Author: alastair
Date: Wed Oct 15 10:04:42 2003
New Revision: 1945
Modified:
pypy/trunk/doc/funding/A3_draft.xls
pypy/trunk/doc/funding/B4.resources.txt
pypy/trunk/doc/funding/B6.7.wp04_core.txt
pypy/trunk/doc/funding/B6.7.wp09_search_and_logic.txt
pypy/trunk/doc/funding/B6.7.wp10_aspects_and_contracts.txt
pypy/trunk/doc/funding/manpower-overview.xls
pypy/trunk/doc/funding/project_planning.xml
Log:
Updated the DFKI's cost figures
Modified: pypy/trunk/doc/funding/A3_draft.xls
==============================================================================
Binary files. No diff available.
Modified: pypy/trunk/doc/funding/B4.resources.txt
==============================================================================
--- pypy/trunk/doc/funding/B4.resources.txt (original)
+++ pypy/trunk/doc/funding/B4.resources.txt Wed Oct 15 10:04:42 2003
@@ -658,7 +658,7 @@
|WP3: Synchronisation | | 12| | | | | | 12|
|with Standard Python | | | | | | | | |
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
-|WP4: PyPy Core | 5| | 9| 18| | 4| | 36|
+|WP4: PyPy Core | 2| | 9| 18| | 4| | 33|
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
|WP5: PyPy Translation| | 9| 9| 3| 18| | | 39|
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
@@ -671,9 +671,9 @@
|WP8: Dynamic | | | 9| 9| 18| | | 36|
|Optimisations | | | | | | | | |
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
-|WP9: Search and Logic| 16| | | | | 9| | 25|
+|WP9: Search and Logic| 10| | | | | 9| | 19|
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
-|WP10: Aspects and | 6| | | | | 9| | 15|
+|WP10: Aspects and | 3| | | | | 9| | 12|
|Contracts | | | | | | | | |
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
|WP11: Specialised | | | | | | 9| 1| 10|
@@ -688,7 +688,7 @@
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
| | | | | | | | | |
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
-|Total Research and | 27| 36| 48| 82| 48| 31| 1| 273|
+|Total Research and | 15| 36| 48| 82| 48| 31| 1| 261|
|Innovation | | | | | | | | |
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
|Management | | | | | | | | |
@@ -705,6 +705,6 @@
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
| | | | | | | | | |
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
-|Total | 35| 36| 48| 94| 56| 31| 21| 321|
+|Total | 23| 36| 48| 94| 56| 31| 21| 309|
+---------------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+--------------+
Modified: pypy/trunk/doc/funding/B6.7.wp04_core.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp04_core.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp04_core.txt Wed Oct 15 10:04:42 2003
@@ -8,7 +8,7 @@
.. |p2| replace:: MPI
.. |m2| replace:: 9
.. |p3| replace:: DFKI
-.. |m3| replace:: 5
+.. |m3| replace:: 2
.. |p4| replace:: Logilab
.. |m4| replace:: 4
.. |p5| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp09_search_and_logic.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp09_search_and_logic.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp09_search_and_logic.txt Wed Oct 15 10:04:42 2003
@@ -4,7 +4,7 @@
.. |wp| replace:: WP09
.. |start| replace:: 9
.. |p1| replace:: DFKI
-.. |m1| replace:: 15
+.. |m1| replace:: 10
.. |p2| replace:: Logilab
.. |m2| replace:: 9
.. |p3| replace:: |e|
Modified: pypy/trunk/doc/funding/B6.7.wp10_aspects_and_contracts.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.7.wp10_aspects_and_contracts.txt (original)
+++ pypy/trunk/doc/funding/B6.7.wp10_aspects_and_contracts.txt Wed Oct 15 10:04:42 2003
@@ -6,7 +6,7 @@
.. |p1| replace:: Logilab
.. |m1| replace:: 9
.. |p2| replace:: DFKI
-.. |m2| replace:: 6
+.. |m2| replace:: 3
.. |p3| replace:: |e|
.. |m3| replace:: |e|
.. |p4| replace:: |e|
Modified: pypy/trunk/doc/funding/manpower-overview.xls
==============================================================================
Binary files. No diff available.
Modified: pypy/trunk/doc/funding/project_planning.xml
==============================================================================
--- pypy/trunk/doc/funding/project_planning.xml (original)
+++ pypy/trunk/doc/funding/project_planning.xml Wed Oct 15 10:04:42 2003
@@ -41,7 +41,7 @@
<label>WP4 - The PyPy Core</label>
<duration unit="months">9</duration>
<constraint type="begin-at-date">2004/01/01</constraint>
-<use-resource idref="hacker_dfki_1" cost="5" usage="45%"/>
+<use-resource idref="hacker_dfki_1" cost="2" usage="45%"/>
<use-resource idref="hacker_logilab_1" cost="4" usage="45%"/>
<use-resource idref="hacker_pbf_christian_tismer" cost="9"/>
<use-resource idref="hacker_pbf_holger_krekel" cost="9"/>
@@ -103,7 +103,7 @@
<task id="wp9">
<label>WP9 - Extend Language with Search and Logic</label>
<duration unit="months">15</duration>
-<use-resource idref="hacker_dfki_1" cost="15"/>
+<use-resource idref="hacker_dfki_1" cost="10"/>
<use-resource idref="hacker_logilab_1" cost="9" usage="60%"/>
</task>
@@ -111,7 +111,7 @@
<label>WP10 - Extend Language with Aspects and Contracts</label>
<duration unit="months">9</duration>
<use-resource idref="hacker_logilab_2" cost="9"/>
-<use-resource idref="hacker_dfki_2" cost="6"/>
+<use-resource idref="hacker_dfki_2" cost="3"/>
</task>
<task id="wp11">
More information about the Pypy-commit
mailing list