Go pack to using the UniqueSolver.

khatchad · khatchad · commit 7c056b4c5d9b · 2017-12-18T11:02:05.000-05:00
Can't get the slicing working.
diff --git a/edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/safe/TypestateSolverFactory.java b/edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/safe/TypestateSolverFactory.java
@@ -49,7 +49,7 @@ public static ISafeSolver getSolver(AnalysisOptions domoOptions, CallGraph cg,
 			throws PropertiesException, CancelException {
 		IMergeFunctionFactory mergeFactory = makeMergeFactory(options, TypeStateSolverKind.UNIQUE);
 		ILiveObjectAnalysis live = getLiveObjectAnalysis(cg, hg, options);
-		return new ClientSlicingUniqueSolver(cg, pointerAnalysis, dfa, options, live, ora, metrics, reporter, traceReporter, mergeFactory);
+		return new UniqueSolver(cg, pointerAnalysis, dfa, options, live, ora, metrics, reporter, traceReporter, mergeFactory);
 	}
 
 	protected static ILiveObjectAnalysis getLiveObjectAnalysis(CallGraph cg, HeapGraph<?> hg, TypeStateOptions options)

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static ISafeSolver getSolver(AnalysisOptions domoOptions, CallGraph cg,`
`49`	`49`	`throws PropertiesException, CancelException {`
`50`	`50`	`IMergeFunctionFactory mergeFactory = makeMergeFactory(options, TypeStateSolverKind.UNIQUE);`
`51`	`51`	`ILiveObjectAnalysis live = getLiveObjectAnalysis(cg, hg, options);`
`52`		`- return new ClientSlicingUniqueSolver(cg, pointerAnalysis, dfa, options, live, ora, metrics, reporter, traceReporter, mergeFactory);`
	`52`	`+ return new UniqueSolver(cg, pointerAnalysis, dfa, options, live, ora, metrics, reporter, traceReporter, mergeFactory);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`protected static ILiveObjectAnalysis getLiveObjectAnalysis(CallGraph cg, HeapGraph<?> hg, TypeStateOptions options)`