Permalink
Browse files

Clarified License (MIT)

  • Loading branch information...
1 parent 16d2d33 commit ac63afad84c7bfab7d767484a06c314c7af9b360 @imbcmdth committed May 24, 2010
Showing with 103 additions and 19 deletions.
  1. +20 −0 MIT-LICENSE.txt
  2. +3 −1 README
  3. +60 −1 examples/index.html
  4. +1 −1 examples/numbers.html
  5. BIN examples/rtree_benchmark.png
  6. +19 −16 src/rtree.js
View
@@ -0,0 +1,20 @@
+Copyright (c) 2009 Jon-Carlos Rivera
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
4 README
@@ -1,3 +1,5 @@
-R-Tree Library for Javascript
+MIT Licensed
+
+A non-recursive R-Tree library in pure JavaScript with no dependencies.
TODO: Make More ReadMe
View
@@ -2,6 +2,28 @@
<head>
<title>R-Tree Madness</title>
<script type='text/javascript' src="../libs/jquery.min.js"></script>
+ <style>
+ .even_row { padding:10px;
+ background-color:#fefefe;
+ }
+ .odd_row { padding:10px;
+ background-color:#efefff;
+ }
+ .slowest {
+ border:1px solid red;
+ }
+ .fastest {
+ border:1px solid green;
+ }
+ table, tr {
+ border:none;
+ padding:0px;
+ margin:0px;
+ }
+ thead {
+ font-weight:bold;
+ }
+ </style>
</head>
<body>
<h1>R-Tree Library for Javascript</h1>
@@ -22,7 +44,44 @@ <h4><a href="rtree.html">Area Effect</a></h4>
</p>
<h4><a href="numbers.html">Benchmark</a></h4>
<p>Inserts 10k objects. Performs some searches. Inserts another 10k objects. Performs some searches. Deletes and reinserts some objects. Performs some final searches.
-<a href="rtree_benchmark.png">Screenshot of various benchmark results</a></p>
+<a href="rtree_benchmark.png">Screenshot of various benchmark results</a><br /Results:<br />
+<table>
+ <thead>
+ <td class="odd_row">User Agent</td>
+ <td class="even_row">Initialize w/ 10k objects</td>
+ <td class="odd_row">Perform 1k searches</td>
+ <td class="even_row">Add 10k more objects</td>
+ <td class="odd_row">Another 1k searches</td>
+ </thead>
+ <tr>
+ <td class="odd_row">Firefox 3.7a4 pre</td>
+ <td class="even_row slowest">4471 ms</td>
+ <td class="odd_row slowest">563 ms</td>
+ <td class="even_row slowest">5098 ms</td>
+ <td class="odd_row slowest">908 ms</td>
+ </tr>
+ <tr>
+ <td class="odd_row">Safari (webkit r57055)</td>
+ <td class="even_row">3874 ms</td>
+ <td class="odd_row">294 ms</td>
+ <td class="even_row">4620 ms</td>
+ <td class="odd_row">450 ms</td>
+ </tr>
+ <tr>
+ <td class="odd_row">Opera 10.51 build 3315</td>
+ <td class="even_row">1108 ms</td>
+ <td class="odd_row fastest">78 ms</td>
+ <td class="even_row">1260 ms</td>
+ <td class="odd_row fastest">129 ms</td>
+ </tr>
+ <tr>
+ <td class="odd_row">Chrome 5.0.342.8 beta</td>
+ <td class="even_row fastest">805 ms</td>
+ <td class="odd_row">91 ms</td>
+ <td class="even_row fastest">904 ms</td>
+ <td class="odd_row">154 ms</td>
+ </tr>
+</table></p>
<h4><a href="canvas_test_generate.html">Super-Harcore Example</a></h4>
<p><b>ONLY run on Opera, Chrome, Safari, or Firefox 3.6 nightlies!</b><br/>
This test generates 20k dense non-overlapping rectangles of various size and color.
View
@@ -94,7 +94,7 @@
$('<div>Time To Run: '+diff+'ms</div>').appendTo($("#"+results_name));
$('<div>Number of Elements in Tree: '+rt.search({x:-1, y:-1, w:100600, h:100600}).length+'</div>').appendTo($("#"+results_name));
ti+=1;
- if(ti < 7) {
+ if(ti < 7) {
setTimeout(yield_some, 1000);
return;
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -3,22 +3,25 @@
Version 0.6.2, December 5st 2009
Copyright (c) 2009 Jon-Carlos Rivera
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Jon-Carlos Rivera - imbcmdth@hotmail.com
******************************************************************************/

0 comments on commit ac63afa

Please sign in to comment.