1
0
Fork 0
Commit Graph

300 Commits

Author SHA1 Message Date
Jan Steemann f9c14611a4 remove tabs 2013-02-01 15:46:27 +01:00
Frank Celler 695303e432 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-01 10:52:24 +01:00
Frank Celler 4466ccc06a cosmetics 2013-01-31 13:52:41 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Frank Celler b10154ff25 fixed jslint 2013-01-30 09:48:42 +01:00
Frank Celler 62e00c81bf fixed traversal to be independent of vertex/edge structure 2013-01-29 17:49:23 +01:00
Frank Celler 307b125035 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/actions/system/api-graph.js
2013-01-29 14:17:13 +01:00
Frank Celler 6bd4bc5525 client side graph 2013-01-29 14:15:35 +01:00
Jan Steemann 6e81f7f6fa return collection ids, cursor ids, and index ids as stringified integers, too 2013-01-28 20:11:29 +01:00
Jan Steemann 1de10d6ea4 make collection id be returned as a string so it cannot overflow 2013-01-28 18:30:48 +01:00
Frank Celler 5620f8aa4d moved to server 2013-01-28 17:08:17 +01:00
Jan Steemann b3d5217f57 removed tabs 2013-01-28 13:56:08 +01:00
Jan Steemann 64377fb161 honor waitForSync parameter from arangosh, too 2013-01-25 11:47:43 +01:00
Frank Celler 64ddbe1385 Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel 2013-01-23 14:42:56 +01:00
Frank Celler 53854232ef added getEdges 2013-01-23 14:42:26 +01:00
Jan Steemann 4b433a511a added followEdges property for AQL TRAVERSE() function 2013-01-23 11:28:33 +01:00
Jan Steemann 7c5203cfea added documentation and test cases for db.collection.removeByExample 2013-01-22 19:20:11 +01:00
Jan Steemann 33d5abbd91 comments 2013-01-21 13:58:23 +01:00
Jan Steemann 1788f54cce fixed a doxygen error 2013-01-18 18:33:45 +01:00
Jan Steemann ac9360eb36 fixed doxygen errors 2013-01-18 17:42:56 +01:00
Frank Celler dab85633dd fixed WeakDictionary 2013-01-18 13:27:40 +01:00
Jan Steemann a0251be088 fixed wrong usage of ArangoError 2013-01-18 10:27:12 +01:00
Jan Steemann 752b9a4846 fixed tests 2013-01-18 03:45:24 +01:00
Jan Steemann 52309cf188 fixed tests & segfault during tests 2013-01-18 00:58:14 +01:00
Frank Celler edef5feacc fixed tests 2013-01-17 23:45:19 +01:00
Frank Celler 159f613169 more cleanup 2013-01-17 18:24:58 +01:00
Frank Celler 13427c454c more cleanup 2013-01-17 17:12:31 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
Frank Celler 632b9bc430 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-17 10:30:48 +01:00
Frank Celler 250726ca00 reorganisation of modules 2013-01-17 10:30:35 +01:00
Jan Steemann c73cf43874 tests 2013-01-16 18:39:08 +01:00
Jan Steemann f50c9e12b4 fixed any traversal for Graph object 2013-01-16 11:12:17 +01:00
Jan Steemann e0e3fe12b8 added graph traversal for Graph 2013-01-15 19:48:53 +01:00
a-brandt f1f6eca036 changed the graph document 2013-01-15 17:28:22 +01:00
Lucas Dohmen 9bb56d801d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 15:48:29 +01:00
Lucas Dohmen 3d59723f99 Tiny additions to Frank
* Missing templates will result in an error
* The middleware calls next
* All JSLint warnings except one fixed
2013-01-15 15:45:47 +01:00
a-brandt c175c73f97 added some missing changes 2013-01-15 14:07:16 +01:00
a-brandt f2288b5900 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 09:08:28 +01:00
a-brandt 60c8ad808f Changed graph moudule to use _key 2013-01-15 09:07:31 +01:00
Jan Steemann 2a3293a59e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-14 14:12:26 +01:00
Jan Steemann 848cc1ae28 added CollectionDatasourceFactory 2013-01-14 14:08:28 +01:00
Lucas Dohmen 7189151f93 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 13:37:15 +01:00
Lucas Dohmen bad6578ce5 Frank: Templates.
You can now use templates (currently via Underscore, but is expandable)
in Frank.
2013-01-14 13:35:43 +01:00
Jan Steemann c8b55b9b4d added patch & head methods 2013-01-14 13:22:02 +01:00
Lucas Dohmen a8561d0121 Frank: Put, Post, Delete 2013-01-14 09:34:25 +01:00
Michael Hackstein f32c4b2ae4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 02:36:51 +01:00
Michael Hackstein 96a5e832b0 Added includeMatchingAttributesFilter 2013-01-14 02:36:45 +01:00
Lucas Dohmen ef8bb55165 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 02:36:40 +01:00
Lucas Dohmen 9052dbdcbe Frank: Added some simple convenience functions to the response
Will make everything more comfy.
Amazing.
And wonderful 🦄
The middleware is not yet attached.
2013-01-14 02:35:27 +01:00
Michael Hackstein a91d92917e Added follow edges with labels 2013-01-14 01:02:47 +01:00
Jan Steemann 6acc85389c fixed "any" traversal 2013-01-13 23:56:28 +01:00
Lucas Dohmen a29f2f7370 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 23:43:09 +01:00
Lucas Dohmen ffeca77e1a First Version of Frank
* Added Underscore (We still need to run all tests to see if it works
  entirely)
* Added the first version of Frank with a few thoughts on how to
  continue working on it
2013-01-13 23:42:01 +01:00
Jan Steemann ad14130aa0 some tests for traversal 2013-01-13 23:40:27 +01:00
Jan Steemann b42212e559 removed "redeclaration of bind parameter" 2013-01-13 23:25:27 +01:00
Jan Steemann 0ce59432e0 edge & vertex uniqueness for TRAVERSE 2013-01-13 22:56:14 +01:00
Jan Steemann a2373b7036 added any expander 2013-01-13 14:53:26 +01:00
Michael Hackstein cc2df18db8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 14:44:25 +01:00
Michael Hackstein ebec929394 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 13:52:02 +01:00
Michael Hackstein 8bb5096e42 First version of expand graphs by labels 2013-01-13 13:51:46 +01:00
Frank Celler bad4c293ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 13:50:51 +01:00
Jan Steemann 8bf8a733a2 added traversal function 2013-01-13 13:48:23 +01:00
Frank Celler fe3e4e5b24 cosmetic changes 2013-01-13 12:40:22 +01:00
Michael Hackstein 8686dbe51b Added combine filters, and min/maxDepth filters 2013-01-13 11:26:43 +01:00
Jan Steemann e23e6e3ae6 changed return value for filter functions 2013-01-13 00:55:03 +01:00
Jan Steemann baaaf81cd3 changed the API for traversals 2013-01-13 00:17:11 +01:00
Jan Steemann 227a92aa1c added test cases, some fixes 2013-01-12 21:29:13 +01:00
Jan Steemann 8080b2f501 test cases for collection-based expanders 2013-01-12 20:42:43 +01:00
Jan Steemann f53b09c64a adjusted traversal API 2013-01-12 18:26:57 +01:00
Jan Steemann 196e3872b6 fixed a bug width non-expanded nodes 2013-01-11 14:57:31 +01:00
Jan Steemann 5c19f2d196 cleaned up traversal code, initial unittest 2013-01-11 13:59:03 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
2013-01-10 18:00:25 +01:00
Frank Celler 2e6c075405 added getPeerVertex 2013-01-10 15:12:05 +01:00
Frank Celler 1612f22319 moved graph to org/arangodb/graph 2013-01-09 22:49:56 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
2013-01-09 15:30:21 +01:00
Frank Celler fb881581e1 fixed GUI 2013-01-06 01:31:32 +01:00
Frank Celler 337cee7606 fixed jslint warnings 2013-01-05 23:59:44 +01:00
Frank Celler 7be1c01bda removed linked in JavaScript code, separate files for 'fs' and 'console' 2013-01-05 23:24:10 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Jan Steemann d60888e970 replaced arango-upgrade script with server startup option --upgrade 2012-12-03 13:45:58 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
2012-12-03 13:02:59 +01:00
Jan Steemann 59461d0c4b added functionality to add and remove users programatically
removed arango-password script
2012-12-03 11:42:30 +01:00
Jan Steemann fec05c853d issue #312 2012-12-03 09:58:00 +01:00
Jan Steemann 30a47496b0 issue #312 2012-12-03 09:55:44 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
2012-11-27 12:34:58 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann f3b87fbe1f fixed documentation 2012-11-21 17:52:44 +01:00
Jan Steemann a2b404123a load monkeypatches on all occasions 2012-11-20 16:50:15 +01:00
Jan Steemann b159a0539b moved monkeypatches.js to bootstrap folder and load it at all occasions, allowing graph usage from arangosh 2012-11-20 15:36:19 +01:00
Jan Steemann 3780aafde9 issue #284 2012-11-19 15:14:29 +01:00
a-brandt b800f2652c renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 13:35:36 +01:00
a-brandt fff25d5ac3 renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 12:29:51 +01:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +02:00
Frank Celler 59ef60d6b2 fixed doc errors 2012-10-12 19:21:52 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
2012-10-11 23:18:55 +02:00
Jan Steemann 2bb0407826 issue #235: fixed broken web front end 2012-10-11 21:32:15 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
Jan Steemann 3b8ad1835e harmonise API between client and server versions
this adds db._createStatement() on the server side, furthermore it provides GeneralArrayCursor.elements()
2012-10-08 18:11:45 +02:00
Jan Steemann 788f91cd59 added ArangoStatement.explain() client method, wrote test cases 2012-10-08 15:49:15 +02:00
Frank Celler 5d21d2ac2d removed try/catch 2012-09-29 14:52:56 +02:00
Lucas Dohmen 06fb38ca20 Requiring Graph.js automatically requires monkeypatches
The user should not have to do that manually.
Makes no sense.
2012-09-26 14:18:24 +02:00
Jan Steemann 135d454a3c fix wrong variable names 2012-09-10 17:59:51 +02:00
Lucas Dohmen fbe85fcb40 Merge branch 'graph_algorithms' into devel
Conflicts:
	Makefile.in
	configure
2012-09-04 09:41:03 +02:00
Jan Steemann f70cdc8fcb issue #169: adjusted documentation 2012-08-31 18:08:36 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Jan Steemann 1167b62ca6 issue #153: wrote upgrade script for arango. this will convert collections into edge collections etc. 2012-08-28 17:29:36 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Lucas Dohmen 5fa6eb8478 Some minor fixes. 2012-08-15 00:51:14 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
2012-08-09 15:25:29 +02:00
Frank Celler 80b78a7415 added GC 2012-08-08 15:33:58 +02:00
Lucas Dohmen 353b28d814 Faster Handling of shortest path if empty 2012-08-06 16:07:12 +02:00
Lucas Dohmen 0b0df398d0 First version of Measurements and Shortest Path Executor 2012-07-23 13:56:25 +02:00
Lucas Dohmen 463045e17c The pathTo method now supports graph-wide caching
This is the first step to support measurements. The data for the tests
has been added.
2012-07-18 16:00:17 +02:00
Lucas Dohmen fb605e1247 Betweenness Measurement added to Vertices 2012-07-09 18:09:57 +02:00
Lucas Dohmen c6c9712f82 Added support for geodesics to Graph.js 2012-07-09 16:22:02 +02:00
Lucas Dohmen 07366afcfc Added two measurements to graphs
* diameter
* radius
2012-06-26 15:25:26 +02:00
Lucas Dohmen ecf09fc4dc Added distanceTo and two measurements to Vertices
The two measurements are:

* eccentricity
* closeness
2012-06-26 14:17:41 +02:00
Lucas Dohmen c6b2b2642c Added Degrees to Vertices, Size and Order to Graphs 2012-06-26 12:51:26 +02:00
Lucas Dohmen ac092872ee Refactoring on Graph.js
All methods reviewed and refactored. The refactorings use the new
ECMA Script 5 methods which are more efficient and precise.
2012-06-24 09:30:30 +02:00
Lucas Dohmen 2745997ad8 Re-Did the optimizations of the monkeypatches 2012-06-20 17:01:14 +02:00
Lucas Dohmen 15eddecc34 Revert "Monkeypatches have their own module now."
This reverts commit d01b16a930cfc5a47174d7e24a1742c20f874318.

Conflicts:
	js/common/modules/monkeypatches.js
2012-06-20 16:43:08 +02:00
Lucas Dohmen 455befdbf6 Monkeypatches loaded by default and refactored
The monkeypatches will now always be loaded a server startup.
I also refactored them.
2012-06-20 16:18:04 +02:00
Lucas Dohmen a31d5e8f27 Monkeypatches have their own module now. 2012-06-20 15:14:48 +02:00
Lucas Dohmen bfa2e09ee6 All "Monkey Patches" now use Object.defineProperty 2012-06-20 14:12:26 +02:00
Lucas Dohmen a7d3d50082 Linted graph.js and shell-graph-algorithms.js 2012-06-16 18:31:50 +02:00
Lucas Dohmen c129644fff Added a listed option to commonNeighbors and commonAttributes
If the listed option is given, instead of the number of attributes /
neighbors, the list of the names of the shared attributes / the IDs
of the shared neighbors are returned.
2012-06-16 18:26:41 +02:00
Lucas Dohmen edff65d5c8 Vertex#commonPropertieWith now also has a normalized variant 2012-06-16 18:05:14 +02:00
Lucas Dohmen b3620827d3 Added commonPropertiesWith to Vertex 2012-06-16 18:00:32 +02:00
Lucas Dohmen 2c70ce9291 Reorganization of functionality and tests for Graph.js 2012-06-16 17:38:27 +02:00
Lucas Dohmen c0a94a570b Added a commonNeighborsWith method to Vertex
Returns the number of common neighbors.
2012-06-16 14:58:48 +02:00
Lucas Dohmen 15b0a44aba Edge Exclusion for pathTo function
You can now exclude certain edges in your pathTo function with the
paramater `only` that expects a function that takes an edge as an
argument and returns true if and only if the edge should be used
for the path.

Use Case:
Only include edges on the path that have a rating of x or higher.
2012-06-16 14:26:26 +02:00
Lucas Dohmen 580813f006 Added Support for Weight Functions in pathTo
Instead of just selecting an attribute to get the weight of an edge,
the user can now formulate the computation of the weight of an edge
as a function that takes an edge as an argument and returns the weight.
This allows more flexible weights in the application.
2012-06-16 14:04:37 +02:00
Lucas Dohmen 46027601ac Merge branch 'devel' into graph_algorithms 2012-06-13 16:19:54 +02:00
Lucas Dohmen e41291c44d Tiny improvement: forEach instead of for 2012-06-13 16:11:26 +02:00
Lucas Dohmen aa17edce23 Refactored Vertex#getNeighbors 2012-06-13 14:01:48 +02:00
Lucas Dohmen ad91d8cdfc The weighted pathTo now also takes a default weight
The default weight is needed, when an edge doesn't
have the specified weight attribute.
The default for this default value is `Infinity`.
2012-06-13 13:48:54 +02:00
Lucas Dohmen 7eddaa9259 Added support for weighted graphs to pathTo
The method `pathTo` now also accepts the following option:

* weight: The name of the attribute including the weight
2012-06-13 13:15:21 +02:00
Lucas Dohmen f11acff837 Enhanced pathTo for directed and labelled graphs
The `pathTo` method accepts an options hash.
Currently supported:

* direction: "both", "outbound", "inbound"
* labels: undefined or Array of Strings
2012-06-13 11:55:26 +02:00
Lucas Dohmen 70ae8d84d4 Small Refactoring for pathesForTree 2012-06-12 15:38:19 +02:00
Lucas Dohmen 104b28b607 Refactored the pathesForTree method
* It's now testable
* It's now in a better OO design
2012-06-12 15:25:06 +02:00
Lucas Dohmen e3a3e5f857 Heavy refactoring of the methods for Dijkstra 2012-06-12 13:24:25 +02:00
Lucas Dohmen 33732898ce Enhanced Vertex#getNeighbors
* getNeighbors now takes the following arguments:
  * direction: 'both', 'outbound' or 'inbound'
  * pathLabels: undefined or Array of Strings
2012-06-12 12:23:09 +02:00
Lucas Dohmen ea13cfac51 Renamed all occurrences of node to vertex... 2012-06-06 19:14:21 +02:00
Lucas Dohmen 933bc293b6 Added documentation for all pathTo helper functions 2012-06-06 19:11:53 +02:00
Lucas Dohmen 0433236c8b Graph.js: Lint-Free 2012-06-06 18:49:43 +02:00
Lucas Dohmen 020aa12c35 Dijkstra: Finds all shortest pathes now
* Previously only found one shortest path
* Returns the same results as Neo4j
2012-06-06 18:09:57 +02:00
Lucas Dohmen a41ff384ab Dijkstra finds pathes of correct length. 2012-06-06 14:57:57 +02:00