/*
 * 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.engine;

import static java.util.Objects.requireNonNull;

import java.time.Clock;
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
 */
final class TimedResult<T> {

	final Duration duration;
	final T result;

	TimedResult(final Duration duration, final T result) {
		this.duration = requireNonNull(duration);
		this.result = requireNonNull(result);
	}

	/**
	 * Wraps the given supplier in a supplier which returns a {@code TimedResult}.
	 *
	 * @param supplier the supplier to wrap
	 * @param clock the clock used for measure the execution time
	 * @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,
		final Clock clock
	) {
		return () -> {
			final Timer timer = Timer.of(clock).start();
			final T result = supplier.get();
			return new TimedResult<>(timer.stop().getTime(), result);
		};
	}

	/**
	 * Wraps the given function in a function which returns a
	 * {@code TimedResult}.
	 *
	 * @param function the function to wrap
	 * @param clock the clock used for measure the execution time
	 * @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,
		final Clock clock
	) {
		return value -> {
			final Timer timer = Timer.of().start();
			final R result = function.apply(value);
			return new TimedResult<>(timer.stop().getTime(), result);
		};
	}

}

@@ -2477,16 +2477,21 @@
 imer.of(
+clock
 ).start(

Fix bug in 'TimedResult' class.