From 754bc37b60d5efbcf0ddad7b991f6effafe2237d Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 13 Sep 2015 11:11:10 -0400 Subject: changed background model from sin^2 to sin --- R Scripts/fit-background.R | 8 ++++---- hawkes/README.rtf | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 hawkes/README.rtf diff --git a/R Scripts/fit-background.R b/R Scripts/fit-background.R index d1799cd..73ab6b2 100644 --- a/R Scripts/fit-background.R +++ b/R Scripts/fit-background.R @@ -17,14 +17,14 @@ counts = as.vector(t) infs = data.frame(days,counts) # define background function -fit = function(x, lambda, A, phi) {lambda + A*(sin((pi/365)*x+phi))^2} -fit_form = counts ~ lambda + A*(sin((pi/365)*days+phi))^2 +fit = function(x, lambda, A, phi) {lambda + A*(sin((2*pi/365.24)*x+phi))} +fit_form = counts ~ lambda + A*(sin((2*pi/365.24)*days+phi)) # explore data plot(days,counts) -curve(fit(x, lambda=1, A=12, phi=2.8), add=TRUE ,lwd=2, col="steelblue") +curve(fit(x, lambda=3, A=2, phi=4), add=TRUE ,lwd=4, col="steelblue") -res = nls(formula=fit_form, data=infs, start=list(lambda=1, A=12, phi=2.8)) +res = nls(formula=fit_form, data=infs, start=list(lambda=3, A=2, phi=4)) co = coef(res); co plot(t) diff --git a/hawkes/README.rtf b/hawkes/README.rtf new file mode 100644 index 0000000..be4aff3 --- /dev/null +++ b/hawkes/README.rtf @@ -0,0 +1,13 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\margl1440\margr1440\vieww10800\viewh8400\viewkind0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\fs24 \cf0 \ +\ +data/data2 - reformatting the data files\ +\ +main - most of the optimization\ +\ +cause - assign responsibility for each infection} \ No newline at end of file -- cgit v1.2.3-70-g09d2