/*
 * Java Genetic Algorithm Library (@__identifier__@).
 * Copyright (c) @__year__@ Franz Wilhelmstötter
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 * Author:
 *    Franz Wilhelmstötter (franz.wilhelmstoetter@gmx.at)
 */
package org.jenetics.internal.util;

import static java.util.Objects.requireNonNull;

import java.io.Serializable;
import java.time.Duration;
import java.util.function.Function;
import java.util.function.Supplier;

/**
 * Container class which contains the execution result and the execution time.
 *
 * @author <a href="mailto:franz.wilhelmstoetter@gmx.at">Franz Wilhelmstötter</a>
 * @since 3.0
 * @version 3.0 &mdash; <em>$Date: 2014-08-07 $</em>
 */
public final class TimedResult<T> implements Serializable {
	private static final long serialVersionUID = 1L;

	private final Duration _duration;
	private final T _result;

	private TimedResult(final Duration duration, final T result) {
		_duration = requireNonNull(duration);
		_result = requireNonNull(result);
	}

	/**
	 * Wraps the given supplier in a supplier which returns a {@code TimedResult}.
	 *
	 * @param supplier the supplier to wrap
	 * @param <T> the result type
	 * @return the wrapped supplier which returns a {@code TimedResult}
	 */
	public static <T> Supplier<TimedResult<T>> of(
		final Supplier<? extends T> supplier
	) {
		return () -> {
			final Timer timer = Timer.of().start();
			try {
				return new TimedResult<>(timer.getTime(), supplier.get());
			} finally {
				timer.stop();
			}
		};
	}

	/**
	 * Wraps the given function in a function which returns a
	 * {@code TimedResult}.
	 *
	 * @param function the function to wrap
	 * @param <T> the functions parameter type
	 * @param <R> the functions return type
	 * @return the wrapped function which returns a {@code TimedResult}
	 */
	public static <T, R> Function<T, TimedResult<R>> of(
		final Function<? super T, ? extends R> function
	) {
		return value -> {
			final Timer timer = Timer.of().start();
			try {
				return new TimedResult<>(timer.getTime(), function.apply(value));
			} finally {
				timer.stop();
			}
		};
	}

	/**
	 * Return the execution result.
	 *
	 * @return the execution result.
	 */
	public T get() {
		return _result;
	}

	/**
	 * Return the execution duration.
	 *
	 * @return the execution duration
	 */
	public Duration getDuration() {
		return _duration;
	}

}

@@ -1887,39 +1887,65 @@
 f().start();%0A%09%09%09
-try %7B%0A%09
+final T result = supplier.get();%0A
 %09%09%09return new Ti
@@ -1954,32 +1954,39 @@
 dResult%3C%3E(timer.
+stop().
 getTime(), suppl
@@ -1984,62 +1984,16 @@
 (), 
-supplier.get());%0A%09%09%09%7D finally %7B%0A%09%09%09%09timer.stop();%0A%09%09%09%7D
+result);
 %0A%09%09%7D
@@ -2470,15 +2470,48 @@
 %0A%09%09%09
-try %7B%0A%09
+final R result = function.apply(value);%0A
 %09%09%09r
@@ -2540,16 +2540,23 @@
 %3E(timer.
+stop().
 getTime(
@@ -2562,69 +2562,16 @@
 (), 
-function.apply(value));%0A%09%09%09%7D finally %7B%0A%09%09%09%09timer.stop();%0A%09%09%09%7D
+result);
 %0A%09%09%7D

Fix TimedResult factory methods.