From 878d997a4e97a8fba23958c1b0b2a3b175ea3b53 Mon Sep 17 00:00:00 2001 From: "PSp..om" Date: Sat, 24 Sep 2011 09:15:15 +0000 Subject: [PATCH] Removing deprecated references. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8285 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../test/jme3test/network/MovingAverage.java | 64 +++++++++++++++++++ .../test/jme3test/network/TestLatency.java | 4 +- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 engine/src/test/jme3test/network/MovingAverage.java diff --git a/engine/src/test/jme3test/network/MovingAverage.java b/engine/src/test/jme3test/network/MovingAverage.java new file mode 100644 index 000000000..0fed2d5e2 --- /dev/null +++ b/engine/src/test/jme3test/network/MovingAverage.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2009-2010 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package jme3test.network; + +@Deprecated +public class MovingAverage { + + private long[] samples; + private long sum; + private int count, index; + + public MovingAverage(int numSamples){ + samples = new long[numSamples]; + } + + public void add(long sample){ + sum = sum - samples[index] + sample; + samples[index++] = sample; + if (index > count){ + count = index; + } + if (index >= samples.length){ + index = 0; + } + } + + public long getAverage(){ + if (count == 0) + return 0; + else + return (long) ((float) sum / (float) count); + } + +} \ No newline at end of file diff --git a/engine/src/test/jme3test/network/TestLatency.java b/engine/src/test/jme3test/network/TestLatency.java index 83db7003e..460b327f2 100644 --- a/engine/src/test/jme3test/network/TestLatency.java +++ b/engine/src/test/jme3test/network/TestLatency.java @@ -32,6 +32,7 @@ package jme3test.network; +import com.jme3.network.AbstractMessage; import com.jme3.network.Client; import com.jme3.network.HostedConnection; import com.jme3.network.MessageListener; @@ -40,7 +41,6 @@ import com.jme3.network.Server; import com.jme3.network.Message; import com.jme3.network.serializing.Serializable; import com.jme3.network.serializing.Serializer; -import com.jme3.network.sync.MovingAverage; import java.io.IOException; public class TestLatency { @@ -58,7 +58,7 @@ public class TestLatency { } @Serializable - public static class TimestampMessage extends com.jme3.network.message.Message { + public static class TimestampMessage extends AbstractMessage { long timeSent = 0; long timeReceived = 0;