Changeset 4062

Timestamp:

01/05/08 22:34:33 (5 years ago)

Author:

hiroyukim

Message:

scan の実装を勘違いしていたので修正、それに伴い発生したバグの修正

Location:

lang/perl/Mezasi/trunk/lib/Mezasi

Files:

• Dictionary.pm (modified) (4 diffs)
• Freq.pm (modified) (6 diffs)

lang/perl/Mezasi/trunk/lib/Mezasi/Dictionary.pm

@@ -116 +116 @@
     $result .= "\n";
 
-    %{$self->{occur}} = map { ( $_ =>  $self->{occur}->{$_} ) } grep { not ( scalar( @{$self->{occur}->{$_}} ) == 0 ) } keys %{$self->{occur}};
+    %{$self->{occur}} = map { ( $_ =>  $self->{occur}->{$_} ) } grep { $self->{occur}->{$_} && ( not ( scalar( @{$self->{occur}->{$_}} ) == 0 ) ) } keys %{$self->{occur}};
    
     while( my ( $key , $value ) = each %{$self->{occur}} ) {
-        $self->{oocur}->{$key} = [ map { $value->[$_] } (-100..-1) ] if( scalar( @{$value} ) > 100 ); 
+        $self->{oocur}->{$key} = [ map { $value->[$_] } (-100..-1) ] if( $value && scalar( @{$value} ) > 100 ); 
     }
    
@@ -224 +224 @@
 
     my @new_terms = Mezasi::Freq->extract_terms( $lines, 30 );
-   
+
     for my $term ( @new_terms ) {
         $self->add_term($term);
@@ -239 +239 @@
 
             for my $term (@words) {
-                if( not  $self->{occur}->{$term}  || $num > $self->{occur}->{$term}->{-1} ) {
+                if( not  $self->{occur}->{$term}  || $num > ( $self->{occur}->{$term}->[-1] || 0 ) ) {
                     push @{$self->{occur}->{$term}} , $num;
                 }
@@ -311 +311 @@
     my ($self, $word ) = @_;
 
-    if( not $self->{rel}->{$word} || ($self->{rel}->{$word}->{sum}||0) == 0 ) {
+    if( ( not $self->{rel}->{$word} ) ||  ( not $self->{rel}->{$word}->{sum} ) || ( $self->{rel}->{$word}->{sum} || 0 ) == 0  ) {
         return 0;
     }

lang/perl/Mezasi/trunk/lib/Mezasi/Freq.pm

@@ -3 +3 @@
 use warnings;
 use utf8;
+use Data::Dumper;
 
 sub extract_terms {
@@ -14 +15 @@
 
     return bless {
-        buf =>  $buf || [], 
+        buf => ( $buf && ref $buf eq 'ARRAY' ) ? join("\0", @$buf ) : q{ },
     }, $class;
 }
@@ -22 +23 @@
 
     my @terms = @{$self->extract_terms_sub($limit)};
+
     # before: [["hello world", 1]]
     # after:  [["dlrow olleh", 1]]
@@ -42 +44 @@
     push @terms2, $terms[-1] if  @terms > 0 ;
 
-    return  map { join '',reverse @{[split //, $_->[0]]} }  @terms2; 
+    return map { join '',reverse @{[split //, $_->[0]]} }  @terms2 ; 
 
 }
@@ -50 +52 @@
     $num ||= 1;
     my $h    = $self->freq($str);
+
     my $flag = ( scalar( keys %$h ) <= 4 ) ? 1 : 0 ;
 
@@ -74 +77 @@
     
     if( scalar(  @{[split(//,$str || '')]}  ) == 0 ) {
-        for my $buf (@{$self->{buf}}) {
-            if( $buf =~ /([!-~])[!-~]*|([ァ-ヴ])[ァ-ヴー]*|([^ー\0])/i ) {
-                $freq->{ $1 || $2 || $3 } += 1;
-            }
+        while( $self->{buf} =~ /([!-~])[!-~]*|([ァ-ヴ])[ァ-ヴー]*|([^ー\0])/gi ) {
+            $freq->{ $1 || $2 || $3 } += 1;
         }
     }
     else {
-        for my $buf (@{$self->{buf}}) {
-            {
-                if( $buf =~ /($str)[^\0]?/io ) {
-                    $freq->{$1} += 1;
-                }
-            }
+        while( $self->{buf} =~ /($str)[^\n]?/gio ) {
+            $freq->{$1} += 1;
         }
     }