add IdentityUpdate for NoConstraint

Author: njericha

src/BlockTensorFactorization.jl

@@ -72,7 +72,7 @@ export LipschitzStep, ConstantStep, SPGStep
 export AbstractUpdate
 export GradientDescent, MomentumUpdate
 
-export ConstraintUpdate, GenericConstraintUpdate
+export ConstraintUpdate, GenericConstraintUpdate, IdentityUpdate
 export Projection, NNProjection, SafeNNProjection, Rescale
 
 export BlockedUpdate

src/Core/Core.jl

@@ -82,7 +82,7 @@ export LipschitzStep, ConstantStep, SPGStep
 export AbstractUpdate, AbstractGradientDescent
 export GradientDescent, BlockGradientDescent, MomentumUpdate
 
-export ConstraintUpdate, GenericConstraintUpdate
+export ConstraintUpdate, GenericConstraintUpdate, IdentityUpdate
 export Projection, NNProjection, SafeNNProjection, Rescale
 
 export BlockedUpdate

src/Core/blockupdates.jl

@@ -464,6 +464,7 @@ end
 Converts an AbstractConstraint to a ConstraintUpdate on the factor n
 """
 ConstraintUpdate(n, constraint::AbstractConstraint; kwargs...) = error("converting $(typeof(constraint)) to a ConstraintUpdate is not yet supported")
+ConstraintUpdate(n, constraint::NoConstraint; kwargs...) = IdentityUpdate(n)
 ConstraintUpdate(n, constraint::GenericConstraint; kwargs...) = GenericConstraintUpdate(n, constraint)
 ConstraintUpdate(n, constraint::ProjectedNormalization; kwargs...) = Projection(n, constraint)
 ConstraintUpdate(n, constraint::Entrywise; kwargs...) = Projection(n, constraint)
@@ -491,6 +492,15 @@ end
 
 check(_::ConstraintUpdate, _::AbstractDecomposition) = error("checking $(typeof(constraint)) is not yet supported")
 
+struct IdentityUpdate <: ConstraintUpdate
+    n::Integer
+end
+
+check(U::IdentityUpdate, D::AbstractDecomposition) = true
+getconstraint(_::IdentityUpdate) = noconstraint
+
+(_::IdentityUpdate)(x::T; kwargs...) where T = x
+
 struct GenericConstraintUpdate <: ConstraintUpdate
     n::Integer
     constraint::GenericConstraint

test/runtests.jl

@@ -109,6 +109,7 @@ const VERBOSE = true
         @test cpproduct(A, B, C) ≈ Y_array
         @test Y ≈ Y_array
         @test Y[1, 2, 3] ≈ sum(A[1, r] * B[2, r] * C[3, r] for r in 1:R)
+        @test Y_array ≈ sum(outer_product((A[:, r], B[:, r], C[:, r])) for r in 1:R)
     end
 
 @testset "Constraints" begin
@@ -415,15 +416,26 @@ end
 end
 
 @testset "BlockUpdates" begin
+    # Update from a NoConstraint
+    G1 = Tucker1((3, 3, 3), 2)
+    G2 = deepcopy(G1)
+    U = ConstraintUpdate(1, noconstraint)
+
+    U(G1)
+    @test G1 == G2 # should actually do nothing so using == rather than ≈
+
+    # Update from ProjectedNormalization
     G1 = CPDecomposition((3,3,3), 2)
     G2 = deepcopy(G1)
+
     U = ConstraintUpdate(2, l2normalize_cols!)
 
     U(G1)
     l2normalize_cols!(factor(G2, 2))
 
     @test G1 ≈ G2
 
+    # Update from a ComposedConstraint
     U = ConstraintUpdate(1, l2scale! ∘ nonnegative!)
     @test U.n == 1
 
@@ -656,13 +668,11 @@ end
             converged=RelativeError,
             #converged=(GradientNNCone, RelativeError),
             constrain_init=false,
-            maxiter=1,
-            #constraints=nonnegative!,
-            stats=[Iteration, ObjectiveValue, GradientNNCone, RelativeError, PrintStats]
+            maxiter=2,
+            constraints=[l2normalize_cols!, l2normalize_cols!, noconstraint],#nonnegative!,
+            stats=[Iteration, ObjectiveValue, GradientNorm, RelativeError, PrintStats,DisplayDecomposition]
         );
 
-
-
         # Semi-interesting run of CPDecomposition
         N = 100
         R = 5