Commit 8f18c578 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch 'adapt-project-refactoring' into 'master' 

Adapt project refactoring changes

See merge request grp-fidentis/analyst-webapp!63
parents e4f1fd99 49ae322b

backend/src/main/java/cz/fidentis/web/analyticaltask/symmetry/SymmetryMethod.java

+2 −3
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ import java.util.function.BiFunction; 
@NoArgsConstructor

@Getter

public enum SymmetryMethod {

    FAST_MESH_SURFACE((samplingStrategy, ignored) -> new SymmetryConfig(SymmetryConfig.Method.OLD_MESH, samplingStrategy)),

    ROBUST_MESH_SURFACE((samplingStrategy, ignored) -> new SymmetryConfig(SymmetryConfig.Method.ROBUST_MESH, samplingStrategy)),

    ROBUST_MESH_VERTICES((samplingStrategy, ignored) -> new SymmetryConfig(SymmetryConfig.Method.ROBUST_POINT_CLOUD, samplingStrategy)),

    ROBUST_MESH_SURFACE((samplingConfig1, samplingConfig2) -> new SymmetryConfig(SymmetryConfig.Method.ROBUST_MESH, samplingConfig1, samplingConfig2.maxSamples())),

    ROBUST_MESH_VERTICES((samplingConfig1, samplingConfig2) -> new SymmetryConfig(SymmetryConfig.Method.ROBUST_POINT_CLOUD, samplingConfig1, samplingConfig2.maxSamples())),

    FEATURE_POINTS;



    private BiFunction<PointSamplingConfig, PointSamplingConfig, SymmetryConfig> symmetryEstimator;

backend/src/main/java/cz/fidentis/web/analyticaltask/symmetry/SymmetryTaskServiceImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ public class SymmetryTaskServiceImpl implements SymmetryTaskService { 
            recomputeFromMesh(dto, face);

        }



        Double precision = face.hasSymmetryPlane() ? FaceStateServices.calculateSymmetryPlanePrecision(face, false) : null;

        Double precision = face.hasSymmetryPlane()

                ? FaceStateServices.measureSymmetry(face, 50).getDistanceStats().getAverage()

                : null;

        humanFaceEntity.getHelperHumanFace().setSymmetryPlanePrecision(precision);



        humanFaceService.save(dto.getTaskId(), humanFaceEntity);

backend/src/main/java/cz/fidentis/web/analyticaltask/symmetry/dto/SymmetryTaskDto.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public class SymmetryTaskDto { 
    private Long taskId;



    @NotNull

    private SymmetryMethod symmetryMethod = SymmetryMethod.FAST_MESH_SURFACE;

    private SymmetryMethod symmetryMethod = SymmetryMethod.ROBUST_MESH_SURFACE;



    @NotNull

    private SamplingTaskDto candidateSearchSampling;

backend/src/main/java/cz/fidentis/web/batchprocessing/registration/BatchRegistrationServiceImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public class BatchRegistrationServiceImpl extends BatchBaseService implements Ba 
        File tempFile = File.createTempFile(this.getClass().getSimpleName(), ".obj");

        tempFile.deleteOnExit();



        HumanFace newAvgFace = HumanFaceFactory.create(avgMesh, tempFile.getCanonicalPath());

        HumanFace newAvgFace = HumanFaceFactory.create(avgMesh, tempFile.getCanonicalPath(), -1L, true);

        try {

            MeshIO.exportMeshModel(newAvgFace.getMeshModel(), tempFile);

        } catch (IOException ex) {

backend/src/main/java/cz/fidentis/web/batchprocessing/visualization/BatchVisualizationServiceImpl.java

+3 −3
Original line number Diff line number Diff line 
package cz.fidentis.web.batchprocessing.visualization;



import cz.fidentis.analyst.engines.face.batch.clustering.ClusteringService;

import cz.fidentis.analyst.engines.face.batch.clustering.Clusterer;

import cz.fidentis.analyst.engines.face.batch.clustering.ClusteringServices;

import cz.fidentis.analyst.engines.face.batch.clustering.LinkageStrategy;

import cz.fidentis.analyst.engines.face.batch.clustering.dto.ClusterNode;
@@ -72,8 +72,8 @@ public class BatchVisualizationServiceImpl implements BatchVisualizationService 
            case AVERAGE -> new AverageLinkageStrategy();

        };



        ClusteringService clusteringService = ClusteringServices.initClusteringService(distancesArray, faceNames, linkageStrategy);

        ClusterNode clusterRoot = clusteringService.performAgglomerativeClustering();

        Clusterer clusteringService = ClusteringServices.initAgglomerativeClusteringService(distancesArray, faceNames, linkageStrategy);

        ClusterNode clusterRoot = clusteringService.performClustering();



        return new SerializableClusterNode(clusterRoot);

    }