From f1d7555ccc5f1fc32073191c9a8a9ec47d710401 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 7 Nov 2014 16:00:08 +0100 Subject: [PATCH] Simulation does not support plugins yet --- scripts/createsim.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/createsim.php b/scripts/createsim.php index 6cbb8c28aa..624043161d 100644 --- a/scripts/createsim.php +++ b/scripts/createsim.php @@ -186,6 +186,7 @@ function newNotice($i, $tagmax) $notice = Notice::saveNew($user->id, $content, 'createsim', $options); } +/* Plugins should be part of the simulation too! function newMessage($i) { global $userprefix; @@ -206,7 +207,7 @@ function newMessage($i) $other = $friends[$j]; $message = Message::saveNew($user->id, $other->id, $content, 'createsim'); -} +}*/ function newSub($i) { @@ -345,7 +346,7 @@ function testNoticeContent() } //function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $favesavg, $messageavg, $tagmax) -function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $messageavg, $tagmax) +function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax) { global $config; $config['site']['dupelimit'] = -1; @@ -374,7 +375,7 @@ function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $message // # registrations + # notices + # subs //$events = $usercount + $groupcount + ($usercount * ($noticeavg + $subsavg + $joinsavg + $favesavg + $messageavg)); - $events = $usercount + $groupcount + ($usercount * ($noticeavg + $subsavg + $joinsavg + $messageavg)); + $events = $usercount + $groupcount + ($usercount * ($noticeavg + $subsavg + $joinsavg)); $events -= $preuser; $events -= $pregroup; @@ -385,9 +386,10 @@ function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $message $st = $nt + ($usercount * $subsavg); $jt = $st + ($usercount * $joinsavg); // $ft = $jt + ($usercount * $favesavg); - $mt = $ft + ($usercount * $messageavg); +// $mt = $ft + ($usercount * $messageavg); - printfv("$events events ($ut, $gt, $nt, $st, $jt, $ft, $mt)\n"); +// printfv("$events events ($ut, $gt, $nt, $st, $jt, $ft, $mt)\n"); + printfv("$events events ($ut, $gt, $nt, $st, $jt)\n"); for ($i = 0; $i < $events; $i++) { @@ -413,9 +415,9 @@ function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $message /* } else if ($e > $jt && $e <= $ft) { printfv("$i Making a new fave\n"); newFave($n);*/ - } else if ($e > $ft && $e <= $mt) { +/* } else if ($e > $ft && $e <= $mt) { printfv("$i Making a new message\n"); - newMessage($n); + newMessage($n);*/ } else { printfv("No event for $i!"); } @@ -430,7 +432,7 @@ $noticeavg = (have_option('n', 'notices')) ? get_option_value('n', 'notices') $subsavg = (have_option('b', 'subscriptions')) ? get_option_value('b', 'subscriptions') : max($usercount/20, 10); $joinsavg = (have_option('j', 'joins')) ? get_option_value('j', 'joins') : 5; //$favesavg = (have_option('f', 'faves')) ? get_option_value('f', 'faves') : max($noticeavg/10, 5); -$messageavg = (have_option('m', 'messages')) ? get_option_value('m', 'messages') : max($noticeavg/10, 5); +//$messageavg = (have_option('m', 'messages')) ? get_option_value('m', 'messages') : max($noticeavg/10, 5); $tagmax = (have_option('t', 'tags')) ? get_option_value('t', 'tags') : 10000; $userprefix = (have_option('x', 'prefix')) ? get_option_value('x', 'prefix') : 'testuser'; $groupprefix = (have_option('z', 'groupprefix')) ? get_option_value('z', 'groupprefix') : 'testgroup'; @@ -448,7 +450,7 @@ if (is_readable($wordsfile)) { try { //main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $favesavg, $messageavg, $tagmax); - main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $messageavg, $tagmax); + main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax); } catch (Exception $e) { printfv("Got an exception: ".$e->getMessage()); }