fixed conflicts

1 files changed, 0 insertions, 25 deletions

diff --git a/gi/posterior-regularisation/prjava/src/optimization/linesearch/InterpolationPickFirstStep.java b/gi/posterior-regularisation/prjava/src/optimization/linesearch/InterpolationPickFirstStep.java
deleted file mode 100644
index 0deebcdb..00000000
--- a/gi/posterior-regularisation/prjava/src/optimization/linesearch/InterpolationPickFirstStep.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package optimization.linesearch;
-
-
-public class InterpolationPickFirstStep extends GenericPickFirstStep{
-	public InterpolationPickFirstStep(double initValue) {
-		super(initValue);
-	}
-	
-	public double getFirstStep(LineSearchMethod ls){
-		if(ls.getPreviousStepUsed() != -1 && ls.getPreviousInitialGradient()!=0){
-			double newStep = Math.min(300, 1.02*ls.getPreviousInitialGradient()*ls.getPreviousStepUsed()/ls.getInitialGradient());
-		//	System.out.println("proposing " + newStep);
-			return newStep;
-			
-		}
-		return _initValue;
-	}
-	public void collectInitValues(WolfRuleLineSearch ls){
-		
-	}
-	
-	public void collectFinalValues(WolfRuleLineSearch ls){
-		
-	}
-}