Merge pull request GoogleCloudPlatform#244 from GoogleCloudPlatform/language

SurferJeffAtGoogle · web-flow · commit 4b73bcecb773 · 2016-11-14T15:40:37.000-08:00
Report score, not polarity, which is obsolete.
diff --git a/language/api/src/functions/annotation_to_string.php b/language/api/src/functions/annotation_to_string.php
@@ -35,11 +35,9 @@ function annotation_to_string(Annotation $annotation)
 
     if (isset($info['documentSentiment'])) {
         $magnitude = $info['documentSentiment']['magnitude'];
-        $polarity = $info['documentSentiment']['polarity'];
-        if ($polarity < 0) {
-            $magnitude = -$magnitude;
-        }
-        $ret .= sprintf('sentiment: %s' . PHP_EOL, $magnitude);
+        $score = $info['documentSentiment']['score'];
+        $ret .= sprintf('sentiment magnitude: %s score: %s' . PHP_EOL,
+            $magnitude, $score);
     }
 
     if (isset($info['sentences'])) {
diff --git a/language/api/test/SentimentCommandTest.php b/language/api/test/SentimentCommandTest.php
@@ -57,7 +57,7 @@ public function testSentiment()
         );
 
         $output = $this->commandTester->getDisplay();
-        $this->assertRegExp('/sentiment: /', $output);
+        $this->assertRegExp('/sentiment/', $output);
     }
 
     public function testSentimentFromStorageObject()

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testSentiment()`
`57`	`57`	`);`
`58`	`58`
`59`	`59`	`$output = $this->commandTester->getDisplay();`
`60`		`- $this->assertRegExp('/sentiment: /', $output);`
	`60`	`+ $this->assertRegExp('/sentiment/', $output);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function testSentimentFromStorageObject()`