Skip to content

Commit 453f3c9

Browse files
EuakEuak
committed
Fixed variable names
The variable names were modified to the camelCase convention, tests included.
1 parent d48e31d commit 453f3c9

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎src/NGrams/Statistic2D.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static public function fisher(array $ngram, int $totalNgrams, string $side) : fl
202202
########### this part by Nitin O Verma
203203

204204
if($side == 'left') {
205-
$final_Limit = $var['jointFrequency'];
205+
$finalLimit = $var['jointFrequency'];
206206
$var['jointFrequency'] = 0;
207207
$var['LminusJ'] = $var['leftFrequency'];
208208
$var['RminusJ'] = $var['rightFrequency'];
@@ -216,7 +216,7 @@ static public function fisher(array $ngram, int $totalNgrams, string $side) : fl
216216
}
217217

218218
} else {
219-
$final_Limit = ($var['leftFrequency'] < $var['rightFrequency']) ? $var['leftFrequency'] : $var['rightFrequency'];
219+
$finalLimit = ($var['leftFrequency'] < $var['rightFrequency']) ? $var['leftFrequency'] : $var['rightFrequency'];
220220
}
221221

222222
########### end of part by Nitin O Verma
@@ -292,7 +292,7 @@ static public function fisher(array $ngram, int $totalNgrams, string $side) : fl
292292

293293
$i = ($side == 'left') ? 1 : $var['jointFrequency']+1;
294294

295-
for($i; $i <= $final_Limit; $i++ ) {
295+
for($i; $i <= $finalLimit; $i++ ) {
296296
$product *= $var['LminusJ'];
297297

298298
$var['n22']++;

‎src/NGrams/Statistic3D.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ static public function setStatVariables(array $ngram, int $totalNgrams)
125125
$var['firstFrequency'] = $ngram[1]; # n1pp single freq of first word
126126
$var['secondFrequency'] = $ngram[2]; # np1p single freq of second word
127127
$var['thirdFrequency'] = $ngram[3]; # npp1 single freq of third word
128-
$var['first_secondFrequency'] = $ngram[4]; # n11p freq of first with the second word
129-
$var['first_thirdFrequency'] = $ngram[5]; # n1p1 freq of second with the third word
130-
$var['second_thirdFrequency'] = $ngram[6]; # np11 freq of first with the third word
128+
$var['firstSecondFrequency'] = $ngram[4]; # n11p freq of first with the second word
129+
$var['firstThirdFrequency'] = $ngram[5]; # n1p1 freq of second with the third word
130+
$var['secondThirdFrequency'] = $ngram[6]; # np11 freq of first with the third word
131131

132-
$var['n112'] = $var['first_secondFrequency'] - $var['jointFrequency'];
133-
$var['n211'] = $var['second_thirdFrequency'] - $var['jointFrequency'];
132+
$var['n112'] = $var['firstSecondFrequency'] - $var['jointFrequency'];
133+
$var['n211'] = $var['secondThirdFrequency'] - $var['jointFrequency'];
134134
$var['n212'] = $var['secondFrequency'] - $var['jointFrequency'] - $var['n112'] - $var['n211'];
135135

136-
$var['n121'] = $var['first_thirdFrequency'] - $var['jointFrequency'];
136+
$var['n121'] = $var['firstThirdFrequency'] - $var['jointFrequency'];
137137
$var['n122'] = $var['firstFrequency'] - $var['jointFrequency'] - $var['n112'] - $var['n121'];
138138
$var['n221'] = $var['thirdFrequency'] - $var['jointFrequency'] - $var['n211'] - $var['n121'];
139139
$var['nppp'] = $totalNgrams;

‎tests/TextAnalysis/NGrams/StatisticFacadeTest.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,44 @@ public function testBigrams()
3232
$this->assertEquals($ngrams['know<>something'], array( 0=>2, 1=> 3, 2 => 2));
3333

3434
//test tmi measure
35-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'tmi', 2);
36-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 0.1612);
35+
$ngramsStats = StatisticFacade::calculate($ngrams, 'tmi', 2);
36+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 0.1612);
3737

3838
//test ll measure
39-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'll', 2);
40-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 13.8516);
39+
$ngramsStats = StatisticFacade::calculate($ngrams, 'll', 2);
40+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 13.8516);
4141

4242
//test pmi measure
43-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'pmi', 2);
44-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 4.3692);
43+
$ngramsStats = StatisticFacade::calculate($ngrams, 'pmi', 2);
44+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 4.3692);
4545

4646
//test dice measure
47-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'dice', 2);
48-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 0.8000);
47+
$ngramsStats = StatisticFacade::calculate($ngrams, 'dice', 2);
48+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 0.8000);
4949

5050
//test x2 measure
51-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'x2', 2);
52-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 40.6444);
51+
$ngramsStats = StatisticFacade::calculate($ngrams, 'x2', 2);
52+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 40.6444);
5353

5454
//test tscore measure
55-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'tscore', 2);
56-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 1.3458);
55+
$ngramsStats = StatisticFacade::calculate($ngrams, 'tscore', 2);
56+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 1.3458);
5757

5858
//test phi measure
59-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'phi', 2);
60-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 0.6556);
59+
$ngramsStats = StatisticFacade::calculate($ngrams, 'phi', 2);
60+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 0.6556);
6161

6262
//test odds measure
63-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'odds', 2);
64-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 118.0000);
63+
$ngramsStats = StatisticFacade::calculate($ngrams, 'odds', 2);
64+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 118.0000);
6565

6666
//test leftFisher measure
67-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'leftFisher', 2);
68-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 1.0000);
67+
$ngramsStats = StatisticFacade::calculate($ngrams, 'leftFisher', 2);
68+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 1.0000);
6969

7070
//test rightFisher measure
71-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'rightFisher', 2);
72-
$this->assertEquals(round($ngrams_stats['know<>something'], 4), 0.0016);
71+
$ngramsStats = StatisticFacade::calculate($ngrams, 'rightFisher', 2);
72+
$this->assertEquals(round($ngramsStats['know<>something'], 4), 0.0016);
7373
}
7474

7575
public function testTrigrams()
@@ -81,11 +81,11 @@ public function testTrigrams()
8181
$this->assertEquals($ngrams['the<>know<>something'], array( 0 => 1, 1 => 4, 2 => 3, 3 => 2, 4 => 1, 5 => 1, 6 => 2));
8282

8383
//test tmi measure
84-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'tmi', 3);
85-
$this->assertEquals(round($ngrams_stats['the<>know<>something'], 4), 0.2002);
84+
$ngramsStats = StatisticFacade::calculate($ngrams, 'tmi', 3);
85+
$this->assertEquals(round($ngramsStats['the<>know<>something'], 4), 0.2002);
8686

8787
//test ll measure
88-
$ngrams_stats = StatisticFacade::calculate($ngrams, 'll', 3);
89-
$this->assertEquals(round($ngrams_stats['the<>know<>something'], 4), 16.9283);
88+
$ngramsStats = StatisticFacade::calculate($ngrams, 'll', 3);
89+
$this->assertEquals(round($ngramsStats['the<>know<>something'], 4), 16.9283);
9090
}
9191
}

0 commit comments

Comments
 (0)