Merge branch 'newsolver' of github.com:saalfeldlab/render into newsolver

saalfeldlab · Aug 16, 2023 · 4b92b39 · 4b92b39
2 parents beb5643 + dc5e257
commit 4b92b39
Show file tree

Hide file tree

Showing 3 changed files with 357 additions and 34 deletions.
diff --git a/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java b/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java
@@ -3,18 +3,13 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.function.Function;
 
-import org.janelia.alignment.spec.ResolvedTileSpecCollection.TransformApplicationMethod;
 import org.janelia.render.client.newsolver.assembly.Assembler;
 import org.janelia.render.client.newsolver.assembly.ZBlockSolver;
 import org.janelia.render.client.newsolver.blockfactories.ZBlockFactory;
@@ -24,20 +19,13 @@
 import org.janelia.render.client.newsolver.solvers.Worker;
 import org.janelia.render.client.newsolver.solvers.WorkerTools;
 import org.janelia.render.client.newsolver.solvers.affine.AffineAlignBlockWorker;
-import org.janelia.render.client.solver.DistributedSolveDeSerialize;
-import org.janelia.render.client.solver.DistributedSolveWorker;
-import org.janelia.render.client.solver.MinimalTileSpec;
-import org.janelia.render.client.solver.SolveItemData;
-import org.janelia.render.client.solver.SolveTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import mpicbg.models.Affine2D;
 import mpicbg.models.AffineModel2D;
 import mpicbg.models.Model;
-import mpicbg.models.NoninvertibleModelException;
 import mpicbg.models.RigidModel2D;
-import mpicbg.spim.io.IOFunctions;
 
 public class AffineDistributedSolver
 {

diff --git a/...r-ws-java-client/src/main/java/org/janelia/render/client/newsolver/setup/RenderSetup.java b/...r-ws-java-client/src/main/java/org/janelia/render/client/newsolver/setup/RenderSetup.java
@@ -18,7 +18,6 @@
 import org.janelia.alignment.spec.stack.StackStats;
 import org.janelia.alignment.util.ZFilter;
 import org.janelia.render.client.RenderDataClient;
-import org.janelia.render.client.solver.RunParameters;
 import org.janelia.render.client.solver.SerializableValuePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;