diff --git a/test/runtests.jl b/test/runtests.jl index c2fcc03c6..157cea005 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,23 +1,19 @@ using Test # temporarily moved to start (for debugging) -include("testDefaultDeconv.jl") # see #1482, sequence might influence/hide a test error. -include("testSpecialEuclidean2Mani.jl") - -include("testFactorGradients.jl") -include("testpartialconstraint.jl") -include("testPartialNH.jl") +#... include("testSphereMani.jl") include("testSpecialOrthogonalMani.jl") +include("testSpecialEuclidean2Mani.jl") include("testDistributionsGeneric.jl") include("testHeatmapGridDensity.jl") include("testCliqSolveDbgUtils.jl") include("TestModuleFunctions.jl") -include("testApproxConv.jl") include("testCompareVariablesFactors.jl") include("typeReturnMemRef.jl") +include("testApproxConv.jl") include("basicGraphsOperations.jl") include("testMixturePrior.jl") include("testGradientUtils.jl") @@ -31,12 +27,17 @@ include("testTreeFunctions.jl") #FIXME fails on MetaBayesTree include("testTreeSaveLoad.jl") -include("testSpecialSampler.jl") +include("testFactorGradients.jl") +include("testpartialconstraint.jl") +include("testPartialNH.jl") + +include("testSpecialSampler.jl") # TODO, rename, refine include("saveconvertertypes.jl") include("testgraphpackingconverters.jl") include("testNLsolve.jl") include("testCommonConvWrapper.jl") include("testBasicForwardConvolve.jl") +include("testDefaultDeconv.jl") include("testFactorMetadata.jl") include("testStateMachine.jl") include("testBasicCSM.jl") diff --git a/test/testDefaultDeconv.jl b/test/testDefaultDeconv.jl index e274d8499..a62207b45 100644 --- a/test/testDefaultDeconv.jl +++ b/test/testDefaultDeconv.jl @@ -93,15 +93,11 @@ end fg = generateGraph_CaesarRing1D() getSolverParams(fg).useMsgLikelihoods = true -# # TEMPORARY MUST COMMENT ON TRAVIS -# getSolverParams(fg).drawtree = true - vo = [:x3,:x5,:x1,:l1,:x4,:x2,:x6,:x0] mkpath(getLogPath(fg)) -tree = solveTree!(fg, eliminationOrder=vo, timeout=40, verbose=true) +tree = solveTree!(fg, eliminationOrder=vo, verbose=true) #, timeout=5) # timeout creates interrupt exception -# msg = getMsgUpThis(tree.cliques[2]) msg = IIF.getMessageBuffer(tree.cliques[2]).upRx tfg = buildCliqSubgraph(fg, tree.cliques[2]) @@ -176,4 +172,5 @@ pred, meas = approxDeconv(fg, :x0x1f1) end + #