4346ff930104b0d9b6735090a1ce4c485d40b981,pymanopt/manifolds/grassmann.py,Grassmann,dist,#Grassmann#,71

Before Change

    // Geodesic distance for Grassmann
    def dist(self, X, Y):
        if self._k == 1:
            u, s, v = np.linalg.svd(np.dot(X.T, Y))
            s[s > 1] = 1
            s = np.arccos(s)
            return np.linalg.norm(s)
        else:
            XtY = multiprod(multitransp(X), Y)
            square_d = 0
            for i in xrange(self._k):
                s = np.linalg.svd(XtY[i], compute_uv=False)
                // Ensure that -1 <= s <= 1
                s = np.fmin(s, [1])
                s = np.fmax(s, [-1])
                square_d = square_d + np.linalg.norm(np.arccos(s))**2
            return np.sqrt(square_d)

    def inner(self, X, G, H):

After Change

    // Geodesic distance for Grassmann
    def dist(self, X, Y):
        u, s, v = svd(multiprod(multitransp(X), Y))
        s[s > 1] = 1
        s = np.arccos(s)
        return np.linalg.norm(s)

Instances