[Tritonn-commit 98] [svn] [111] fixed a bug for datagen.sh

Zurück zum Archiv-Index

svnno****@sourc***** svnno****@sourc*****
2008年 4月 18日 (金) 16:33:04 JST


Revision: 111
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=111
Author:   mir
Date:     2008-04-18 16:33:04 +0900 (Fri, 18 Apr 2008)

Log Message:
-----------
fixed a bug for datagen.sh

Modified Paths:
--------------
    misc/data/datagen.sh

Modified: misc/data/datagen.sh
===================================================================
--- misc/data/datagen.sh	2008-04-18 06:24:20 UTC (rev 110)
+++ misc/data/datagen.sh	2008-04-18 07:33:04 UTC (rev 111)
@@ -1,7 +1,8 @@
 #!/bin/sh
+
 #set -x
-ROW_SIZE=1000
-ROW_NUM=100
+ROW_SIZE=40
+ROW_NUM=3
 MYSQL="/usr/local/mysql/bin/mysql -uroot --default-character-set=utf8 dict "
 
 
@@ -44,21 +45,21 @@
       RAITO_SUM=`expr $RAITO_SUM + ${RAITO[$i]}`
       i=`expr $i + 1`
     done
-    DICE=`expr $RANDOM % $RAITO_SUM`
 }
 
 TABLE=
 ID=
 get_table_and_id() {
     i=0
+    DICE=`expr $RANDOM % $RAITO_SUM`
     while test $i -lt 25
       do
       if [ $DICE -lt ${RAITO[$i]} ]
 	  then
 	  TABLE=${TABLE_LIST[$i]}
 	  # TODO: should calculate more correctly
-	  ID=`expr $RANDOM % ${TABLE_ROWS[$i]}`
-	  break
+	  ID=`expr $RANDOM % ${TABLE_ROWS[$i]} + 1`
+	  i=25
       else 
 	  DICE=`expr $DICE - ${RAITO[$i]}`
 	  i=`expr $i + 1`
@@ -77,8 +78,8 @@
     WORD=`echo $RESULT | awk '{print $2}'`
 }
 
+STRING=
 CUR_SIZE=0
-STRING=
 get_string() {
     while test $CUR_SIZE -lt $ROW_SIZE
       do
@@ -86,10 +87,12 @@
       get_word
       STRING=${STRING}${WORD}
       CUR_SIZE=`expr $CUR_SIZE + $SIZE`
+      TABLE=""
+      ID=""
     done
 }
 
-#echo "***** main() *****"
+# main logic
 CUR_ROW_NUM=0
 load_table_rows
 get_raito_sum
@@ -97,6 +100,7 @@
   do
   get_string
   echo $STRING
+  STRING=""
+  CUR_SIZE=0
   CUR_ROW_NUM=`expr $CUR_ROW_NUM + 1`
 done
-#echo "***** main() *****"




Tritonn-commit メーリングリストの案内
Zurück zum Archiv-Index