From ddea0c823239d2eb9b699dc00adf6b0963913d27 Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Jan 2013 04:53:58 +0000
Subject: * lib/matrix.rb: Take conjugate for inner product
 [rubyspec:5a01ad5719f2] [ruby-dev:46101]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     | 5 +++++
 lib/matrix.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 12ea3bb135..53d2e44014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 30 13:53:43 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Take conjugate for inner product
+	[rubyspec:5a01ad5719f2] [ruby-dev:46101]
+
 Wed Jan 30 13:22:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (local_push_gen): warn assigned but unused variables also in
diff --git a/lib/matrix.rb b/lib/matrix.rb
index cf23d4159d..7a3857ae99 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -1752,7 +1752,7 @@ class Vector
 
     p = 0
     each2(v) {|v1, v2|
-      p += v1 * v2
+      p += v1 * v2.conj
     }
     p
   end
-- 
cgit v1.2.3