repo
string
commit
string
message
string
diff
string
djspiewak/scala-collections
83df4bb0e94e867bfcffff30928d4670ba56aeb0
Created specs for vector persistence (I'm still not convinced that I did it right)
diff --git a/src/spec/scala/VectorSpecs.scala b/src/spec/scala/VectorSpecs.scala index 1857a5a..95eecf2 100644 --- a/src/spec/scala/VectorSpecs.scala +++ b/src/spec/scala/VectorSpecs.scala @@ -1,426 +1,467 @@ import org.specs._ import org.scalacheck._ import com.codecommit.collection.{EmptyVector, Vector} objec...
djspiewak/scala-collections
3ce079bacbfe92a45f6bfdb21ccc95a6e2732b36
Eliminated polymorphic array use to optimize performance on Scala 2.7 (and eliminate pesky ArrayStoreExceptions)
diff --git a/src/main/scala/com/codecommit/collection/Vector.scala b/src/main/scala/com/codecommit/collection/Vector.scala index cad74a2..0db62a6 100644 --- a/src/main/scala/com/codecommit/collection/Vector.scala +++ b/src/main/scala/com/codecommit/collection/Vector.scala @@ -1,751 +1,819 @@ /** Copyright (c) 2007-2...
djspiewak/scala-collections
e4e9279e23a08c186538deed1abc90feb3bd760d
Swapped ExpVector in for Vector implementation
diff --git a/src/main/scala/com/codecommit/collection/ExpVector.scala b/src/main/scala/com/codecommit/collection/ExpVector.scala deleted file mode 100644 index 4061c99..0000000 --- a/src/main/scala/com/codecommit/collection/ExpVector.scala +++ /dev/null @@ -1,751 +0,0 @@ -/** - Copyright (c) 2007-2008, Rich Hickey - Al...
djspiewak/scala-collections
11f05df7ae7c0a1fd04a8fd4a66d20d93e7778b3
Created experimental Vector implementation with inline cases
diff --git a/src/main/scala/com/codecommit/collection/ExpVector.scala b/src/main/scala/com/codecommit/collection/ExpVector.scala new file mode 100644 index 0000000..4061c99 --- /dev/null +++ b/src/main/scala/com/codecommit/collection/ExpVector.scala @@ -0,0 +1,751 @@ +/** + Copyright (c) 2007-2008, Rich Hickey + All ri...
djspiewak/scala-collections
826d6d0f6f2e5d7f64937e65f925afa5658187dc
Removed obsolete code
diff --git a/src/main/scala/com/codecommit/collection/FingerTree.scala b/src/main/scala/com/codecommit/collection/FingerTree.scala index 193fb4f..07c1095 100644 --- a/src/main/scala/com/codecommit/collection/FingerTree.scala +++ b/src/main/scala/com/codecommit/collection/FingerTree.scala @@ -1,269 +1,259 @@ package co...
djspiewak/scala-collections
f87dea9a151a721d5619230bd99482976960fff5
Adjusted Deep implementation to use Digit rather than List
diff --git a/src/main/scala/com/codecommit/collection/FingerTree.scala b/src/main/scala/com/codecommit/collection/FingerTree.scala index a9f2c09..193fb4f 100644 --- a/src/main/scala/com/codecommit/collection/FingerTree.scala +++ b/src/main/scala/com/codecommit/collection/FingerTree.scala @@ -1,181 +1,269 @@ package co...
djspiewak/scala-collections
116862af1d6c32caf5f3466d7c3eb7832174cd48
Added benchmarking for FingerQueue
diff --git a/src/test/scala/QueuePerf.scala b/src/test/scala/QueuePerf.scala index 0be4e94..ae10599 100644 --- a/src/test/scala/QueuePerf.scala +++ b/src/test/scala/QueuePerf.scala @@ -1,179 +1,245 @@ -import com.codecommit.collection.BankersQueue +import com.codecommit.collection.{BankersQueue, FingerQueue} import sc...
djspiewak/scala-collections
a07c5cce1f73fa115fb821eb0e1e63bc695799a3
Fixed views for non-Nil prefixes/suffixes
diff --git a/src/main/scala/com/codecommit/collection/FingerTree.scala b/src/main/scala/com/codecommit/collection/FingerTree.scala index 6fafcfc..a9f2c09 100644 --- a/src/main/scala/com/codecommit/collection/FingerTree.scala +++ b/src/main/scala/com/codecommit/collection/FingerTree.scala @@ -1,159 +1,181 @@ package co...
djspiewak/scala-collections
886ed2e4a38b2d7c626590e4a74b761483c57458
Initial implementation of a finger tree and associated queue
diff --git a/src/main/scala/com/codecommit/collection/FingerQueue.scala b/src/main/scala/com/codecommit/collection/FingerQueue.scala new file mode 100644 index 0000000..7882aad --- /dev/null +++ b/src/main/scala/com/codecommit/collection/FingerQueue.scala @@ -0,0 +1,45 @@ +package com.codecommit.collection + +import sc...
djspiewak/scala-collections
4fca3733c6157c4eaaf3ea85c2affee0d891a61b
Added long-lived queue benchmark
diff --git a/src/test/scala/QueuePerf.scala b/src/test/scala/QueuePerf.scala index 4e5588a..0be4e94 100644 --- a/src/test/scala/QueuePerf.scala +++ b/src/test/scala/QueuePerf.scala @@ -1,124 +1,179 @@ import com.codecommit.collection.BankersQueue import scala.collection.immutable.Queue object QueuePerf { import...
djspiewak/scala-collections
7e86289256636da30fc2f5ab40fd47952570c924
Converted front parameter to strict evaluation (we have to force front anyway)
diff --git a/src/main/scala/com/codecommit/collection/BankersQueue.scala b/src/main/scala/com/codecommit/collection/BankersQueue.scala index 25fa5bf..1dc4595 100644 --- a/src/main/scala/com/codecommit/collection/BankersQueue.scala +++ b/src/main/scala/com/codecommit/collection/BankersQueue.scala @@ -1,74 +1,72 @@ pack...
djspiewak/scala-collections
9c464ebdbd795045d2c6c6fde8098f983c96c258
Switched tail Stream to List
diff --git a/src/main/scala/com/codecommit/collection/BankersQueue.scala b/src/main/scala/com/codecommit/collection/BankersQueue.scala index 8f9911a..25fa5bf 100644 --- a/src/main/scala/com/codecommit/collection/BankersQueue.scala +++ b/src/main/scala/com/codecommit/collection/BankersQueue.scala @@ -1,74 +1,74 @@ pack...
djspiewak/scala-collections
6787bd948910ba8161171296d03fd98bd1e42534
Avoid chaining together lazy operations indefinitely
diff --git a/src/main/scala/com/codecommit/collection/BankersQueue.scala b/src/main/scala/com/codecommit/collection/BankersQueue.scala index b944da6..8f9911a 100644 --- a/src/main/scala/com/codecommit/collection/BankersQueue.scala +++ b/src/main/scala/com/codecommit/collection/BankersQueue.scala @@ -1,74 +1,74 @@ pack...
djspiewak/scala-collections
98b908cafa5555bd420df7312d5d14d488543bbb
Removed laziness from rear (it's unnecessary anyway)
diff --git a/src/main/scala/com/codecommit/collection/BankersQueue.scala b/src/main/scala/com/codecommit/collection/BankersQueue.scala index ff881b3..b944da6 100644 --- a/src/main/scala/com/codecommit/collection/BankersQueue.scala +++ b/src/main/scala/com/codecommit/collection/BankersQueue.scala @@ -1,75 +1,74 @@ pack...
djspiewak/scala-collections
ac7465918dfa318cb53cfc05f3eebee506a91f6a
Added performance test for BankersQueue
diff --git a/do_perf b/do_perf index c50b49f..60473d8 100755 --- a/do_perf +++ b/do_perf @@ -1,8 +1,8 @@ #!/bin/sh buildr test:compile if [ "$?" ]; then echo =============================================================================== - exec java -Xmx2048m -Xms512m -server -cp "${SCALA_HOME}/lib/scala-lib...
djspiewak/scala-collections
2dc79cf7a7a79d97fca4bbe0d414839fca538add
Added some minimal specs for BankersQueue
diff --git a/src/spec/scala/BankersQueueSpecs.scala b/src/spec/scala/BankersQueueSpecs.scala new file mode 100644 index 0000000..0805eda --- /dev/null +++ b/src/spec/scala/BankersQueueSpecs.scala @@ -0,0 +1,38 @@ +import com.codecommit.collection.BankersQueue + +import org.specs._ +import org.scalacheck._ + +object Ban...
djspiewak/scala-collections
0abaa76b34c4924c42be097ff7a8d0fe937bc00b
Added an implementation of Okasaki's Banker's Queue
diff --git a/src/main/scala/com/codecommit/collection/BankersQueue.scala b/src/main/scala/com/codecommit/collection/BankersQueue.scala new file mode 100644 index 0000000..ff881b3 --- /dev/null +++ b/src/main/scala/com/codecommit/collection/BankersQueue.scala @@ -0,0 +1,75 @@ +package com.codecommit.collection + +import...
djspiewak/scala-collections
ca4c839b133d69edb2499818700678f7750b5d73
Made everything (ish) work under Scala 2.8
diff --git a/src/main/scala/com/codecommit/collection/BloomSetArray.scala b/src/main/scala/com/codecommit/collection/BloomSetArray.scala index e0bdcf8..8df3fac 100644 --- a/src/main/scala/com/codecommit/collection/BloomSetArray.scala +++ b/src/main/scala/com/codecommit/collection/BloomSetArray.scala @@ -1,74 +1,74 @@ ...
djspiewak/scala-collections
c165fa8697f0d147487f9dd5c2edd08dd9f3374c
Added build cruft to move forward to Scala 2.8; eliminated obsolete collections
diff --git a/buildfile b/buildfile index 9aab134..9cc3b78 100644 --- a/buildfile +++ b/buildfile @@ -1,14 +1,26 @@ +ENV['SCALA_HOME'] = ENV['SCALA28_HOME'] + require 'buildr/scala' #require 'buildr/java/cobertura' -repositories.remote << 'http://repo1.maven.org/maven2/' +repositories.remote << 'http://repo1.maven.o...
djspiewak/scala-collections
6cdf77c9ac8e6de3e5b63360e1b28c4168e88cd8
Fixed up everything for the latest version of ScalaCheck
diff --git a/buildfile b/buildfile index 9d64a91..9aab134 100644 --- a/buildfile +++ b/buildfile @@ -1,15 +1,14 @@ require 'buildr/scala' #require 'buildr/java/cobertura' -require 'buildr/groovy' repositories.remote << 'http://repo1.maven.org/maven2/' desc 'A few collections classes for fun and profit' define ...
djspiewak/scala-collections
883d4606378fa879ed83120bdde7fa01d608f094
Removed cobertura from default build
diff --git a/buildfile b/buildfile index ed5616b..9d64a91 100644 --- a/buildfile +++ b/buildfile @@ -1,15 +1,15 @@ require 'buildr/scala' -require 'buildr/java/cobertura' +#require 'buildr/java/cobertura' require 'buildr/groovy' -repositories.remote << 'http://www.ibiblio.org/maven2' +repositories.remote << 'http:/...
djspiewak/scala-collections
f60315249528fd84fc3f1e365636def2210a684b
Added .gitignore
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..27a7dfc --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +reports/ +target/
djspiewak/scala-collections
0607d9aa02945761af83140ddf650463696ebe7c
No need to explitly add the scala-tools repo
diff --git a/buildfile b/buildfile index 4b703a2..ed5616b 100644 --- a/buildfile +++ b/buildfile @@ -1,16 +1,15 @@ require 'buildr/scala' require 'buildr/java/cobertura' require 'buildr/groovy' repositories.remote << 'http://www.ibiblio.org/maven2' -repositories.remote << 'http://scala-tools.org/repo-releases' ...
djspiewak/scala-collections
692c4d8613ad9dd600b29ccbf9fb88813113053e
New cobertura support in Buildr
diff --git a/buildfile b/buildfile index fd3e4db..4b703a2 100644 --- a/buildfile +++ b/buildfile @@ -1,15 +1,16 @@ require 'buildr/scala' -#require 'buildr/cobertura' +require 'buildr/java/cobertura' +require 'buildr/groovy' repositories.remote << 'http://www.ibiblio.org/maven2' repositories.remote << 'http://scal...
djspiewak/scala-collections
d918818053d7a31ed7e7036bd69396a42ec58eb0
Whitespace fun
diff --git a/buildfile b/buildfile index 92e7f07..fd3e4db 100644 --- a/buildfile +++ b/buildfile @@ -1,15 +1,15 @@ require 'buildr/scala' #require 'buildr/cobertura' repositories.remote << 'http://www.ibiblio.org/maven2' repositories.remote << 'http://scala-tools.org/repo-releases' desc 'A few collections clas...
djspiewak/scala-collections
d5a7e13f238cb5526afbdce6371ff444676b7704
Fixed mistake in subseq spec
diff --git a/src/spec/scala/VectorSpecs.scala b/src/spec/scala/VectorSpecs.scala index 1a97c79..eda5c82 100644 --- a/src/spec/scala/VectorSpecs.scala +++ b/src/spec/scala/VectorSpecs.scala @@ -1,426 +1,426 @@ import org.specs._ import org.scalacheck._ import com.codecommit.collection.{EmptyVector, Vector} objec...
djspiewak/scala-collections
ab066de3669952e3d5d486b3e3f432028c1933c1
Use :specs in special fork of Buildr
diff --git a/build.yaml b/build.yaml deleted file mode 100644 index 6e00ca9..0000000 --- a/build.yaml +++ /dev/null @@ -1,2 +0,0 @@ -scala.check: 1.5 -scala.specs: 1.4.1 diff --git a/buildfile b/buildfile index 2a9c92a..92e7f07 100644 --- a/buildfile +++ b/buildfile @@ -1,15 +1,15 @@ require 'buildr/scala' #require '...
djspiewak/scala-collections
27fa0e10a94e02e412c8b21396bb7cdf68d3b269
Added a new performance test
diff --git a/src/test/scala/HashPerf.scala b/src/test/scala/HashPerf.scala index e2a52f4..0d03b71 100644 --- a/src/test/scala/HashPerf.scala +++ b/src/test/scala/HashPerf.scala @@ -1,296 +1,399 @@ import com.codecommit.collection.{HashTrie, VectorHashMap} import scala.collection.immutable.TreeHashMap object Hash...
djspiewak/scala-collections
533928a759a95215b84676358bf5f3b911c2c0d2
Semantic bugfix
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index 8d4bb6d..2814bf0 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,361 +1,361 @@ /** Copyright (c...
djspiewak/scala-collections
f7ee2a420dcb64da04b1e60563491ce763354db6
Bitsy stylistic change
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index 4dd9cd9..8d4bb6d 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,361 +1,361 @@ /** Copyright (c...
djspiewak/scala-collections
5397ba84e04bf4fa999ab9e000c9886158708f90
Re-added build.yaml
diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..6e00ca9 --- /dev/null +++ b/build.yaml @@ -0,0 +1,2 @@ +scala.check: 1.5 +scala.specs: 1.4.1
djspiewak/scala-collections
ebf44d0f159a5302ab4aedf3a9eff7066d7f5f52
Fixed bitmap creation optimization
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index a5d8f5f..4dd9cd9 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,351 +1,361 @@ /** Copyright (c...
djspiewak/scala-collections
5cd0239e78d37858bba8d415ba5d6b02310c1aa2
Reduced the number of new nodes necessary
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index d92c406..a5d8f5f 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,356 +1,351 @@ /** Copyright (c...
djspiewak/scala-collections
95669e92cb5a8b0c649866c3b73dc882c20c5d07
Improved efficiency of the #elements method
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index cb288a7..d92c406 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,355 +1,356 @@ /** Copyright (c...
djspiewak/scala-collections
bb2a4233a9cfbcff0d65f69670489207f36ca230
Added hash map growth; performance tests
diff --git a/src/main/scala/com/codecommit/collection/VectorHashMap.scala b/src/main/scala/com/codecommit/collection/VectorHashMap.scala index 12bda5a..e51220d 100644 --- a/src/main/scala/com/codecommit/collection/VectorHashMap.scala +++ b/src/main/scala/com/codecommit/collection/VectorHashMap.scala @@ -1,97 +1,129 @@ ...
djspiewak/scala-collections
d9a0c4020f8a7a52456ffa00f124d00940d6bafa
Added prototype of a Vector-based persistent HashMap
diff --git a/src/main/scala/com/codecommit/collection/VectorHashMap.scala b/src/main/scala/com/codecommit/collection/VectorHashMap.scala new file mode 100644 index 0000000..12bda5a --- /dev/null +++ b/src/main/scala/com/codecommit/collection/VectorHashMap.scala @@ -0,0 +1,97 @@ +package com.codecommit.collection + +cla...
djspiewak/scala-collections
23fa583f6f2349ae96973c081cb51394bd368dbb
Added some more specs (up to 98% coverage!)
diff --git a/src/test/scala/VectorSpecs.scala b/src/test/scala/VectorSpecs.scala index d59bb0b..1a97c79 100644 --- a/src/test/scala/VectorSpecs.scala +++ b/src/test/scala/VectorSpecs.scala @@ -1,332 +1,426 @@ import org.specs._ import org.scalacheck._ -import com.codecommit.collection.Vector +import com.codecommit....
djspiewak/scala-collections
cd9a39bf7b5e631ace3968406d2d784d23161881
Replaced tabs with spaces
diff --git a/src/main/scala/com/codecommit/collection/Vector.scala b/src/main/scala/com/codecommit/collection/Vector.scala index 670bdd4..5bbfc96 100644 --- a/src/main/scala/com/codecommit/collection/Vector.scala +++ b/src/main/scala/com/codecommit/collection/Vector.scala @@ -1,351 +1,351 @@ /** Copyright (c) 2007-2...
djspiewak/scala-collections
63f72d1cc116c946c48bed1e088dec926fcb6311
Added a little more attribution
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index a4b1e9c..cb288a7 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,354 +1,355 @@ /** Copyright (c...
djspiewak/scala-collections
ca63f092168c868485e3c7fd094b5f0f1413102f
Added new copyright notice (BSD license)
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index 9cf586a..a4b1e9c 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,320 +1,354 @@ +/** + Copyright (c...
djspiewak/scala-collections
3d7c489f1647673461ede4441ff5bbb8ed22a531
Changed to reflect release of Specs 1.4.0
diff --git a/build.yaml b/build.yaml index 758f83b..a00f79f 100644 --- a/build.yaml +++ b/build.yaml @@ -1,2 +1,2 @@ scala.check: 1.4-scSNAPSHOT -scala.specs: 1.3.2-SNAPSHOT +scala.specs: 1.4.0
djspiewak/scala-collections
8483498551d86868132529ebd0ad6b495c21c635
Added foreach benchmarks
diff --git a/src/test/scala/HashPerf.scala b/src/test/scala/HashPerf.scala index 8c8fd6a..b12eefa 100644 --- a/src/test/scala/HashPerf.scala +++ b/src/test/scala/HashPerf.scala @@ -1,166 +1,246 @@ import com.codecommit.collection.HashTrie import scala.collection.immutable.TreeHashMap object HashPerf { import ...
djspiewak/scala-collections
73ef058bc268dd2bbda86cbd0cd2d91845ed6944
Corrected deconstructor
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index 994443e..9cf586a 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,320 +1,320 @@ package com.codeco...
djspiewak/scala-collections
f8f6f7c9f50faf2567a5261a4013d38a5accde6a
Some optimizations and common-case short-circuits
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index 6c797cc..994443e 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,302 +1,320 @@ package com.codeco...
djspiewak/scala-collections
95f4c3a43b7db4bb181cc4deb55c6ce25261236c
Moderate improvement in trie balance
diff --git a/src/main/scala/com/codecommit/collection/HashTrie.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala index 4160ad9..6c797cc 100644 --- a/src/main/scala/com/codecommit/collection/HashTrie.scala +++ b/src/main/scala/com/codecommit/collection/HashTrie.scala @@ -1,301 +1,302 @@ package com.codeco...
djspiewak/scala-collections
71f8638c270f8c0eac8babdfbe348426fc42a1ca
Renamed HashMap => HashTrie
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashTrie.scala similarity index 94% rename from src/main/scala/com/codecommit/collection/HashMap.scala rename to src/main/scala/com/codecommit/collection/HashTrie.scala index 423b51e..4160ad9 100644 --- a/src/...
djspiewak/scala-collections
573a53fd5502515a9e560b76ed064c4a89ee54be
Changed to String keys; added TreeHashMap benchmark
diff --git a/src/test/scala/HashPerf.scala b/src/test/scala/HashPerf.scala index 4b4de0c..a370b44 100644 --- a/src/test/scala/HashPerf.scala +++ b/src/test/scala/HashPerf.scala @@ -1,170 +1,166 @@ import com.codecommit.collection.HashMap -import scala.collection.immutable.IntMap +import scala.collection.immutable.Tr...
djspiewak/scala-collections
3318a8957f257919bafd7ae920f65bf0ea07c67d
Ported forward to Specs 1.3.2 / ScalaCheck 1.4 (compatible Scala 2.7.2)
diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..758f83b --- /dev/null +++ b/build.yaml @@ -0,0 +1,2 @@ +scala.check: 1.4-scSNAPSHOT +scala.specs: 1.3.2-SNAPSHOT diff --git a/buildfile b/buildfile index 649a03b..2a9c92a 100644 --- a/buildfile +++ b/buildfile @@ -1,12 +1,15 @@ require 'buildr/sc...
djspiewak/scala-collections
b220734243ff165962f82bf98851359c2c0a2852
Removed pointless test
diff --git a/src/test/scala/HashMapSpecs.scala b/src/test/scala/HashMapSpecs.scala index ad91893..5553624 100644 --- a/src/test/scala/HashMapSpecs.scala +++ b/src/test/scala/HashMapSpecs.scala @@ -1,108 +1,101 @@ import org.specs._ import org.scalacheck._ import com.codecommit.collection.HashMap object HashMapS...
djspiewak/scala-collections
06c64716ffec9788162fe1f46072494b4a8c3e79
Added lookup benchmarks
diff --git a/src/test/scala/HashPerf.scala b/src/test/scala/HashPerf.scala index ae0295c..3a18be5 100644 --- a/src/test/scala/HashPerf.scala +++ b/src/test/scala/HashPerf.scala @@ -1,57 +1,168 @@ import com.codecommit.collection.HashMap object HashPerf { import PerfLib._ def main(args: Array[String]) { ...
djspiewak/scala-collections
6d1a1e6ddd5a636098b03d154c62dfa87bda230d
Improved tests to catch more problems with lookup
diff --git a/src/test/scala/HashMapSpecs.scala b/src/test/scala/HashMapSpecs.scala index 76cc7ef..ad91893 100644 --- a/src/test/scala/HashMapSpecs.scala +++ b/src/test/scala/HashMapSpecs.scala @@ -1,108 +1,108 @@ import org.specs._ import org.scalacheck._ import com.codecommit.collection.HashMap object HashMapS...
djspiewak/scala-collections
dd923391adf1b7d5ec66553953f1103ecca030c2
FullNode fix
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index 08bce7c..423b51e 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,305 +1,301 @@ package com.codecommit...
djspiewak/scala-collections
51d7f4396f90a78d1cfc7ba6a45665d7259a7512
Optimized the "half-full bitmap" case
diff --git a/do_hash_perf b/do_hash_perf index bfe4b02..be06cc6 100755 --- a/do_hash_perf +++ b/do_hash_perf @@ -1,8 +1,8 @@ #!/bin/sh buildr test:compile -if [ "$?" ]; then +if [ $? -eq 0 ]; then echo =============================================================================== exec java -Xmx2048m -Xms51...
djspiewak/scala-collections
d1f4e5d8e2abd8afc67700295b8101d62a48e7e7
Hopefully fixed odd bash error
diff --git a/do_perf b/do_perf index cf9d23c..c50b49f 100755 --- a/do_perf +++ b/do_perf @@ -1,8 +1,8 @@ #!/bin/sh buildr test:compile -if [$? -eq 0]; then +if [ "$?" ]; then echo =============================================================================== exec java -Xmx2048m -Xms512m -server -cp "${SCAL...
djspiewak/scala-collections
9aaf7dacef1dc2951c12b48ebe7d7efb939568c2
Added HashPerf
diff --git a/do_hash_perf b/do_hash_perf new file mode 100755 index 0000000..bfe4b02 --- /dev/null +++ b/do_hash_perf @@ -0,0 +1,8 @@ +#!/bin/sh + +buildr test:compile + +if [ "$?" ]; then + echo =============================================================================== + exec java -Xmx2048m -Xms512m -server -cp...
djspiewak/scala-collections
f36ca226e440c030e53a9f5655de82890ce4ea86
Added check to ensure that compilation succedes
diff --git a/do_perf b/do_perf index a816cb9..cf9d23c 100755 --- a/do_perf +++ b/do_perf @@ -1,6 +1,8 @@ #!/bin/sh buildr test:compile -echo =============================================================================== -exec java -Xmx2048m -Xms512m -server -cp "${SCALA_HOME}/lib/scala-library.jar:target/classes...
djspiewak/scala-collections
274b15615e78c8a73b625ad31286eec23825ec99
Removed unnecessary import
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index 4c455e5..fa6c8da 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,303 +1,301 @@ package com.codecommit...
djspiewak/scala-collections
e2d3f924c459b51cef39d45a8d4f25c5406532eb
Fixed classname to comply with filename
diff --git a/src/test/scala/VectorPerf.scala b/src/test/scala/VectorPerf.scala index 078deee..676256d 100644 --- a/src/test/scala/VectorPerf.scala +++ b/src/test/scala/VectorPerf.scala @@ -1,433 +1,433 @@ import com.codecommit.collection.Vector import scala.collection.mutable.ArrayBuffer -object VectorPerfTest { ...
djspiewak/scala-collections
b8b32aa3c5d90cbb85e4cb07728fc217e4898fc2
Modified do_perf script to account for new changes
diff --git a/do_perf b/do_perf index 3e5482d..e7e57ce 100755 --- a/do_perf +++ b/do_perf @@ -1,4 +1,6 @@ #!/bin/sh -buildr compile -exec java -Xmx1024m -Xms256m -server -cp "${SCALA_HOME}/lib/scala-library.jar:target/classes" VectorPerfTest +buildr test:compile + +echo ===============================================...
djspiewak/scala-collections
08da68eb150a18891dbf55d6c38befb6f984c9de
Added quick comment
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index 6ccf4fb..4c455e5 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,296 +1,303 @@ package com.codecommit...
djspiewak/scala-collections
b891b9332f1c3db42aabf0dd33072cb2805194e9
Added empty spec
diff --git a/src/test/scala/HashMapSpecs.scala b/src/test/scala/HashMapSpecs.scala index 63a7abe..cf8742a 100644 --- a/src/test/scala/HashMapSpecs.scala +++ b/src/test/scala/HashMapSpecs.scala @@ -1,93 +1,101 @@ import org.specs._ import org.scalacheck._ import com.codecommit.collection.HashMap object HashMapSp...
djspiewak/scala-collections
35079a13c8d1ad01a1b803bc13594c61ab5b46c8
Removed unnecessary collisions
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index 8ed463c..6ccf4fb 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,296 +1,296 @@ package com.codecommit...
djspiewak/scala-collections
7975de313ed5fc4d6de326ecaf2ba0c1349fd701
Removed printlns
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index 4abc60e..8ed463c 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,297 +1,296 @@ package com.codecommit...
djspiewak/scala-collections
6995129a71deb79e1227a614c1559b6e15448428
Fixed removal from CollisionNode(s)
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index b17cfb3..4abc60e 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,298 +1,297 @@ package com.codecommit...
djspiewak/scala-collections
72d85b97870a6fe4b1e7354b219778fb5ccdfb23
Toward optimized bitmapped removal
diff --git a/src/main/scala/com/codecommit/collection/HashMap.scala b/src/main/scala/com/codecommit/collection/HashMap.scala index 224c6ba..b17cfb3 100644 --- a/src/main/scala/com/codecommit/collection/HashMap.scala +++ b/src/main/scala/com/codecommit/collection/HashMap.scala @@ -1,288 +1,298 @@ package com.codecommit...
djspiewak/scala-collections
1c27169755daa9975b26d44290fc2f547bc80bb1
Added String removal spec and refined slightly
diff --git a/buildfile b/buildfile new file mode 100644 index 0000000..649a03b --- /dev/null +++ b/buildfile @@ -0,0 +1,12 @@ +require 'buildr/scala' + +repositories.remote << 'http://www.ibiblio.org/maven2' +repositories.remote << 'http://scala-tools.org/repo-releases' + +desc 'A few collections classes for fun and pr...
anerian/rack-analytics
ba1ad1ae37712750ba53f72cc8fd5f0319ee5117
add in mutex support
diff --git a/lib/rack-analytics.rb b/lib/rack-analytics.rb index 337cbba..12dd03c 100644 --- a/lib/rack-analytics.rb +++ b/lib/rack-analytics.rb @@ -1,127 +1,134 @@ require 'ruby-prof' require 'ruby-debug' +$reporter = nil +$mutex = Mutex.new module Rack + class Reporter + attr_accessor :logfile + def initi...
anerian/rack-analytics
ec2f651d86b7dbaf171a14ef7bcbc660897260fd
cleanup some unused vars
diff --git a/lib/rack-analytics.rb b/lib/rack-analytics.rb index 79f510f..337cbba 100644 --- a/lib/rack-analytics.rb +++ b/lib/rack-analytics.rb @@ -1,131 +1,127 @@ require 'ruby-prof' require 'ruby-debug' module Rack # Set the profile=process_time query parameter to download a # calltree profile of the requ...
anerian/rack-analytics
540da863bfc1f8bb6f62574f9cf16585be69e13d
flesh out file writing/archiving functionality
diff --git a/lib/rack-analytics.rb b/lib/rack-analytics.rb index 85edffa..79f510f 100644 --- a/lib/rack-analytics.rb +++ b/lib/rack-analytics.rb @@ -1,100 +1,131 @@ require 'ruby-prof' require 'ruby-debug' module Rack # Set the profile=process_time query parameter to download a # calltree profile of the requ...
anerian/rack-analytics
9b72f4c545d9810e1e8d6dbebab8ec0aba67d791
remove debug
diff --git a/lib/rack-analytics.rb b/lib/rack-analytics.rb index 499687c..85edffa 100644 --- a/lib/rack-analytics.rb +++ b/lib/rack-analytics.rb @@ -1,101 +1,100 @@ -puts "required main class here" require 'ruby-prof' require 'ruby-debug' module Rack # Set the profile=process_time query parameter to download a ...
anerian/rack-analytics
f815563fe1dc2ba3e9cfd45c3e657a45ba7b0fe1
clean up license etc
diff --git a/LICENSE b/LICENSE index 1bb1534..72329a0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,20 @@ -Copyright (c) 2009 Jack Dempsey +Copyright (c) 2009 Anerian LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software...
anerian/rack-analytics
b8dbad8630d41828c9d4f207881758e778325039
move over to use jeweler
diff --git a/LICENSE b/LICENSE index 72329a0..1bb1534 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,20 @@ -Copyright (c) 2009 Anerian LLC +Copyright (c) 2009 Jack Dempsey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software...
anerian/rack-analytics
64208fc2873596fe7d8aeba0273791ed9b3f7b76
add in main lib require file
diff --git a/lib/rack-analytics.rb b/lib/rack-analytics.rb new file mode 100644 index 0000000..f4c01bb --- /dev/null +++ b/lib/rack-analytics.rb @@ -0,0 +1 @@ +require 'rack/analytics'
anerian/rack-analytics
278ca65229e5119235caa3b77e0f709321736fdf
create gemspec
diff --git a/rack-analytics.gemspec b/rack-analytics.gemspec new file mode 100644 index 0000000..af6f2fb --- /dev/null +++ b/rack-analytics.gemspec @@ -0,0 +1,30 @@ +# -*- encoding: utf-8 -*- + +Gem::Specification.new do |s| + s.name = %q{rack-analytics} + s.version = "0.0.1" + + s.required_rubygems_version = Gem::R...
anerian/rack-analytics
2975876080392a5fb8fdd8ac49dc5c2143107bf0
adding in gem files
diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f8bd0f0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2009 YOUR NAME + +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 Sof...
david-guenault/frogx_api
4aac4cd7b3cf2cd16f946719637f2be5d927cd50
live now handle overall states and partial performances informations. tac class removed
diff --git a/api/live.php b/api/live.php index 77d68eb..58020a9 100644 --- a/api/live.php +++ b/api/live.php @@ -1,759 +1,968 @@ <?php /** * base class to use live status implementation in shinken and nagios * * @package livestatusapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyri...
david-guenault/frogx_api
fe9bb416b741cc5ff36f952cfc2b974b30c409aa
Added function getOverallStates allowing to get a summary of states for host and services
diff --git a/api/live.php b/api/live.php index 37a6aae..77d68eb 100644 --- a/api/live.php +++ b/api/live.php @@ -1,498 +1,759 @@ <?php /** * base class to use live status implementation in shinken and nagios * * @package livestatusapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyri...
david-guenault/frogx_api
55eac56799a58bccfaa333527ca22408d3ce9300
Fixed some typo in command example
diff --git a/examples/livestatus-command.php b/examples/livestatus-command.php index 49bc3c5..6815ba8 100644 --- a/examples/livestatus-command.php +++ b/examples/livestatus-command.php @@ -1,30 +1,35 @@ <?php // this script send an external command to livestatus $base = "/var/www/frogx"; include_once ($base."/api...
david-guenault/frogx_api
fdbe07ad337c492e83b909b6c0518c31b407477a
fixed several bugs in live and tac. Now all seems to work fine
diff --git a/api/live.php b/api/live.php index 6f57291..37a6aae 100644 --- a/api/live.php +++ b/api/live.php @@ -1,487 +1,498 @@ <?php /** * base class to use live status implementation in shinken and nagios * * @package livestatusapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyri...
david-guenault/frogx_api
f94f33397fdc78a00722bed340ec20e0181b5d86
Added readme file
diff --git a/README b/README new file mode 100644 index 0000000..e69de29
david-guenault/frogx_api
58a5a2d22a491ee02becd85762782594c0c44c87
tac example print json now
diff --git a/examples/livestatus-tac.php b/examples/livestatus-tac.php index 3708941..fafa0ca 100644 --- a/examples/livestatus-tac.php +++ b/examples/livestatus-tac.php @@ -1,13 +1,13 @@ <?php /** * get overall hosts and services states (as known as tactical overview) * this introduce the concept of multisite. Ea...
david-guenault/frogx_api
1ccb268a388434305d27eb9e7007800cdf69deb0
tac data should be returned as json
diff --git a/api/tac.php b/api/tac.php index 623ec49..184450d 100644 --- a/api/tac.php +++ b/api/tac.php @@ -1,152 +1,152 @@ <?php /** * base class to use live status implementation in shinken and nagios * * @package livestatusapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyright ...
david-guenault/frogx_api
6beee293e29f6cf2d5c9f50ad483bb47d04e4e18
added support for tactical overview (only overall hosts and services states)
diff --git a/api/live.php b/api/live.php index a429d9c..6f57291 100644 --- a/api/live.php +++ b/api/live.php @@ -1,485 +1,487 @@ <?php /** * base class to use live status implementation in shinken and nagios * * @package livestatusapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyri...
david-guenault/frogx_api
a35ff137bbb212687446e6acb1ffc3e0ccc7f111
added configuration files
diff --git a/conf/commands.inc.php b/conf/commands.inc.php new file mode 100644 index 0000000..9de8894 --- /dev/null +++ b/conf/commands.inc.php @@ -0,0 +1,33 @@ +<?php +$config["commands"]=array( + "ACKNOWLEDGE_HOST_PROBLEM"=>array("host_name","sticky","notify","persistent","author","comment"), + "ACKNOW...
david-guenault/frogx_api
3c3610ae8c7ff30a019c002df4192f6cad5bc3c3
added working version of tac management
diff --git a/api/tac.php b/api/tac.php new file mode 100644 index 0000000..9c699c1 --- /dev/null +++ b/api/tac.php @@ -0,0 +1,47 @@ +<?php +/** + * base class to use live status implementation in shinken and nagios + * + * @package livestatusapi + * @author David GUENAULT (dguenault@monitoring-fr.org) + * @cop...
david-guenault/frogx_api
3aee8c358e6fc95277970e31e502aaa88cc4e73f
Added support for external commands, support for unix and tcp socket, fixed several bugs, added an external command example
diff --git a/api/live.php b/api/live.php index 92a6789..a429d9c 100644 --- a/api/live.php +++ b/api/live.php @@ -1,379 +1,485 @@ <?php /** * base class to use live status implementation in shinken and nagios * * @package livestatusapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyri...
david-guenault/frogx_api
4e78e1ce3d4df67e6f15d61349ba0a9a65f2436c
fix typo
diff --git a/api/live.php b/api/live.php index 325fad9..92a6789 100644 --- a/api/live.php +++ b/api/live.php @@ -1,379 +1,379 @@ <?php /** - * base class to use live status implementation in shinken + * base class to use live status implementation in shinken and nagios * - * @package shinkenapi + * @package ...
david-guenault/frogx_api
68ef6a8a132011ae86cd2de3e8db6bebe15a3d8a
First working version (but without commands)
diff --git a/api/live.php b/api/live.php index a0f175e..325fad9 100644 --- a/api/live.php +++ b/api/live.php @@ -1,257 +1,379 @@ <?php /** * base class to use live status implementation in shinken * * @package shinkenapi * @author David GUENAULT (dguenault@monitoring-fr.org) * @copyright (c) 2010...
david-guenault/frogx_api
26d66ee7ae1e51fc40b1e788df99b349640608ff
First import
diff --git a/api/live.php b/api/live.php new file mode 100644 index 0000000..a0f175e --- /dev/null +++ b/api/live.php @@ -0,0 +1,257 @@ +<?php +/** + * base class to use live status implementation in shinken + * + * @package shinkenapi + * @author David GUENAULT (dguenault@monitoring-fr.org) + * @copyright (...
rngtng/nups
463ba6f2244806670079057693a3e27d8b00910e
clean queue before each spec
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3df96f5..a3714eb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,56 +1,57 @@ require 'simplecov' SimpleCov.start 'rails' if ENV["COV"] ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require...
rngtng/nups
e852813c77cb9403790cca6b4d59843ad7d15886
rails upgrade, gem update, fixed deprecation warnings
diff --git a/Gemfile b/Gemfile index 4e0cfc2..aa6f093 100644 --- a/Gemfile +++ b/Gemfile @@ -1,81 +1,81 @@ source 'http://rubygems.org' -gem 'rails', '~> 3.2.3' +gem 'rails', '~> 3.2.5' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise" # Use resque for async jobs gem 'resque' g...
rngtng/nups
fe21140552467bf2373a65ed0d5f6d69acbea5e3
gem updates
diff --git a/Gemfile b/Gemfile index 58c077a..4e0cfc2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,81 +1,81 @@ source 'http://rubygems.org' -gem 'rails', '~> 3.2.1' +gem 'rails', '~> 3.2.3' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise" # Use resque for async jobs gem 'resque' -g...
rngtng/nups
8b2e4035933515899be1b2f0d693066f14829e45
force reconnect when mysql gone away, send send_out errors to air brake
diff --git a/README.md b/README.md index aaae714..d249a79 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,92 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
aad0f655f9fa7075558dcac7812e2a8ffccca4e0
replaced annotate plugin by gem, updated annotations
diff --git a/Gemfile b/Gemfile index 454877f..f05a544 100644 --- a/Gemfile +++ b/Gemfile @@ -1,79 +1,81 @@ source 'http://rubygems.org' gem 'rails', '~> 3.2.0.rc2' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise" # Use resque for async jobs gem 'resque' gem 'resque-scheduler'...
rngtng/nups
daed26c1e69c9af750344790b9a1f10ba4bb3253
fixed JS date bug, added send grid todo
diff --git a/README.md b/README.md index b446998..aaae714 100644 --- a/README.md +++ b/README.md @@ -1,90 +1,92 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
4a83dbbfcf7545e075f1b0ba1ec863e1196ba774
added chart to analyze read behavior
diff --git a/app/assets/stylesheets/frame.css.scss b/app/assets/stylesheets/frame.css.scss index c9f3340..9059451 100644 --- a/app/assets/stylesheets/frame.css.scss +++ b/app/assets/stylesheets/frame.css.scss @@ -1,88 +1,92 @@ // // This is a manifest file that'll automatically include all the stylesheets available i...
rngtng/nups
e9b198ac11417564b39b54e9f495816509aeab1a
speed up NL destroy, fix chart date
diff --git a/app/helpers/charts_helper.rb b/app/helpers/charts_helper.rb index 225bfb3..210e4a1 100644 --- a/app/helpers/charts_helper.rb +++ b/app/helpers/charts_helper.rb @@ -1,66 +1,66 @@ module ChartsHelper NL_FIELDS = %w(finishs_count reads_count fails_count bounces_count sendings_per_second) def newslett...
rngtng/nups
4676b6825b9353ead0b5484d5b710f8077e345e2
moved enquque actions back in after transition
diff --git a/app/models/newsletter.rb b/app/models/newsletter.rb index c19f426..4398580 100644 --- a/app/models/newsletter.rb +++ b/app/models/newsletter.rb @@ -1,208 +1,208 @@ class Newsletter < ActiveRecord::Base QUEUE = :nups_newsletter HEADER_ID = "X-MA-Id" belongs_to :account has_many :recipients,...
rngtng/nups
f9b54173ea9c569d0507506f6920296456c97175
move scheduler deploy task to rake
diff --git a/.gitignore b/.gitignore index 32bf618..c04514a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,20 @@ .rvmrc .bundle db/*.sqlite3 db/schema.rb log/*.log tmp/ .DS_Store config/database.yml config/mail.yml public/system dump.rdb Newsletter_state.png Sending_state.png .tmtags config/setup_l...
rngtng/nups
34e20d5d6b0505f6c7438627d1869b91a7712bd9
propagate sending exception to top
diff --git a/README.md b/README.md index 906bfcb..b446998 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,90 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...