1
0
Fork 0
Commit Graph

304 Commits

Author SHA1 Message Date
Jan Steemann ad6f26e86a added waittime, reduced number of docs 2012-09-26 16:26:05 +02:00
Jan Steemann 55a1c66203 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 15:49:01 +02:00
Jan Steemann 4a0e773536 added waittime 2012-09-26 15:48:23 +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
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
2012-09-20 16:39:59 +02:00
Frank Celler 8f5b31177b added redirect 2012-09-18 16:33:16 +02:00
Frank Celler 2ce0c4336a added module in database 2012-09-18 15:07:57 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +02:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
2012-09-17 22:40:12 +08:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
Frank Celler 4f6762436c added first go at user actions 2012-09-16 17:25:57 +02:00
Frank Celler 21eb612376 first version of new actions module 2012-09-15 19:16:36 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 1d865cddb1 removed unnecessary long waits 2012-09-13 17:41:00 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +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 4aaf066081 issue #185: increased wait time in test 2012-09-04 08:35:19 +02:00
Jan Steemann 035ca9c548 increased wait time 2012-09-03 17:42:55 +02:00
Jan Steemann 13f703c2c7 issue #184 2012-09-03 11:08:35 +02:00
Jan Steemann 6232ca74c7 changed unloading of collections to not wait in an endless loop if collection cannot be unloaded 2012-09-03 10:40:07 +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 374b65e0d7 issue #177: fixed wrong error message 2012-08-31 10:49:36 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +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
Jan Steemann 105af56bf7 issue #110: support for partial updates 2012-08-21 15:17:51 +02:00
Lucas Dohmen 1699414168 Added two execution files for the comparison 2012-08-16 13:21:45 +02:00
Lucas Dohmen 472f279506 Added Payload Tests 2012-08-15 22:15:11 +02:00
Jan Steemann b29d303488 fixed sporadically failing test 2012-08-15 12:43:20 +02:00
Lucas Dohmen 26182ef857 Removed some unnecessary files 2012-08-15 00:55:25 +02:00
Lucas Dohmen 5fa6eb8478 Some minor fixes. 2012-08-15 00:51:14 +02:00
Jan Steemann 396859e4fc added test case to trigger compaction 2012-08-14 11:52:50 +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
Jan Steemann 7e79bfd5eb added derived file 2012-08-08 14:51:54 +02:00
Jan Steemann 982781ec3e reduced sleep intervals 2012-08-08 14:51:00 +02:00
Frank Celler 5027294e26 wait for collection to unload in unit-tests 2012-08-08 10:21:44 +02:00
Lucas Dohmen 353b28d814 Faster Handling of shortest path if empty 2012-08-06 16:07:12 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
2012-08-02 17:17:36 +02:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Oreste Panaia 53e4fb7f12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarrayIndex.c
2012-07-24 14:56:04 +08:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Lucas Dohmen 0b0df398d0 First version of Measurements and Shortest Path Executor 2012-07-23 13:56:25 +02:00
Lucas Dohmen 00ae5bf344 Merge branch 'master' into graph_algorithms 2012-07-18 16:03:13 +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
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script
renamed --unit-tests to --javascript.unit-tests
2012-07-15 00:50:05 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Lucas Dohmen 8861bd6410 Moved Graph tests to the correct file 2012-07-10 14:55:19 +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
Oreste Panaia 224614f14a Bitarray index fixes 2012-07-06 12:02:08 +08:00
Oreste Panaia 67d6b7fca0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-07-05 13:59:46 +08:00
Oreste Panaia c72f44c949 Bitarray indexes update 2012-07-05 13:59:26 +08:00
Jan Steemann be6d64ced6 fixed unittest expectations after fix for issue #121 2012-07-04 12:32:09 +02:00
Oreste Panaia b84c9fefa9 Some bitarray index creation tests 2012-06-29 14:49:52 +08:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Lucas Dohmen 07366afcfc Added two measurements to graphs
* diameter
* radius
2012-06-26 15:25:26 +02:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
2012-06-26 20:41:04 +08: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
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08: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
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +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
Frank Celler 6675e8da2b Merge pull request #102 from jsteemann/master
potential solution for issue #95 (execute jslint)
2012-06-07 08:49:59 -07: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
Jan Steemann 57fb43fe1e fixed broken functions and help texts in arangosh 2012-05-31 17:32:35 +02:00
Jan Steemann 0ef03fc006 mini cleanup 2012-05-28 22:10:03 +02:00