devided ops/types

This commit is contained in:
DadaMonad
2015-02-19 10:41:34 +00:00
parent 1aacc0e967
commit 792440a71d
19 changed files with 29625 additions and 29722 deletions

View File

@@ -48,7 +48,7 @@ class JsonTest extends Test
@users[user_num].toJson(true)
getGeneratingFunctions: (user_num)->
types = @users[user_num].types
types = @users[user_num].operations
super(user_num).concat [
f : (y)=> # SET PROPERTY
l = y.val().length

View File

@@ -28,7 +28,7 @@ module.exports = class Test
for i in [0...@number_of_engines]
u = @makeNewUser (i+@name_suffix)
for user in @users
u.getConnector().join(user.getConnector()) # TODO: change the test-connector to make this more convenient
u.connector.join(user.connector) # TODO: change the test-connector to make this more convenient
@users.push u
@initUsers?(@users[0])
@flushAll()
@@ -69,7 +69,7 @@ module.exports = class Test
@getRandomText [1,2,'x','y'], 1 # only 4 keys
getGeneratingFunctions: (user_num)=>
types = @users[user_num].types
types = @users[user_num].operations
[
f : (y)=> # INSERT TEXT
y
@@ -106,7 +106,7 @@ module.exports = class Test
applyRandomOp: (user_num)=>
user = @users[user_num]
user.getConnector().flushOneRandom()
user.connector.flushOneRandom()
doSomething: ()->
user_num = _.random (@number_of_engines-1)
@@ -119,10 +119,10 @@ module.exports = class Test
final = false
if @users.length <= 1 or not final
for user,user_number in @users
user.getConnector().flushAll()
user.connector.flushAll()
else
for user,user_number in @users[1..]
user.getConnector().flushAll()
user.connector.flushAll()
ops = @users[1].getHistoryBuffer()._encode @users[0].HB.getOperationCounter()
@users[0].engine.applyOpsCheckDouble ops
@@ -135,7 +135,7 @@ module.exports = class Test
number_of_created_operations = 0
for i in [0...(@users.length)]
number_of_created_operations += @users[i].getConnector().getOpsInExecutionOrder().length
number_of_created_operations += @users[i].connector.getOpsInExecutionOrder().length
@ops += number_of_created_operations*@users.length
ops_per_msek = Math.floor(@ops/@time)
@@ -146,7 +146,7 @@ module.exports = class Test
if @debug
if not _.isEqual @getContent(i), @getContent(i+1)
printOpsInExecutionOrder = (otnumber, otherotnumber)=>
ops = _.filter @users[otnumber].getConnector().getOpsInExecutionOrder(), (o)->
ops = _.filter @users[otnumber].connector.getOpsInExecutionOrder(), (o)->
typeof o.uid.op_name isnt 'string' and o.uid.creator isnt '_'
for s,j in ops
console.log "op#{j} = " + (JSON.stringify s)