Rafa de la Torre
|
505ae0fb44
|
Go back to using numpy==1.6.1
|
2016-06-29 17:09:36 +02:00 |
|
Rafa de la Torre
|
35b5612ded
|
Merge remote-tracking branch 'origin/develop' into segmentation
Conflicts:
src/py/crankshaft/crankshaft/__init__.py
|
2016-06-29 17:09:14 +02:00 |
|
Stuart Lynn
|
cfb58f7898
|
removing full function calls to be compatiable with numpy 1.6.1
|
2016-06-29 14:46:03 +00:00 |
|
Stuart Lynn
|
7d6148456e
|
adding inline documentation
|
2016-06-28 16:02:06 +00:00 |
|
Stuart Lynn
|
f6f9d6e9c8
|
resolves testing issues
|
2016-06-28 15:49:34 +00:00 |
|
Andy Eschbacher
|
32515f445e
|
update tests and paths
|
2016-06-28 10:48:10 -04:00 |
|
Andy Eschbacher
|
dd0ca9a24f
|
Merge branch 'develop' into add-spatial-markov
|
2016-06-28 10:19:36 -04:00 |
|
Andy Eschbacher
|
045fd67f47
|
formatting
|
2016-06-28 10:15:31 -04:00 |
|
Andy Eschbacher
|
2bb2e60af8
|
catching errors
|
2016-06-28 10:06:54 -04:00 |
|
Andy Eschbacher
|
99dc363c7d
|
format query
|
2016-06-27 10:12:06 -04:00 |
|
Andy Eschbacher
|
c799f4d73b
|
fix formatting of query
|
2016-06-27 10:09:13 -04:00 |
|
Andy Eschbacher
|
3e01470aa0
|
add error catching
|
2016-06-27 10:07:22 -04:00 |
|
Andy Eschbacher
|
a2b3733a1e
|
fix improper line drop
|
2016-06-27 09:58:42 -04:00 |
|
Andy Eschbacher
|
a5e4ae99ce
|
update tests
|
2016-06-27 09:57:23 -04:00 |
|
Andy Eschbacher
|
c80975fe46
|
updating formatting
|
2016-06-27 09:56:58 -04:00 |
|
Stuart Lynn
|
642935e44a
|
pyAgg documentation
|
2016-06-23 21:33:17 +00:00 |
|
Stuart Lynn
|
03aada8758
|
Adding a segmentation version that doesn't use query string passing
|
2016-06-23 20:23:04 +00:00 |
|
Rafa de la Torre
|
faa899cf87
|
Fix installation for development mode
|
2016-06-23 10:11:59 +02:00 |
|
Stuart Lynn
|
911a0ccccc
|
Merge branch 'develop' into segmentation
|
2016-06-22 21:46:07 +00:00 |
|
Stuart Lynn
|
de274bf628
|
removing commented code
|
2016-06-22 21:43:03 +00:00 |
|
Stuart Lynn
|
89c47dcef6
|
mocking out cursor
|
2016-06-22 20:21:52 +00:00 |
|
Stuart Lynn
|
1d7f62fa85
|
adding python tests
|
2016-06-22 20:21:37 +00:00 |
|
Stuart Lynn
|
4df8257377
|
updating to support passing model paramters and returning accuracy from the function along with prediction
|
2016-06-22 15:56:47 +00:00 |
|
Andy Eschbacher
|
b62d7b32ef
|
fix variable name
|
2016-06-21 17:41:52 -04:00 |
|
Andy Eschbacher
|
7c4314a411
|
fix tuple colon
|
2016-06-21 17:38:49 -04:00 |
|
Andy Eschbacher
|
1912d57891
|
replacing dict with ordered dict
|
2016-06-21 17:31:17 -04:00 |
|
Stuart Lynn
|
1d13b98d68
|
Basic version of create and predict segment
|
2016-06-21 21:00:30 +00:00 |
|
Stuart Lynn
|
79699cd5cb
|
changing to new crankshaft format
|
2016-06-20 17:27:37 -04:00 |
|
Luis Bosque
|
f5fb4499db
|
Set final dependencies versions
|
2016-06-20 09:44:52 +02:00 |
|
Luis Bosque
|
3480a0d252
|
Allow passing options to pip install
|
2016-06-16 16:56:16 +02:00 |
|
Raul Ochoa
|
237aa1c581
|
Declare scipy as dep
|
2016-06-16 16:34:45 +02:00 |
|
Raul Ochoa
|
1e19f468eb
|
Declare numpy dep
|
2016-06-16 16:23:43 +02:00 |
|
Raul Ochoa
|
a222341863
|
Merge pull request #59 from CartoDB/kmeans
KMeans clustering and weighted centroid analysis
|
2016-06-16 12:39:13 +02:00 |
|
Andy Eschbacher
|
4834ee2f42
|
adding higher numpy version
|
2016-06-15 11:36:19 -04:00 |
|
Rafa de la Torre
|
75531b671e
|
Remove virtualenv references from READMEs #60
|
2016-06-14 18:24:43 +02:00 |
|
Rafa de la Torre
|
0acae8240f
|
Remove virtualenv stuff from Makefiles #60
|
2016-06-14 18:23:30 +02:00 |
|
Raul Ochoa
|
fd1862167c
|
Remove trailing space
|
2016-06-13 13:06:21 +02:00 |
|
Raul Ochoa
|
c870f68c77
|
Revert "Declare scipy as dep"
This reverts commit 1e8bc12e0a.
|
2016-06-13 13:05:50 +02:00 |
|
Raul Ochoa
|
1e8bc12e0a
|
Declare scipy as dep
|
2016-06-13 12:17:46 +02:00 |
|
Raul Ochoa
|
889cd5c579
|
Fix scikit-learn dep name
|
2016-06-10 17:47:46 +02:00 |
|
Stuart Lynn
|
1a4944b960
|
adding sklearn as a dep
|
2016-06-10 13:16:16 +00:00 |
|
Stuart Lynn
|
9d3de5a8ef
|
adding not null filter for geom on kmeans
|
2016-06-10 13:12:55 +00:00 |
|
Ubuntu
|
4e86965f03
|
KMeans clustering and weighted centroid analysis
|
2016-06-07 19:58:32 +00:00 |
|
Andy Eschbacher
|
d41e28bc6f
|
pylint corrections
|
2016-06-06 09:26:52 -04:00 |
|
Andy Eschbacher
|
1f73be2752
|
rename functions -> trend
|
2016-06-06 08:46:13 -04:00 |
|
Andy Eschbacher
|
183a0f9604
|
comment out unneeded code whch w.transform handles
|
2016-06-03 11:01:53 -04:00 |
|
Andy Eschbacher
|
971c8f75d8
|
Merge branch 'develop' into add-spatial-markov
|
2016-06-02 12:59:49 -04:00 |
|
Andy Eschbacher
|
54d35c614b
|
adds tests passing for spatial_markov
|
2016-06-02 12:52:34 -04:00 |
|
Andy Eschbacher
|
0eb3db3c1d
|
adding fixtures
|
2016-06-02 12:12:52 -04:00 |
|
Andy Eschbacher
|
7a7cbcf33f
|
adds test for get_time_data
|
2016-06-02 09:49:09 -04:00 |
|