Commit Graph

2037 Commits

Author SHA1 Message Date
Charles Blake
0a3e732b9f Just do wide interface of hasKeyOrPut & mgetOrPut.
Extract maybe re-hash/re-search and insert logic into a new template.
Use this new template to do impl templates for all three put forms
(which required renaming a couple 'value' arguments to 'val').
Added OrderedTable and OrderedTableRef versions of both as well.
2015-02-16 06:52:23 -05:00
Charles Blake
614a1f9d5a Add TableRef version of mgetOrPut. 2015-02-16 06:02:31 -05:00
Federico Ceratto
657dca5c3b Fix typos 2015-02-15 16:20:32 +00:00
Federico Ceratto
c95f6f117a Fix typos 2015-02-15 16:06:06 +00:00
Charles Blake
7c1c9a6a9d Add mgetOrPut to support just one probe chase for the common
pattern of either updating or initializing table entries.
2015-02-15 10:03:41 -05:00
Andreas Rumpf
d8c4c57637 Merge pull request #2133 from def-/cleanup
Cleanup
2015-02-15 15:12:39 +01:00
Andreas Rumpf
dcf2f8b002 Merge pull request #2132 from fowlmouth/patch-2
Patch 2
2015-02-15 15:05:39 +01:00
Andreas Rumpf
3fc100276c Merge pull request #2122 from c-blake/devel
Update collections/tables.nim as with sets.nim
2015-02-15 15:04:04 +01:00
Hans Raaf
a7484ac092 Fixed non exhaustive case by adding else 2015-02-15 04:44:15 +01:00
Billingsly Wetherfordshire
e22ae986f9 Update basic3d.nim
fix rst error
2015-02-14 17:15:30 -06:00
def
512db9aea6 Fix documentation a bit in unicode 2015-02-14 19:57:32 +01:00
Charles Blake
5068a5aa01 assignment -> shallowCopy for efficiency. 2015-02-13 14:10:09 -05:00
Charles Blake
45a2c1b1d1 Merge ../Nim into devel; track ttables.nim delete. 2015-02-13 08:42:41 -05:00
Charles Blake
d129e8f6c6 Update doc comments to mention rightSize. 2015-02-13 08:28:58 -05:00
Araq
fde16e6c3e fixes os.moveFile on Windows 2015-02-13 01:39:20 +01:00
Andreas Rumpf
f039aad5e0 Merge pull request #2097 from jferg2010/devel
Date/time parsing
2015-02-12 21:54:43 +01:00
Andreas Rumpf
2f62cc91a4 Merge pull request #2111 from lyro/fix-2110
fix conditions for int size in 'math.nextPowerOfTwo' #2110
2015-02-12 15:18:55 +01:00
Araq
41385f3aaf made a test green 2015-02-12 14:56:57 +01:00
Araq
10335fd726 fixed minor bugs; cleaned up tests 2015-02-12 14:56:56 +01:00
Frank Fischer
fcfaf2a844 fix conditions for int size in 'math.nextPowerOfTwo' #2110 2015-02-12 12:47:58 +01:00
Charles Blake
49d88cee68 Oops - missed updates to a few later rawGet()s. 2015-02-12 06:44:09 -05:00
Charles Blake
5fbcf93860 Add hcode,rightSize,rawGetKnownHC. Fix inf loop.
Make similar changes to those made in sets.nim, including hcode, rightSize
rawGet/rawGetKnownHC result protocol, nextTry probe sequence to be the cache
friendlier h=h+1 which in turn allows supporting changing deletion to fix the
infinite loop bug with local rehashing which in turn has desirable properties
of graceful table aging when deletes do happen and also making insert-only
usage patterns no longer pay any time/space cost to check deleted status.

Unlike collections.sets, this module has add() for duplicate key inserts and
a 3rd type of table, CountTable.  The first wrinkle is handled by introducing
a rawGetDeep for unconditionally adding entries along collision chains.  This
point of CountTable seems to be space efficiency at 2 items per slot.  These
changes retain that by keeping the val==0 => EMPTY rule and not caching hash
codes.  putImpl is expanded in-place for CountTable since the new putImpl() is
too different. { Depending on table size relative to caches & key expense,
regular Table[A,B] may become faster than CountTable, especially if the basic
count update could be something like inc(mGetOrPut(t, key, 0)). }

Unit tests pass, but in this module those are much more of just a demo than
probing for bugs.  Should exercise/test this a little more before merging.
2015-02-12 05:22:04 -05:00
Andreas Rumpf
a508055687 Merge pull request #2078 from c-blake/devel
Add hcode.  Re-factor rawGet.  Fix infinite loop.
2015-02-11 17:44:13 +01:00
Jeff
7251fbd76e Date/time parsing - removed comments from assert 2015-02-11 15:52:15 +09:00
Jeff
3643068527 Date/time parsing with changes suggested by Araq 2015-02-11 15:42:33 +09:00
Charles Blake
cc8dffb559 Merge /home/cb/pkg/nim/Nim into devel 2015-02-10 10:18:02 -05:00
Dominik Picheta
03019849fc Async await try statement fixes. 2015-02-09 23:00:07 +00:00
Charles Blake
41794ccd5b Merge Nim into devel 2015-02-09 09:57:39 -05:00
Jeff
5424ab3d7e Date/time parsing with minor changes requested by Dom96 2015-02-09 21:46:18 +09:00
Jeff
13c5ce820e Date/time parsing 2015-02-09 20:58:36 +09:00
Varriount
af23312f79 Merge pull request #2059 from def-/getch
Getch
2015-02-09 02:37:36 -05:00
Charles Blake
1f3ce26421 Address Andreas' complaint about code duplication. 2015-02-07 13:13:03 -05:00
Charles Blake
11e7c4960e Merge /home/cb/pkg/nim/Nim into devel
pull from master
2015-02-07 13:11:27 -05:00
Andreas Rumpf
b25346719d Merge pull request #1869 from def-/json-stuff
Json stuff
2015-02-07 18:34:35 +01:00
Andreas Rumpf
31074e0015 Merge pull request #2058 from def-/nimrod-cfgs
Rename *.nimrod.cfg to *.nim.cfg
2015-02-07 18:11:00 +01:00
Charles Blake
42f8f1cd1f Fix unnecessarily slow set building from openArray.
The estimation of the initialSize as simply array len + 10 was too small for
for all but the smallest sets.  It would not elide/skip one final enlarge().
That last one is actually always the most expensive enlarge().  Indeed, in a
series where one to start from tiny and build up the table..that last one is
about 50% of all the enlarging time in general.  So, this simple and reasonable
optimization (compared to just starting at 64) was only helping about half as
much as it could.

Introduce a rightSize() proc to be the inverse to mustRehash().  Export it
to clients since pre-sizing is externally useful in set construction and the
current mustRehash rules are opaque and beyond the control of clients.

Also add test module logic to check that rightSize() and mustRehash() are
inverses in the appropriate sense..not really in a block/assertion throwing
unit test since this is a peformance nice-to-have issue rather than about
basic correctness.  (Also, fix a too vs. two typo in doc comment.)
2015-02-07 09:37:17 -05:00
Charles Blake
8e685585a6 Merge /home/cb/pkg/nim/Nim into devel 2015-02-07 09:32:27 -05:00
Araq
0b5c42f405 configuration system supports %= to access environment variables 2015-02-07 12:55:23 +01:00
Araq
74c6c8c903 compiler distinguishes between 2 different 'var' types for C++ interop; code cleanups 2015-02-07 10:48:07 +01:00
Araq
e84834db79 lots of C++ codegen improvements 2015-02-07 10:48:07 +01:00
Fabio Cevasco
99b14c8d8d newRollingFileLogger - fmtStr is always set to defaultFmtStr 2015-02-06 22:40:21 +01:00
Charles Blake
65ce08f38c Add hcode. Re-factor rawGet. Fix infinite loop.
Replace state enum with a cached hash code which has the same memory overhead
and locality as the enum, but can really speed things up with non-integer-like
keys (keys for which either hash() or == take more than couple cycles, or where
the key data is "indirect" and might incur another cache miss).  To function as
both empty/filled state and a hash code cache, it only needs to be ensured that
hash codes are non-zero for any real key.  That is done at the one place in the
whole file hash() is called.  Keep convention clear via isFilled() & isEmpty().
An isDeleted state will no longer be necessary as per below excl/inf loop fix.

Since some use sites know hc and some do not, re-factor rawGet into two forms -
one with known hash code and one with an unknown HC that returns it. Both forms
still return <0 on missing, but returns the much more informative "-1 - index".
That return can be quickly inverted by -1 - result to recover the index where
insert should happen, provided no modifications are made to the table in the
meantime.  This protocol retains the prior <0 interface and also makes it easy
to avoid unnecessary duplicate search work in procs like containsOrInclImpl
(which formerly searched in the initial get and AGAIN in rawInsert).  Strip the
searching part out of rawInsert to "make it even more raw".  swap(s.data, n) a
bit earlier so rawGet and rawGetKnownHC can have similar parameter lists and
integrate well with rawInsert/code sharing between Set and OrderedSet impls.

This PR also fixes infinite looping upon too many deletes. [ The deleted state
(aka "tombstone") approach is vulnerable to the table filling up with deleted
items which forces giant scans for missing keys which could be anywhere.  In
the version prior to this PR, table wraparound wasn't even detected yielding
infinite loops. ] This PR changes excl() from marking slots as deleted to Knuth
algo 6.4R, "local/incremental moveback rehashing" - adapted from Knuth's h->h-1
to the cache-friendlier h->h+1 probe sequence and adapted from "gotos" to a new
doWhile template.  This method restores the table to a state that would have
resulted from pure inserts (in some order).  Update nextTry accordingly.  Since
linear probing can degrade a little faster, 50% rather than 66% may be a better
default growth threshold, but users should be able to adjust threshold anyway.

Old unit tests all pass.  More extensive testing in this module is probably
warranted before taking similar enhancements over to collections.tables.
2015-02-06 09:24:20 -05:00
def
416456cefe Try to fix unittest for JS backend, still not working 2015-02-04 21:44:25 +01:00
def
f3922bc4e5 Fix documentation and toJson signature 2015-02-04 19:27:56 +01:00
Andreas Rumpf
08ee62a783 Merge pull request #2049 from def-/permutations
Add nextPermutation and prevPermutation
2015-02-04 17:12:35 +01:00
def
8640efcd40 Document terminal.getch 2015-02-04 14:10:58 +01:00
Andreas Rumpf
f0cdb49c3b Merge pull request #2027 from dumndummer/patch-1
Update sequtils.nim
2015-02-04 10:38:50 +01:00
def
f3124e6de4 Add terminal.getch to get a single character 2015-02-03 17:27:59 +01:00
def
39839fda8a Rename *.nimrod.cfg to *.nim.cfg 2015-02-03 09:04:24 +01:00
dumndummer
07f42fa612 Changed name 'pred' to 'op' in mapIt template 2015-02-02 14:42:00 +00:00