Version 1.4.1.
|
@ -1,6 +1,13 @@
|
|||
What’s new in django-cachalot?
|
||||
==============================
|
||||
|
||||
1.4.1
|
||||
-----
|
||||
|
||||
- Fixes a circular import occurring when CachalotPanel is used
|
||||
and django-debug-toolbar is before django-cachalot in ``INSTALLED_APPS``
|
||||
- Stops checking compatibility for caches other than CACHALOT_CACHE
|
||||
|
||||
1.4.0
|
||||
-----
|
||||
|
||||
|
|
10
README.rst
|
@ -7,19 +7,19 @@ Caches your Django ORM queries and automatically invalidates them.
|
|||
|
||||
----
|
||||
|
||||
.. image:: http://img.shields.io/pypi/v/django-cachalot.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/pypi/v/django-cachalot.svg?style=flat-square&maxAge=3600
|
||||
:target: https://pypi.python.org/pypi/django-cachalot
|
||||
|
||||
.. image:: http://img.shields.io/travis/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/travis/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=3600
|
||||
:target: https://travis-ci.org/BertrandBordage/django-cachalot
|
||||
|
||||
.. image:: http://img.shields.io/coveralls/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/coveralls/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=3600
|
||||
:target: https://coveralls.io/r/BertrandBordage/django-cachalot?branch=master
|
||||
|
||||
.. image:: http://img.shields.io/scrutinizer/g/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/scrutinizer/g/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=3600
|
||||
:target: https://scrutinizer-ci.com/g/BertrandBordage/django-cachalot/
|
||||
|
||||
.. image:: https://img.shields.io/gitter/room/django-cachalot/Lobby.svg?style=flat-square&maxAge=86400
|
||||
.. image:: https://img.shields.io/gitter/room/django-cachalot/Lobby.svg?style=flat-square&maxAge=3600
|
||||
:target: https://gitter.im/django-cachalot/Lobby
|
||||
|
||||
|
||||
|
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
|
@ -1,5 +1,5 @@
|
|||
- filebased is 1.1× slower then 6.5× faster
|
||||
- locmem is 1.1× slower then 6.7× faster
|
||||
- memcached is 1.1× slower then 6.3× faster
|
||||
- filebased is 1.2× slower then 6.4× faster
|
||||
- locmem is 1.1× slower then 7.0× faster
|
||||
- memcached is 1.1× slower then 6.0× faster
|
||||
- pylibmc is 1.1× slower then 6.6× faster
|
||||
- redis is 1.1× slower then 6.0× faster
|
||||
- redis is 1.2× slower then 5.9× faster
|
||||
|
|
|
@ -2,17 +2,17 @@ In this benchmark, a small database is generated, and each test is executed 20 t
|
|||
|
||||
==================== ==================================================
|
||||
CPU Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz
|
||||
RAM 20537972 kB
|
||||
RAM 20536868 kB
|
||||
Disk INTEL SSDSC2CW06
|
||||
Linux distribution Ubuntu 16.04 xenial
|
||||
Python 3.5.2
|
||||
Django 1.10.1
|
||||
cachalot 1.4.0
|
||||
Django 1.10.2
|
||||
cachalot 1.4.1
|
||||
sqlite 3.11.0
|
||||
PostgreSQL 9.6.0
|
||||
MySQL 5.7.15
|
||||
Redis 3.0.6
|
||||
memcached 1.4.25
|
||||
psycopg2 2.6.2
|
||||
mysqlclient 1.3.8
|
||||
mysqlclient 1.3.9
|
||||
==================== ==================================================
|
||||
|
|
542
benchmark/db.svg
|
@ -27,181 +27,181 @@ z
|
|||
" style="fill:#ffffff;"/>
|
||||
</g>
|
||||
<g id="patch_3">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 72
|
||||
L 115.594096 72
|
||||
L 115.594096 91.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 72
|
||||
L 114.854631 72
|
||||
L 114.854631 91.2
|
||||
L 72 91.2
|
||||
z
|
||||
" style="fill:#0000ff;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_4">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 187.2
|
||||
L 121.436475 187.2
|
||||
L 121.436475 206.4
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 187.2
|
||||
L 120.832305 187.2
|
||||
L 120.832305 206.4
|
||||
L 72 206.4
|
||||
z
|
||||
" style="fill:#0000ff;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_5">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 302.4
|
||||
L 82.498175 302.4
|
||||
L 82.498175 321.6
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 302.4
|
||||
L 81.576185 302.4
|
||||
L 81.576185 321.6
|
||||
L 72 321.6
|
||||
z
|
||||
" style="fill:#0000ff;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_6">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 91.2
|
||||
L 166.824016 91.2
|
||||
L 166.824016 110.4
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 91.2
|
||||
L 160.173118 91.2
|
||||
L 160.173118 110.4
|
||||
L 72 110.4
|
||||
z
|
||||
" style="fill:#008000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_7">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 206.4
|
||||
L 176.656494 206.4
|
||||
L 176.656494 225.6
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 206.4
|
||||
L 170.231815 206.4
|
||||
L 170.231815 225.6
|
||||
L 72 225.6
|
||||
z
|
||||
" style="fill:#008000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_8">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 321.6
|
||||
L 82.282822 321.6
|
||||
L 82.282822 340.8
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 321.6
|
||||
L 81.761425 321.6
|
||||
L 81.761425 340.8
|
||||
L 72 340.8
|
||||
z
|
||||
" style="fill:#008000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_9">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 110.4
|
||||
L 134.279158 110.4
|
||||
L 134.279158 129.6
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 110.4
|
||||
L 132.018115 110.4
|
||||
L 132.018115 129.6
|
||||
L 72 129.6
|
||||
z
|
||||
" style="fill:#ff0000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_10">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 225.6
|
||||
L 141.560205 225.6
|
||||
L 141.560205 244.8
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 225.6
|
||||
L 139.882262 225.6
|
||||
L 139.882262 244.8
|
||||
L 72 244.8
|
||||
z
|
||||
" style="fill:#ff0000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_11">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 340.8
|
||||
L 82.476088 340.8
|
||||
L 82.476088 360
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 340.8
|
||||
L 82.612144 340.8
|
||||
L 82.612144 360
|
||||
L 72 360
|
||||
z
|
||||
" style="fill:#ff0000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="LineCollection_1">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 76.783708 81.6
|
||||
L 447.462319 81.6
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 80.951818 81.6
|
||||
L 315.317987 81.6
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 80.974838 196.8
|
||||
L 229.147558 196.8
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 83.691766 196.8
|
||||
L 222.741136 196.8
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 73.845261 312
|
||||
L 133.956533 312
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 73.783769 312
|
||||
L 119.206688 312
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
</g>
|
||||
<g id="LineCollection_2">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 76.500807 100.8
|
||||
L 404.557961 100.8
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 76.135751 100.8
|
||||
L 513.980198 100.8
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 80.042311 216
|
||||
L 513.980198 216
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 80.650676 216
|
||||
L 436.060368 216
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 73.830126 331.2
|
||||
L 125.346091 331.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 73.731014 331.2
|
||||
L 126.535199 331.2
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
</g>
|
||||
<g id="LineCollection_3">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 73.461074 120
|
||||
L 282.807983 120
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 73.371623 120
|
||||
L 265.64062 120
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 75.561296 235.2
|
||||
L 277.718089 235.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 75.381798 235.2
|
||||
L 420.173502 235.2
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 73.813828 350.4
|
||||
L 136.799516 350.4
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 73.735411 350.4
|
||||
L 370.653299 350.4
|
||||
" style="fill:none;stroke:#000000;"/>
|
||||
</g>
|
||||
<g id="line2d_1">
|
||||
<defs>
|
||||
<path d="M 0 3
|
||||
L 0 -3
|
||||
" id="md055852008" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
" id="m5e07885822" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
</defs>
|
||||
<g clip-path="url(#pa1c1b3909e)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="76.7837084244" xlink:href="#md055852008" y="81.6"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="80.9748377327" xlink:href="#md055852008" y="196.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.8452610982" xlink:href="#md055852008" y="312.0"/>
|
||||
<g clip-path="url(#p0ec3c90903)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="80.95181766" xlink:href="#m5e07885822" y="81.6"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="83.6917662697" xlink:href="#m5e07885822" y="196.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.7837691912" xlink:href="#m5e07885822" y="312.0"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_2">
|
||||
<g clip-path="url(#pa1c1b3909e)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="447.462319086" xlink:href="#md055852008" y="81.6"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="229.147557618" xlink:href="#md055852008" y="196.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="133.956533203" xlink:href="#md055852008" y="312.0"/>
|
||||
<g clip-path="url(#p0ec3c90903)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="315.31798749" xlink:href="#m5e07885822" y="81.6"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="222.741135808" xlink:href="#m5e07885822" y="196.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="119.2066878" xlink:href="#m5e07885822" y="312.0"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_3">
|
||||
<g clip-path="url(#pa1c1b3909e)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="76.5008071961" xlink:href="#md055852008" y="100.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="80.0423114616" xlink:href="#md055852008" y="216.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.8301264646" xlink:href="#md055852008" y="331.2"/>
|
||||
<g clip-path="url(#p0ec3c90903)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="76.1357507495" xlink:href="#m5e07885822" y="100.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="80.650676096" xlink:href="#m5e07885822" y="216.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.7310144646" xlink:href="#m5e07885822" y="331.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_4">
|
||||
<g clip-path="url(#pa1c1b3909e)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="404.557961198" xlink:href="#md055852008" y="100.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="513.98019802" xlink:href="#md055852008" y="216.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="125.346090879" xlink:href="#md055852008" y="331.2"/>
|
||||
<g clip-path="url(#p0ec3c90903)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="513.98019802" xlink:href="#m5e07885822" y="100.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="436.060367862" xlink:href="#m5e07885822" y="216.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="126.535198562" xlink:href="#m5e07885822" y="331.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_5">
|
||||
<g clip-path="url(#pa1c1b3909e)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.461074245" xlink:href="#md055852008" y="120.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="75.5612957095" xlink:href="#md055852008" y="235.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.8138276284" xlink:href="#md055852008" y="350.4"/>
|
||||
<g clip-path="url(#p0ec3c90903)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.3716228901" xlink:href="#m5e07885822" y="120.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="75.3817977827" xlink:href="#m5e07885822" y="235.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="73.7354106918" xlink:href="#m5e07885822" y="350.4"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_6">
|
||||
<g clip-path="url(#pa1c1b3909e)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="282.807983196" xlink:href="#md055852008" y="120.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="277.718089491" xlink:href="#md055852008" y="235.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="136.799515917" xlink:href="#md055852008" y="350.4"/>
|
||||
<g clip-path="url(#p0ec3c90903)">
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="265.640619997" xlink:href="#m5e07885822" y="120.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="420.173501775" xlink:href="#m5e07885822" y="235.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="370.653299405" xlink:href="#m5e07885822" y="350.4"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="patch_12">
|
||||
<path d="M 518.4 388.8
|
||||
L 518.4 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_13">
|
||||
<path d="M 72 43.2
|
||||
L 518.4 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_14">
|
||||
<g id="patch_13">
|
||||
<path d="M 72 388.8
|
||||
L 72 43.2
|
||||
L 518.4 388.8
|
||||
" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_14">
|
||||
<path d="M 518.4 388.8
|
||||
L 518.4 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="patch_15">
|
||||
<path d="M 72 388.8
|
||||
L 518.4 388.8
|
||||
L 72 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="matplotlib.axis_1">
|
||||
<g id="xtick_1">
|
||||
<g id="line2d_7">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 72 388.8
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 72 388.8
|
||||
L 72 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;stroke-dashoffset:0.0;stroke-width:0.5;"/>
|
||||
</g>
|
||||
|
@ -209,31 +209,25 @@ L 72 43.2
|
|||
<defs>
|
||||
<path d="M 0 0
|
||||
L 0 -4
|
||||
" id="me0c555e16e" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
" id="m8dcdc58be2" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#me0c555e16e" y="388.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m8dcdc58be2" y="388.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_9">
|
||||
<defs>
|
||||
<path d="M 0 0
|
||||
L 0 4
|
||||
" id="me0d167e405" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
" id="mdba9464b21" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#me0d167e405" y="43.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#mdba9464b21" y="43.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_1">
|
||||
<!-- 0.00 -->
|
||||
<defs>
|
||||
<path d="M 10.6875 12.40625
|
||||
L 21 12.40625
|
||||
L 21 0
|
||||
L 10.6875 0
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-2e"/>
|
||||
<path d="M 31.78125 66.40625
|
||||
Q 24.171875 66.40625 20.328125 58.90625
|
||||
Q 16.5 51.421875 16.5 36.375
|
||||
|
@ -253,6 +247,12 @@ Q 6.59375 17.96875 6.59375 36.375
|
|||
Q 6.59375 54.828125 13.0625 64.515625
|
||||
Q 19.53125 74.21875 31.78125 74.21875
|
||||
" id="BitstreamVeraSans-Roman-30"/>
|
||||
<path d="M 10.6875 12.40625
|
||||
L 21 12.40625
|
||||
L 21 0
|
||||
L 10.6875 0
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-2e"/>
|
||||
</defs>
|
||||
<g transform="translate(58.640625 401.918125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
|
@ -264,18 +264,18 @@ Q 19.53125 74.21875 31.78125 74.21875
|
|||
</g>
|
||||
<g id="xtick_2">
|
||||
<g id="line2d_10">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 169.660391 388.8
|
||||
L 169.660391 43.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 164.195567 388.8
|
||||
L 164.195567 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;stroke-dashoffset:0.0;stroke-width:0.5;"/>
|
||||
</g>
|
||||
<g id="line2d_11">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="169.660391236" xlink:href="#me0c555e16e" y="388.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="164.195566896" xlink:href="#m8dcdc58be2" y="388.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_12">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="169.660391236" xlink:href="#me0d167e405" y="43.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="164.195566896" xlink:href="#mdba9464b21" y="43.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_2">
|
||||
|
@ -305,7 +305,7 @@ Q 44.1875 33.984375 37.640625 27.21875
|
|||
Q 31.109375 20.453125 19.1875 8.296875
|
||||
" id="BitstreamVeraSans-Roman-32"/>
|
||||
</defs>
|
||||
<g transform="translate(156.301016236 401.918125)scale(0.12 -0.12)">
|
||||
<g transform="translate(150.836191896 401.918125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
|
||||
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
|
@ -315,18 +315,18 @@ Q 31.109375 20.453125 19.1875 8.296875
|
|||
</g>
|
||||
<g id="xtick_3">
|
||||
<g id="line2d_13">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 267.320782 388.8
|
||||
L 267.320782 43.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 256.391134 388.8
|
||||
L 256.391134 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;stroke-dashoffset:0.0;stroke-width:0.5;"/>
|
||||
</g>
|
||||
<g id="line2d_14">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="267.320782471" xlink:href="#me0c555e16e" y="388.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="256.391133793" xlink:href="#m8dcdc58be2" y="388.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_15">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="267.320782471" xlink:href="#me0d167e405" y="43.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="256.391133793" xlink:href="#mdba9464b21" y="43.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_3">
|
||||
|
@ -350,7 +350,7 @@ L 4.890625 26.703125
|
|||
z
|
||||
" id="BitstreamVeraSans-Roman-34"/>
|
||||
</defs>
|
||||
<g transform="translate(253.961407471 401.918125)scale(0.12 -0.12)">
|
||||
<g transform="translate(243.031758793 401.918125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
|
||||
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
|
@ -360,18 +360,18 @@ z
|
|||
</g>
|
||||
<g id="xtick_4">
|
||||
<g id="line2d_16">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 364.981174 388.8
|
||||
L 364.981174 43.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 348.586701 388.8
|
||||
L 348.586701 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;stroke-dashoffset:0.0;stroke-width:0.5;"/>
|
||||
</g>
|
||||
<g id="line2d_17">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="364.981173707" xlink:href="#me0c555e16e" y="388.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="348.586700689" xlink:href="#m8dcdc58be2" y="388.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_18">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="364.981173707" xlink:href="#me0d167e405" y="43.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="348.586700689" xlink:href="#mdba9464b21" y="43.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_4">
|
||||
|
@ -406,7 +406,7 @@ Q 40.921875 74.21875 44.703125 73.484375
|
|||
Q 48.484375 72.75 52.59375 71.296875
|
||||
" id="BitstreamVeraSans-Roman-36"/>
|
||||
</defs>
|
||||
<g transform="translate(351.621798707 401.918125)scale(0.12 -0.12)">
|
||||
<g transform="translate(335.227325689 401.918125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
|
||||
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
|
@ -416,18 +416,18 @@ Q 48.484375 72.75 52.59375 71.296875
|
|||
</g>
|
||||
<g id="xtick_5">
|
||||
<g id="line2d_19">
|
||||
<path clip-path="url(#pa1c1b3909e)" d="M 462.641565 388.8
|
||||
L 462.641565 43.2
|
||||
<path clip-path="url(#p0ec3c90903)" d="M 440.782268 388.8
|
||||
L 440.782268 43.2
|
||||
" style="fill:none;stroke:#000000;stroke-dasharray:1.000000,3.000000;stroke-dashoffset:0.0;stroke-width:0.5;"/>
|
||||
</g>
|
||||
<g id="line2d_20">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="462.641564943" xlink:href="#me0c555e16e" y="388.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="440.782267585" xlink:href="#m8dcdc58be2" y="388.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_21">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="462.641564943" xlink:href="#me0d167e405" y="43.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="440.782267585" xlink:href="#mdba9464b21" y="43.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_5">
|
||||
|
@ -470,7 +470,7 @@ Q 25.390625 66.40625 21.84375 63.234375
|
|||
Q 18.3125 60.0625 18.3125 54.390625
|
||||
" id="BitstreamVeraSans-Roman-38"/>
|
||||
</defs>
|
||||
<g transform="translate(449.282189943 401.918125)scale(0.12 -0.12)">
|
||||
<g transform="translate(427.422892585 401.918125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
|
||||
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
|
||||
|
@ -510,7 +510,36 @@ Q 29.78125 56 35.6875 56
|
|||
Q 41.65625 56 45.828125 52.96875
|
||||
Q 50 49.953125 52 44.1875
|
||||
" id="BitstreamVeraSans-Roman-6d"/>
|
||||
<path id="BitstreamVeraSans-Roman-20"/>
|
||||
<path d="M 44.28125 53.078125
|
||||
L 44.28125 44.578125
|
||||
Q 40.484375 46.53125 36.375 47.5
|
||||
Q 32.28125 48.484375 27.875 48.484375
|
||||
Q 21.1875 48.484375 17.84375 46.4375
|
||||
Q 14.5 44.390625 14.5 40.28125
|
||||
Q 14.5 37.15625 16.890625 35.375
|
||||
Q 19.28125 33.59375 26.515625 31.984375
|
||||
L 29.59375 31.296875
|
||||
Q 39.15625 29.25 43.1875 25.515625
|
||||
Q 47.21875 21.78125 47.21875 15.09375
|
||||
Q 47.21875 7.46875 41.1875 3.015625
|
||||
Q 35.15625 -1.421875 24.609375 -1.421875
|
||||
Q 20.21875 -1.421875 15.453125 -0.5625
|
||||
Q 10.6875 0.296875 5.421875 2
|
||||
L 5.421875 11.28125
|
||||
Q 10.40625 8.6875 15.234375 7.390625
|
||||
Q 20.0625 6.109375 24.8125 6.109375
|
||||
Q 31.15625 6.109375 34.5625 8.28125
|
||||
Q 37.984375 10.453125 37.984375 14.40625
|
||||
Q 37.984375 18.0625 35.515625 20.015625
|
||||
Q 33.0625 21.96875 24.703125 23.78125
|
||||
L 21.578125 24.515625
|
||||
Q 13.234375 26.265625 9.515625 29.90625
|
||||
Q 5.8125 33.546875 5.8125 39.890625
|
||||
Q 5.8125 47.609375 11.28125 51.796875
|
||||
Q 16.75 56 26.8125 56
|
||||
Q 31.78125 56 36.171875 55.265625
|
||||
Q 40.578125 54.546875 44.28125 53.078125
|
||||
" id="BitstreamVeraSans-Roman-73"/>
|
||||
<path d="M 9.421875 54.6875
|
||||
L 18.40625 54.6875
|
||||
L 18.40625 0
|
||||
|
@ -545,58 +574,7 @@ Q 24.90625 48.390625 20.390625 44.140625
|
|||
Q 15.875 39.890625 15.1875 32.171875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-65"/>
|
||||
<path d="M 44.28125 53.078125
|
||||
L 44.28125 44.578125
|
||||
Q 40.484375 46.53125 36.375 47.5
|
||||
Q 32.28125 48.484375 27.875 48.484375
|
||||
Q 21.1875 48.484375 17.84375 46.4375
|
||||
Q 14.5 44.390625 14.5 40.28125
|
||||
Q 14.5 37.15625 16.890625 35.375
|
||||
Q 19.28125 33.59375 26.515625 31.984375
|
||||
L 29.59375 31.296875
|
||||
Q 39.15625 29.25 43.1875 25.515625
|
||||
Q 47.21875 21.78125 47.21875 15.09375
|
||||
Q 47.21875 7.46875 41.1875 3.015625
|
||||
Q 35.15625 -1.421875 24.609375 -1.421875
|
||||
Q 20.21875 -1.421875 15.453125 -0.5625
|
||||
Q 10.6875 0.296875 5.421875 2
|
||||
L 5.421875 11.28125
|
||||
Q 10.40625 8.6875 15.234375 7.390625
|
||||
Q 20.0625 6.109375 24.8125 6.109375
|
||||
Q 31.15625 6.109375 34.5625 8.28125
|
||||
Q 37.984375 10.453125 37.984375 14.40625
|
||||
Q 37.984375 18.0625 35.515625 20.015625
|
||||
Q 33.0625 21.96875 24.703125 23.78125
|
||||
L 21.578125 24.515625
|
||||
Q 13.234375 26.265625 9.515625 29.90625
|
||||
Q 5.8125 33.546875 5.8125 39.890625
|
||||
Q 5.8125 47.609375 11.28125 51.796875
|
||||
Q 16.75 56 26.8125 56
|
||||
Q 31.78125 56 36.171875 55.265625
|
||||
Q 40.578125 54.546875 44.28125 53.078125
|
||||
" id="BitstreamVeraSans-Roman-73"/>
|
||||
<path d="M 31 75.875
|
||||
Q 24.46875 64.65625 21.28125 53.65625
|
||||
Q 18.109375 42.671875 18.109375 31.390625
|
||||
Q 18.109375 20.125 21.3125 9.0625
|
||||
Q 24.515625 -2 31 -13.1875
|
||||
L 23.1875 -13.1875
|
||||
Q 15.875 -1.703125 12.234375 9.375
|
||||
Q 8.59375 20.453125 8.59375 31.390625
|
||||
Q 8.59375 42.28125 12.203125 53.3125
|
||||
Q 15.828125 64.359375 23.1875 75.875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-28"/>
|
||||
<path d="M -0.296875 72.90625
|
||||
L 61.375 72.90625
|
||||
L 61.375 64.59375
|
||||
L 35.5 64.59375
|
||||
L 35.5 0
|
||||
L 25.59375 0
|
||||
L 25.59375 64.59375
|
||||
L -0.296875 64.59375
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-54"/>
|
||||
<path id="BitstreamVeraSans-Roman-20"/>
|
||||
<path d="M 8.015625 75.875
|
||||
L 15.828125 75.875
|
||||
Q 23.140625 64.359375 26.78125 53.3125
|
||||
|
@ -609,6 +587,28 @@ Q 20.90625 20.125 20.90625 31.390625
|
|||
Q 20.90625 42.671875 17.703125 53.65625
|
||||
Q 14.5 64.65625 8.015625 75.875
|
||||
" id="BitstreamVeraSans-Roman-29"/>
|
||||
<path d="M -0.296875 72.90625
|
||||
L 61.375 72.90625
|
||||
L 61.375 64.59375
|
||||
L 35.5 64.59375
|
||||
L 35.5 0
|
||||
L 25.59375 0
|
||||
L 25.59375 64.59375
|
||||
L -0.296875 64.59375
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-54"/>
|
||||
<path d="M 31 75.875
|
||||
Q 24.46875 64.65625 21.28125 53.65625
|
||||
Q 18.109375 42.671875 18.109375 31.390625
|
||||
Q 18.109375 20.125 21.3125 9.0625
|
||||
Q 24.515625 -2 31 -13.1875
|
||||
L 23.1875 -13.1875
|
||||
Q 15.875 -1.703125 12.234375 9.375
|
||||
Q 8.59375 20.453125 8.59375 31.390625
|
||||
Q 8.59375 42.28125 12.203125 53.3125
|
||||
Q 15.828125 64.359375 23.1875 75.875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-28"/>
|
||||
</defs>
|
||||
<g transform="translate(270.620625 418.531875)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-54"/>
|
||||
|
@ -628,25 +628,49 @@ Q 14.5 64.65625 8.015625 75.875
|
|||
<defs>
|
||||
<path d="M 0 0
|
||||
L 4 0
|
||||
" id="m3335cc891a" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
" id="m2e0085b047" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m3335cc891a" y="100.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m2e0085b047" y="100.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_23">
|
||||
<defs>
|
||||
<path d="M 0 0
|
||||
L -4 0
|
||||
" id="m3064aa3634" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
" id="m445a3e4247" style="stroke:#000000;stroke-width:0.5;"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m3064aa3634" y="100.8"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m445a3e4247" y="100.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_7">
|
||||
<!-- Control -->
|
||||
<defs>
|
||||
<path d="M 9.421875 75.984375
|
||||
L 18.40625 75.984375
|
||||
L 18.40625 0
|
||||
L 9.421875 0
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-6c"/>
|
||||
<path d="M 54.890625 33.015625
|
||||
L 54.890625 0
|
||||
L 45.90625 0
|
||||
L 45.90625 32.71875
|
||||
Q 45.90625 40.484375 42.875 44.328125
|
||||
Q 39.84375 48.1875 33.796875 48.1875
|
||||
Q 26.515625 48.1875 22.3125 43.546875
|
||||
Q 18.109375 38.921875 18.109375 30.90625
|
||||
L 18.109375 0
|
||||
L 9.078125 0
|
||||
L 9.078125 54.6875
|
||||
L 18.109375 54.6875
|
||||
L 18.109375 46.1875
|
||||
Q 21.34375 51.125 25.703125 53.5625
|
||||
Q 30.078125 56 35.796875 56
|
||||
Q 45.21875 56 50.046875 50.171875
|
||||
Q 54.890625 44.34375 54.890625 33.015625
|
||||
" id="BitstreamVeraSans-Roman-6e"/>
|
||||
<path d="M 64.40625 67.28125
|
||||
L 64.40625 56.890625
|
||||
Q 59.421875 61.53125 53.78125 63.8125
|
||||
|
@ -667,30 +691,6 @@ Q 24.65625 74.21875 41.21875 74.21875
|
|||
Q 47.75 74.21875 53.53125 72.484375
|
||||
Q 59.328125 70.75 64.40625 67.28125
|
||||
" id="BitstreamVeraSans-Roman-43"/>
|
||||
<path d="M 54.890625 33.015625
|
||||
L 54.890625 0
|
||||
L 45.90625 0
|
||||
L 45.90625 32.71875
|
||||
Q 45.90625 40.484375 42.875 44.328125
|
||||
Q 39.84375 48.1875 33.796875 48.1875
|
||||
Q 26.515625 48.1875 22.3125 43.546875
|
||||
Q 18.109375 38.921875 18.109375 30.90625
|
||||
L 18.109375 0
|
||||
L 9.078125 0
|
||||
L 9.078125 54.6875
|
||||
L 18.109375 54.6875
|
||||
L 18.109375 46.1875
|
||||
Q 21.34375 51.125 25.703125 53.5625
|
||||
Q 30.078125 56 35.796875 56
|
||||
Q 45.21875 56 50.046875 50.171875
|
||||
Q 54.890625 44.34375 54.890625 33.015625
|
||||
" id="BitstreamVeraSans-Roman-6e"/>
|
||||
<path d="M 9.421875 75.984375
|
||||
L 18.40625 75.984375
|
||||
L 18.40625 0
|
||||
L 9.421875 0
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-6c"/>
|
||||
<path d="M 30.609375 48.390625
|
||||
Q 23.390625 48.390625 19.1875 42.75
|
||||
Q 14.984375 37.109375 14.984375 27.296875
|
||||
|
@ -710,22 +710,6 @@ Q 5.515625 13.875 5.515625 27.296875
|
|||
Q 5.515625 40.765625 12.171875 48.375
|
||||
Q 18.84375 56 30.609375 56
|
||||
" id="BitstreamVeraSans-Roman-6f"/>
|
||||
<path d="M 41.109375 46.296875
|
||||
Q 39.59375 47.171875 37.8125 47.578125
|
||||
Q 36.03125 48 33.890625 48
|
||||
Q 26.265625 48 22.1875 43.046875
|
||||
Q 18.109375 38.09375 18.109375 28.8125
|
||||
L 18.109375 0
|
||||
L 9.078125 0
|
||||
L 9.078125 54.6875
|
||||
L 18.109375 54.6875
|
||||
L 18.109375 46.1875
|
||||
Q 20.953125 51.171875 25.484375 53.578125
|
||||
Q 30.03125 56 36.53125 56
|
||||
Q 37.453125 56 38.578125 55.875
|
||||
Q 39.703125 55.765625 41.0625 55.515625
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-72"/>
|
||||
<path d="M 18.3125 70.21875
|
||||
L 18.3125 54.6875
|
||||
L 36.8125 54.6875
|
||||
|
@ -746,6 +730,22 @@ L 9.28125 54.6875
|
|||
L 9.28125 70.21875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-74"/>
|
||||
<path d="M 41.109375 46.296875
|
||||
Q 39.59375 47.171875 37.8125 47.578125
|
||||
Q 36.03125 48 33.890625 48
|
||||
Q 26.265625 48 22.1875 43.046875
|
||||
Q 18.109375 38.09375 18.109375 28.8125
|
||||
L 18.109375 0
|
||||
L 9.078125 0
|
||||
L 9.078125 54.6875
|
||||
L 18.109375 54.6875
|
||||
L 18.109375 46.1875
|
||||
Q 20.953125 51.171875 25.484375 53.578125
|
||||
Q 30.03125 56 36.53125 56
|
||||
Q 37.453125 56 38.578125 55.875
|
||||
Q 39.703125 55.765625 41.0625 55.515625
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-72"/>
|
||||
</defs>
|
||||
<g transform="translate(24.363125 104.11125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-43"/>
|
||||
|
@ -761,12 +761,12 @@ z
|
|||
<g id="ytick_2">
|
||||
<g id="line2d_24">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m3335cc891a" y="216.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m2e0085b047" y="216.0"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_25">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m3064aa3634" y="216.0"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m445a3e4247" y="216.0"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_8">
|
||||
|
@ -803,6 +803,30 @@ Q 24.21875 56 28.609375 56
|
|||
Q 40.484375 56 46.34375 49.84375
|
||||
Q 52.203125 43.703125 52.203125 31.203125
|
||||
" id="BitstreamVeraSans-Roman-61"/>
|
||||
<path d="M 45.40625 46.390625
|
||||
L 45.40625 75.984375
|
||||
L 54.390625 75.984375
|
||||
L 54.390625 0
|
||||
L 45.40625 0
|
||||
L 45.40625 8.203125
|
||||
Q 42.578125 3.328125 38.25 0.953125
|
||||
Q 33.9375 -1.421875 27.875 -1.421875
|
||||
Q 17.96875 -1.421875 11.734375 6.484375
|
||||
Q 5.515625 14.40625 5.515625 27.296875
|
||||
Q 5.515625 40.1875 11.734375 48.09375
|
||||
Q 17.96875 56 27.875 56
|
||||
Q 33.9375 56 38.25 53.625
|
||||
Q 42.578125 51.265625 45.40625 46.390625
|
||||
M 14.796875 27.296875
|
||||
Q 14.796875 17.390625 18.875 11.75
|
||||
Q 22.953125 6.109375 30.078125 6.109375
|
||||
Q 37.203125 6.109375 41.296875 11.75
|
||||
Q 45.40625 17.390625 45.40625 27.296875
|
||||
Q 45.40625 37.203125 41.296875 42.84375
|
||||
Q 37.203125 48.484375 30.078125 48.484375
|
||||
Q 22.953125 48.484375 18.875 42.84375
|
||||
Q 14.796875 37.203125 14.796875 27.296875
|
||||
" id="BitstreamVeraSans-Roman-64"/>
|
||||
<path d="M 54.890625 33.015625
|
||||
L 54.890625 0
|
||||
L 45.90625 0
|
||||
|
@ -841,30 +865,6 @@ Q 20.21875 56 33.015625 56
|
|||
Q 37.15625 56 41.109375 55.140625
|
||||
Q 45.0625 54.296875 48.78125 52.59375
|
||||
" id="BitstreamVeraSans-Roman-63"/>
|
||||
<path d="M 45.40625 46.390625
|
||||
L 45.40625 75.984375
|
||||
L 54.390625 75.984375
|
||||
L 54.390625 0
|
||||
L 45.40625 0
|
||||
L 45.40625 8.203125
|
||||
Q 42.578125 3.328125 38.25 0.953125
|
||||
Q 33.9375 -1.421875 27.875 -1.421875
|
||||
Q 17.96875 -1.421875 11.734375 6.484375
|
||||
Q 5.515625 14.40625 5.515625 27.296875
|
||||
Q 5.515625 40.1875 11.734375 48.09375
|
||||
Q 17.96875 56 27.875 56
|
||||
Q 33.9375 56 38.25 53.625
|
||||
Q 42.578125 51.265625 45.40625 46.390625
|
||||
M 14.796875 27.296875
|
||||
Q 14.796875 17.390625 18.875 11.75
|
||||
Q 22.953125 6.109375 30.078125 6.109375
|
||||
Q 37.203125 6.109375 41.296875 11.75
|
||||
Q 45.40625 17.390625 45.40625 27.296875
|
||||
Q 45.40625 37.203125 41.296875 42.84375
|
||||
Q 37.203125 48.484375 30.078125 48.484375
|
||||
Q 22.953125 48.484375 18.875 42.84375
|
||||
Q 14.796875 37.203125 14.796875 27.296875
|
||||
" id="BitstreamVeraSans-Roman-64"/>
|
||||
</defs>
|
||||
<g transform="translate(1.97375 219.31125)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-43"/>
|
||||
|
@ -883,12 +883,12 @@ Q 14.796875 37.203125 14.796875 27.296875
|
|||
<g id="ytick_3">
|
||||
<g id="line2d_26">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m3335cc891a" y="331.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="72.0" xlink:href="#m2e0085b047" y="331.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_27">
|
||||
<g>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m3064aa3634" y="331.2"/>
|
||||
<use style="stroke:#000000;stroke-width:0.5;" x="518.4" xlink:href="#m445a3e4247" y="331.2"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_9">
|
||||
|
@ -925,10 +925,10 @@ z
|
|||
</g>
|
||||
<g id="legend_1">
|
||||
<g id="patch_16">
|
||||
<path d="M 383.69925 381.6
|
||||
L 511.2 381.6
|
||||
L 511.2 295.05675
|
||||
L 383.69925 295.05675
|
||||
<path d="M 231.449625 381.6
|
||||
L 358.950375 381.6
|
||||
L 358.950375 295.05675
|
||||
L 231.449625 295.05675
|
||||
z
|
||||
" style="fill:#ffffff;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
|
@ -960,22 +960,38 @@ L 18.109375 75.984375
|
|||
z
|
||||
" id="BitstreamVeraSans-Roman-62"/>
|
||||
</defs>
|
||||
<g transform="translate(439.8315 309.934875)scale(0.12 -0.12)">
|
||||
<g transform="translate(287.581875 309.934875)scale(0.12 -0.12)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-64"/>
|
||||
<use x="63.4765625" xlink:href="#BitstreamVeraSans-Roman-62"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="patch_17">
|
||||
<path d="M 389.45925 330.57225
|
||||
L 418.25925 330.57225
|
||||
L 418.25925 320.49225
|
||||
L 389.45925 320.49225
|
||||
<path d="M 237.209625 330.57225
|
||||
L 266.009625 330.57225
|
||||
L 266.009625 320.49225
|
||||
L 237.209625 320.49225
|
||||
z
|
||||
" style="fill:#0000ff;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="text_11">
|
||||
<!-- mysql -->
|
||||
<defs>
|
||||
<path d="M 32.171875 -5.078125
|
||||
Q 28.375 -14.84375 24.75 -17.8125
|
||||
Q 21.140625 -20.796875 15.09375 -20.796875
|
||||
L 7.90625 -20.796875
|
||||
L 7.90625 -13.28125
|
||||
L 13.1875 -13.28125
|
||||
Q 16.890625 -13.28125 18.9375 -11.515625
|
||||
Q 21 -9.765625 23.484375 -3.21875
|
||||
L 25.09375 0.875
|
||||
L 2.984375 54.6875
|
||||
L 12.5 54.6875
|
||||
L 29.59375 11.921875
|
||||
L 46.6875 54.6875
|
||||
L 56.203125 54.6875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-79"/>
|
||||
<path d="M 14.796875 27.296875
|
||||
Q 14.796875 17.390625 18.875 11.75
|
||||
Q 22.953125 6.109375 30.078125 6.109375
|
||||
|
@ -1000,24 +1016,8 @@ L 54.390625 -20.796875
|
|||
L 45.40625 -20.796875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-71"/>
|
||||
<path d="M 32.171875 -5.078125
|
||||
Q 28.375 -14.84375 24.75 -17.8125
|
||||
Q 21.140625 -20.796875 15.09375 -20.796875
|
||||
L 7.90625 -20.796875
|
||||
L 7.90625 -13.28125
|
||||
L 13.1875 -13.28125
|
||||
Q 16.890625 -13.28125 18.9375 -11.515625
|
||||
Q 21 -9.765625 23.484375 -3.21875
|
||||
L 25.09375 0.875
|
||||
L 2.984375 54.6875
|
||||
L 12.5 54.6875
|
||||
L 29.59375 11.921875
|
||||
L 46.6875 54.6875
|
||||
L 56.203125 54.6875
|
||||
z
|
||||
" id="BitstreamVeraSans-Roman-79"/>
|
||||
</defs>
|
||||
<g transform="translate(429.77925 330.57225)scale(0.144 -0.144)">
|
||||
<g transform="translate(277.529625 330.57225)scale(0.144 -0.144)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-6d"/>
|
||||
<use x="97.412109375" xlink:href="#BitstreamVeraSans-Roman-79"/>
|
||||
<use x="156.591796875" xlink:href="#BitstreamVeraSans-Roman-73"/>
|
||||
|
@ -1026,10 +1026,10 @@ z
|
|||
</g>
|
||||
</g>
|
||||
<g id="patch_18">
|
||||
<path d="M 389.45925 351.70875
|
||||
L 418.25925 351.70875
|
||||
L 418.25925 341.62875
|
||||
L 389.45925 341.62875
|
||||
<path d="M 237.209625 351.70875
|
||||
L 266.009625 351.70875
|
||||
L 266.009625 341.62875
|
||||
L 237.209625 341.62875
|
||||
z
|
||||
" style="fill:#008000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
|
@ -1093,7 +1093,7 @@ L 54.390625 54.6875
|
|||
z
|
||||
" id="BitstreamVeraSans-Roman-67"/>
|
||||
</defs>
|
||||
<g transform="translate(429.77925 351.70875)scale(0.144 -0.144)">
|
||||
<g transform="translate(277.529625 351.70875)scale(0.144 -0.144)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-70"/>
|
||||
<use x="63.4765625" xlink:href="#BitstreamVeraSans-Roman-6f"/>
|
||||
<use x="124.658203125" xlink:href="#BitstreamVeraSans-Roman-73"/>
|
||||
|
@ -1107,16 +1107,16 @@ z
|
|||
</g>
|
||||
</g>
|
||||
<g id="patch_19">
|
||||
<path d="M 389.45925 372.84525
|
||||
L 418.25925 372.84525
|
||||
L 418.25925 362.76525
|
||||
L 389.45925 362.76525
|
||||
<path d="M 237.209625 372.84525
|
||||
L 266.009625 372.84525
|
||||
L 266.009625 362.76525
|
||||
L 237.209625 362.76525
|
||||
z
|
||||
" style="fill:#ff0000;stroke:#000000;stroke-linejoin:miter;"/>
|
||||
</g>
|
||||
<g id="text_13">
|
||||
<!-- sqlite -->
|
||||
<g transform="translate(429.77925 372.84525)scale(0.144 -0.144)">
|
||||
<g transform="translate(277.529625 372.84525)scale(0.144 -0.144)">
|
||||
<use xlink:href="#BitstreamVeraSans-Roman-73"/>
|
||||
<use x="52.099609375" xlink:href="#BitstreamVeraSans-Roman-71"/>
|
||||
<use x="115.576171875" xlink:href="#BitstreamVeraSans-Roman-6c"/>
|
||||
|
@ -1129,7 +1129,7 @@ z
|
|||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="pa1c1b3909e">
|
||||
<clipPath id="p0ec3c90903">
|
||||
<rect height="345.6" width="446.4" x="72.0" y="43.2"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
|
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
|
@ -1,3 +1,3 @@
|
|||
- mysql is 1.1× slower then 4.2× faster
|
||||
- postgresql is 1.1× slower then 9.2× faster
|
||||
- sqlite is 1.1× slower then 5.9× faster
|
||||
- mysql is 1.1× slower then 4.5× faster
|
||||
- postgresql is 1.1× slower then 9.0× faster
|
||||
- sqlite is 1.1× slower then 5.7× faster
|
||||
|
|
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
|
@ -1,4 +1,4 @@
|
|||
VERSION = (1, 4, 0)
|
||||
VERSION = (1, 4, 1)
|
||||
__version__ = '.'.join(map(str, VERSION))
|
||||
|
||||
default_app_config = 'cachalot.apps.CachalotConfig'
|
||||
|
|
|
@ -8,19 +8,19 @@ Caches your Django ORM queries and automatically invalidates them.
|
|||
|
||||
----
|
||||
|
||||
.. image:: http://img.shields.io/pypi/v/django-cachalot.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/pypi/v/django-cachalot.svg?style=flat-square&maxAge=3600
|
||||
:target: https://pypi.python.org/pypi/django-cachalot
|
||||
|
||||
.. image:: http://img.shields.io/travis/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/travis/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=3600
|
||||
:target: https://travis-ci.org/BertrandBordage/django-cachalot
|
||||
|
||||
.. image:: http://img.shields.io/coveralls/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/coveralls/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=3600
|
||||
:target: https://coveralls.io/r/BertrandBordage/django-cachalot?branch=master
|
||||
|
||||
.. image:: http://img.shields.io/scrutinizer/g/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=86400
|
||||
.. image:: http://img.shields.io/scrutinizer/g/BertrandBordage/django-cachalot/master.svg?style=flat-square&maxAge=3600
|
||||
:target: https://scrutinizer-ci.com/g/BertrandBordage/django-cachalot/
|
||||
|
||||
.. image:: https://img.shields.io/gitter/room/django-cachalot/Lobby.svg?style=flat-square&maxAge=86400
|
||||
.. image:: https://img.shields.io/gitter/room/django-cachalot/Lobby.svg?style=flat-square&maxAge=3600
|
||||
:target: https://gitter.im/django-cachalot/Lobby
|
||||
|
||||
|
||||
|
|