Compare commits
No commits in common. "691ee7696bb26c536dc3a2d366d0c4be1fb3190e" and "4d94322c55a1aa684c70c8a49b9a527eb6da29b6" have entirely different histories.
691ee7696b
...
4d94322c55
@ -18,7 +18,6 @@ urlpatterns = [
|
|||||||
url(r'^itemsets/', include('facts.urls')),
|
url(r'^itemsets/', include('facts.urls')),
|
||||||
url(r'^karma/', include('karma.urls')),
|
url(r'^karma/', include('karma.urls')),
|
||||||
url(r'^markov/', include('markov.urls')),
|
url(r'^markov/', include('markov.urls')),
|
||||||
url(r'^pi/', include('pi.urls')),
|
|
||||||
url(r'^races/', include('races.urls')),
|
url(r'^races/', include('races.urls')),
|
||||||
url(r'^weather/', include('weather.urls')),
|
url(r'^weather/', include('weather.urls')),
|
||||||
|
|
||||||
|
@ -59,8 +59,6 @@ class PiLog(models.Model):
|
|||||||
@property
|
@property
|
||||||
def value(self):
|
def value(self):
|
||||||
"""Return this log entry's estimated value of pi."""
|
"""Return this log entry's estimated value of pi."""
|
||||||
if self.total_count == 0:
|
|
||||||
return 0.0
|
|
||||||
return 4.0 * int(self.total_count_inside) / int(self.total_count)
|
return 4.0 * int(self.total_count_inside) / int(self.total_count)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
"""REST serializers for pi simulations."""
|
|
||||||
from rest_framework import serializers
|
|
||||||
|
|
||||||
from pi.models import PiLog
|
|
||||||
|
|
||||||
|
|
||||||
class PiLogSerializer(serializers.ModelSerializer):
|
|
||||||
"""Pi simulation log entry serializer for the REST API."""
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
"""Meta options."""
|
|
||||||
|
|
||||||
model = PiLog
|
|
||||||
fields = ('id', 'simulation_x', 'simulation_y', 'total_count', 'total_count_inside', 'value', 'hit')
|
|
12
pi/urls.py
12
pi/urls.py
@ -1,12 +0,0 @@
|
|||||||
"""URL patterns for the pi views."""
|
|
||||||
from django.conf.urls import include, url
|
|
||||||
from rest_framework.routers import DefaultRouter
|
|
||||||
|
|
||||||
from pi.views import PiLogViewSet
|
|
||||||
|
|
||||||
router = DefaultRouter()
|
|
||||||
router.register(r'simulations', PiLogViewSet)
|
|
||||||
|
|
||||||
urlpatterns = [
|
|
||||||
url(r'^api/', include(router.urls)),
|
|
||||||
]
|
|
12
pi/views.py
12
pi/views.py
@ -1,12 +0,0 @@
|
|||||||
"""Provide pi simulation results."""
|
|
||||||
from rest_framework import viewsets
|
|
||||||
|
|
||||||
from pi.models import PiLog
|
|
||||||
from pi.serializers import PiLogSerializer
|
|
||||||
|
|
||||||
|
|
||||||
class PiLogViewSet(viewsets.ReadOnlyModelViewSet):
|
|
||||||
"""Provide list and detail actions for pi simulation log entries."""
|
|
||||||
|
|
||||||
queryset = PiLog.objects.all()
|
|
||||||
serializer_class = PiLogSerializer
|
|
Loading…
x
Reference in New Issue
Block a user