Merge pull request #695 from JuliaRobotics/21Q1/maint/fluxsamplefactor

general fixes and updates, compat
JuliaRobotics · Mar 24, 2021 · d251002 · d251002
2 parents 36878e3 + eb953f2
commit d251002
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -42,7 +42,7 @@ Unmarshal = "cbff2730-442d-58d7-89d1-8e530c41eb02"
 YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 
 [compat]
-ApproxManifoldProducts = "0.1, 0.2"
+ApproxManifoldProducts = "0.2, 0.3"
 AprilTags = "0.8, 0.9"
 Combinatorics = "0.7, 0.8, 0.9, 1"
 CoordinateTransformations = "0.5, 0.6"
@@ -66,7 +66,7 @@ Reexport = "0.2, 1.0"
 Requires = "0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 1"
 RoME = "0.11, 0.12, 0.13"
 Rotations = "0.13, 1"
-TensorCast = "0.2, 0.3"
+TensorCast = "0.2, 0.3, 0.4"
 TimeZones = "1.3.1, 1.4"
 TransformUtils = "0.2.2"
 Unmarshal = "0.2.1, 0.3, 0.4"

diff --git a/examples/learning/NeuralODE/DiffFluxOdoChords.jl b/examples/learning/NeuralODE/DiffFluxOdoChords.jl
@@ -78,7 +78,7 @@ whichVelIdx = ones(Int, 100)
 measSeq = collect(1:100)
 
 setNaiveFracAll!(fg, 1.0)
-meas = freshSamples(fg, :x0x1f1, 100)
+meas = sampleFactor(fg, :x0x1f1, 100)
 setNaiveFracAll!(fg, 0.0)
 for fs in fsyms, idx in 1:100
   fill!(whichVelIdx,1)
@@ -113,7 +113,7 @@ for from in vsyms[1:end-1]
       for fs in fsyms
         intermTo = getVariableOrder(fg, fs)[end]
         setNaiveFracAll!(fg, 1.0)
-        meas = freshSamples(fg, fs, 1)
+        meas = sampleFactor(fg, fs, 1)
         setNaiveFracAll!(fg, 0.0)
         for idx in 1:100
           # fill!(whichVelIdx,1) # only if doing all 100