1
0
Fork 0
Commit Graph

138 Commits

Author SHA1 Message Date
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Michael Hackstein 1fc685e557 Fixed unitialized warning of compiler. Situation could never occur 2016-01-19 15:08:57 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Max Neunhoeffer 394057fbda Merge branch 'devel' into vpack 2015-12-23 15:09:20 +01:00
Jan Steemann e62ccf7a46 added Ditches for traversal 2015-12-23 11:43:24 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
Jan Steemann 8e18d6463f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 11:44:56 +01:00
Michael Hackstein c475822a76 Adapted V8Traverser to class version of TRI_col_info_t 2015-12-16 11:43:44 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Michael Hackstein e6e66d4469 Fixed a bug in Traversal Path Uniqueness. 2015-12-16 10:51:54 +01:00
Michael Hackstein fbbe4d08cd Implemented edges on path uniqueness on single server traversal 2015-12-15 18:04:28 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Michael Hackstein 9495117238 Fixed invalid traversal optimization if vertex is not existing but filter would let null pass 2015-12-04 11:21:15 +01:00
Jan Steemann b8cd633276 Windows fixes 2015-12-03 15:00:19 +01:00
Michael Hackstein 23e2ac5da7 Fixed status reporting for Cluster and Single Server Case for the AQL Traverser Node. 2015-12-02 17:20:09 +01:00
Michael Hackstein 1a13af6f36 Merged remote changes with local stash 2015-12-02 11:34:58 +01:00
Jan Steemann 9497ca9c7c fixed memleaks 2015-12-01 17:07:32 +01:00
Jan Steemann 2bbcaa868f fixed invalid memory usages 2015-12-01 16:48:55 +01:00
Michael Hackstein a7b7d1ec18 Adapted traverser implementations to new Path Enumerator for improved pruning 2015-11-27 16:25:02 +01:00
Jan Steemann 75e4e6e815 added transaction to all signatures 2015-11-24 17:34:23 +01:00
Michael Hackstein aa8e1daaf7 Moved String->VertexId conversion into the general traverser. It is required outside of V8Server 2015-11-24 10:24:19 +01:00
Michael Hackstein 001dd4debf The local traverser now early filters on vertices 2015-11-18 16:14:17 +01:00
Michael Hackstein 201c54e6b0 Removed unnecessary constructors 2015-11-18 15:32:04 +01:00
Michael Hackstein 1f6519b01e Using early abortion in local Traverser for AQL. Now it's cluster time 2015-11-18 14:50:03 +01:00
Michael Hackstein f880592025 Used the TraverserExpression in Local case for Edges. Right now it fails hardcoded. 2015-11-18 11:26:55 +01:00
Michael Hackstein 0adbef4f76 Transformed the TraversalExpression vector into a map ordered by access level. This is way more convenient on the Traverser side to be used. 2015-11-17 16:25:45 +01:00
Michael Hackstein 5eaf990405 Fixed converting VertexId -> String in Cluster 2015-11-16 20:13:44 +01:00
Michael Hackstein e24135df09 Extracted some more common functionality from V8 and Cluster Traverser to the abstract class 2015-11-13 14:54:32 +01:00
Michael Hackstein 8d0d921ab6 Included two Abstract classes for Traversals. Traverser and TraversalPath. Implemented both of them for Single-Server Traversals. 2015-11-12 16:25:36 +01:00
Wilfried Goesgens cd6cc35def Adjust the stage to the now non-void pointered index implementation. 2015-10-22 11:12:21 +02:00
Frank Celler c4d1fff729 new traversal 2015-09-18 10:40:28 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Michael Hackstein 89ca3f68b9 Fixed edgeExamples in CPPOnly Neighbors function 2015-07-23 16:08:32 +02:00
Michael Hackstein 84174aa99a Added edgeExamples functionality to CPPonly Neighbors. 2015-07-23 15:25:50 +02:00
Michael Hackstein f92c3b21ce Removed the duplicate distinct / result listing in Neighbors 2015-07-22 17:11:38 +02:00
Jan Steemann 354b20d559 use references 2015-07-14 13:52:12 +02:00
Michael Hackstein df33ffe410 Added an implementation for shortest path which allows to take shortcuts iff we do not have to access the data, f.e. filtering or distances. Gives an enormous speedup. 2015-07-13 11:31:42 +02:00
Jan Steemann ffab0ef47d renamed file 2015-06-18 17:29:49 +02:00
Jan Steemann f5f719360c added out-of-bounds checking for _heap and _history 2015-06-10 18:04:17 +02:00
Jan Steemann a51c258bf5 fixed memleaks 2015-06-01 14:56:14 +02:00
Michael Hackstein 99afc6ec87 CXX ExampleMatcher learned about internal attributes. This makes all AQL-Graph tests pass again ;) 2015-05-30 00:00:49 -07:00
Michael Hackstein e28eedf706 Made the depth always unsigned. 2015-05-28 16:05:29 -07:00
Michael Hackstein f15e56171b Implemented min/maxDepth for neighbors in CPP layer. And removed the option for non-distinct neighbors. 2015-05-28 15:10:14 -07:00
Michael Hackstein 5e5c5fca70 Added neighbor examples and edge examples to CXX Neighbors. The ExampleMatcher is NOT able to match internal attributes yet. 2015-05-27 13:40:30 -07:00
Michael Hackstein 8b1cef7f76 CPP Neighbors is now able to take an array of examples instead of only a single one. 2015-05-26 09:51:04 -07:00
Michael Hackstein 76c33a577c Neighbors is now able to take exactly one edge example onto the CPP level. Now working on a list of examples 2015-05-25 12:39:44 -07:00
Max Neunhoeffer ad7b73480f Make CPP_NEIGHBORS more flexible. 2015-05-23 20:10:16 -07:00
Michael Hackstein 0b8e9eb59c Fixed minor inconsistency in AQL NEIGHBORS and adapted tests to the new version. It will now Return the list of vertices. not the pair<edge, vertex> any more 2015-05-22 15:30:24 -07:00
Jan Steemann d4285fc6fd fix Visual Studio compile warnings 2015-05-20 16:12:30 +02:00
Michael Hackstein 8494ddb85d The shortest_path now allows to use vertexExample and edgeExamples. Also it allows t add additional vertex and edge collections in the options. If you want to use vertexExample and your edge collection is pointing to other vertex collections then the on in the first parameter you have to give the additional collection in the options 2015-05-19 14:26:14 -07:00
Michael Hackstein d832a7579a The new shortest path is now able to take exactly one edge example. Has to be improved to use a list of examples 2015-05-15 15:08:17 -07:00
Michael Hackstein 7ba7482d58 Implemented an ExampleMatcher class to be used for path filtering. Is now used in byExample queries as well. API not fixed yet. 2015-05-14 13:29:42 -07:00
Michael Hackstein 3b3a28e16a The CPP shortest path can now live with non existent vertices and even with non existent vertex collections (dropped after edge creation but before path computation) 2015-05-12 15:39:04 -07:00
Michael Hackstein c785388366 Shortest path is now able to either return data or ids. Also if collections not known beforehand are found on the path 2015-05-12 12:07:11 -07:00
Michael Hackstein efaccccb4e The Shortest path is now able to handle graphs with several vertex collections, but only one edge collection. 2015-05-10 20:38:25 -07:00
Michael Hackstein 3cbac8ae25 The Neighbors can now be requested distinct. However this is not introduced to AQL due to missing options parameter, would change API 2015-05-07 17:17:18 -07:00
Michael Hackstein 323d34f629 The new CPP neighbors now take all three directions 2015-05-07 16:33:05 -07:00
Michael Hackstein aef5432d31 Allowed he neighbors function to switch between data and ids only 2015-05-06 16:00:35 -07:00
Michael Hackstein b89c28e141 Now allows the new CPP traversal to contain the vertex data. Edgedata is yet to come 2015-05-05 22:49:37 -07:00
Michael Hackstein 4c7b9459d5 The cpp shortest path now returns _id instead of _key. First implementation of cpp neighbors. Returns only vertexIds now. 2015-05-03 00:13:30 -07:00
Michael Hackstein ca0de62aa3 Moved all v8 context sensitive parts into from V8Traverser v8-vocbase 2015-05-02 21:46:54 -07:00
Max Neunhoeffer 97f7743d84 Less copying in Traverser. 2015-05-02 06:28:52 +02:00
Michael Hackstein 91fa1cb6f8 Merge branch 'cppTrav3' of github.com:/arangodb/arangodb into cppTrav 2015-05-01 17:08:56 -07:00
Michael Hackstein 9edb48b1cf Made everything compile again 2015-05-01 17:07:02 -07:00
Michael Hackstein 13e765f6d9 Further reduced copying in Traverser 2015-05-01 16:18:45 -07:00
Michael Hackstein 73db004a85 Reduced string copy in traverser 2015-05-01 14:49:31 -07:00
Max Neunhoeffer 24d04148c8 Schaltbar. 2015-05-01 10:30:30 -07:00
Michael Hackstein ed7666e81e Improved code readablity and implemented a distance attribute based weighting function 2015-04-27 23:58:07 -07:00
Michael Hackstein 7f3a9fbcae Included the CPP Shortest path into AQL. Only under certain conditions 2015-04-26 22:17:23 -07:00
Michael Hackstein 6e7e127b97 Rebase cleanup 2015-04-25 21:58:57 -07:00
Max Neunhoeffer d1ab2a9d6f Make bidirectional switchable. 2015-04-25 21:48:33 -07:00
Michael Hackstein 5e1909eef1 Added weight Info. 2015-04-25 21:47:44 -07:00
Michael Hackstein 599240fb21 Removed couts 2015-04-25 21:47:43 -07:00
Max Neunhoeffer 84f1ae1659 Add some more couts. 2015-04-25 21:46:23 -07:00
Max Neunhoeffer 7a80feee40 Correct edge expander. 2015-04-25 21:42:17 -07:00
Max Neunhoeffer e508a1697d Use new PriorityQueue, compiles, does not work. 2015-04-25 21:41:45 -07:00
Max Neunhoeffer 5ccab6b3a8 Sort out mess with strange non-copying. 2015-04-25 21:40:44 -07:00
Max Neunhoeffer 2c5f56672c Snapshot. 2015-04-25 21:39:04 -07:00
Michael Hackstein de699494af Fixed problem with thread construction for constant string 2015-04-25 21:38:07 -07:00
Michael Hackstein c1c98b16f6 Added version with broken threads. Computation is correct, but threads do not fire up 2015-04-25 21:36:24 -07:00
Michael Hackstein e092bda62f Further implementation of simple expander. Also included Path -> JSON converter. 2015-04-25 21:35:39 -07:00
Max Neunhoeffer 6cd05d0154 Make it compile. Probably still fishy. 2015-04-25 21:34:41 -07:00
Michael Hackstein 9f1830b4c5 Started implementing the Expander function. Not et finished does not compile but i am moving over to a new machine 2015-04-25 21:34:41 -07:00