Minor improvements before merge (4dbd9a33) · Commits · Jan Šmíd / Analyst 2

Comparison/src/main/java/cz/fidentis/analyst/face/HumanFaceUtils.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,9 +6,6 @@ import cz.fidentis.analyst.icp.Quaternion;
		import cz.fidentis.analyst.symmetry.Plane;
		import cz.fidentis.analyst.visitors.mesh.sampling.PointSampling;
		import cz.fidentis.analyst.visitors.procrustes.ProcrustesVisitor;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.List;
		import javax.vecmath.Matrix3d;
		import javax.vecmath.Matrix4d;
		import javax.vecmath.Point3d;
		@@ -381,17 +378,20 @@ public class HumanFaceUtils {
		// }
		// });
		// }

		/**
		* Sorts List by featurePoint type property
		*
		* @param featurePointList
		* @return ordered list of feature points by type
		*/
		/*
		protected static List<FeaturePoint> sortListByFeaturePointType(List<FeaturePoint> featurePointList) {
		Collections.sort(
		featurePointList, Comparator.comparingInt(fp -> fp.getFeaturePointType().getType())
		);
		return featurePointList;
		}
		*/

		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -7,10 +7,8 @@ import org.ejml.simple.SimpleMatrix;
		import org.ejml.simple.SimpleSVD;

		import java.util.ArrayList;
		import static java.util.Collections.list;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		import java.util.zip.DataFormatException;
		import javax.vecmath.Point3d;
		import javax.vecmath.Vector3d;
		@@ -143,7 +141,7 @@ public class ProcrustesAnalysis {
		* for vertices and feature points. This method is used to fit feature
		* points to already superimposed position over given face1, but move
		* vertices of face back to original position of face so all the vertex
		* movement is done by procrustes visitor.
		* movement is done by Procrustes visitor.
		*
		* @param faceModel on which adjustment will be applied
		* @param vertexVector vertex adjustment

+5 −5

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ import java.util.HashMap;
		import java.util.List;

		/**
		* Holds important face attributes that are required for procrustes analysis.
		* Holds important face attributes that are required for Procrustes analysis.
		*
		* @author Jakub Kolman
		*/
		@@ -17,7 +17,7 @@ public class ProcrustesAnalysisFaceModel {
		private final HashMap<Integer, Integer> featurePointTypeCorrespondence;

		/**
		* constructor creating inner attributes used in procrustes analysis from
		* constructor creating inner attributes used in Procrustes analysis from
		* face
		*
		* @param face
		@@ -31,7 +31,7 @@ public class ProcrustesAnalysisFaceModel {

		/**
		* Constructor for face model if there is a need for a subset selection of
		* feature points before applying procrustes analysis.
		* feature points before applying Procrustes analysis.
		*
		* @param face
		* @param viablePoints
		@@ -48,7 +48,7 @@ public class ProcrustesAnalysisFaceModel {

		/**
		* Sets feature points map and also sets feature point on human face for
		* visualisation.
		* visualization.
		*
		* @param featurePointsMap
		*/
		@@ -70,7 +70,7 @@ public class ProcrustesAnalysisFaceModel {

		/**
		* Creates a subset of selected feature points that can be used for
		* procrustes analysis. Each of the feature point types contained in the
		* Procrustes analysis. Each of the feature point types contained in the
		* subset is contained in both faces.
		*
		* @param featurePoints

+1 −5

Original line number	Diff line number	Diff line
		package cz.fidentis.analyst.procrustes;

		import cz.fidentis.analyst.feature.FeaturePoint;
		import cz.fidentis.analyst.icp.Quaternion;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.Map;
		import javax.vecmath.Vector3d;
		import org.ejml.simple.SimpleMatrix;

		/**
		* Class used to store information about transformation that needs to be applied
		* to a second face when computing procrustes analysis.
		* to a second face when computing Procrustes analysis.
		*
		* @author Jakub Kolman
		*/

+0 −5

Original line number	Diff line number	Diff line
		/*
		* To change this license header, choose License Headers in Project Properties.
		* To change this template file, choose Tools \| Templates
		* and open the template in the editor.
		*/
		package cz.fidentis.analyst.procrustes;

		import cz.fidentis.analyst.Logger;