X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b558f9b18c938af6a35ebea66ac2323a60178202..517da9a5c42ae0d436928cc2e985063ab0cceea4:/examples/java/bittorrent/Connection.java

diff --git a/examples/java/bittorrent/Connection.java b/examples/java/bittorrent/Connection.java
index f0a33391a0..ff15fd34a1 100644
--- a/examples/java/bittorrent/Connection.java
+++ b/examples/java/bittorrent/Connection.java
@@ -1,78 +1,44 @@
-/*
- * Copyright 2006-2012. The SimGrid Team. All rights reserved. 
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. 
- */
-package bittorrent;
+/* Copyright (c) 2006-2014, 2016. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
+package bittorrent;
 import java.util.Arrays;
-import org.simgrid.msg.Msg;
+
 public class Connection {
-	/**
-	 * Remote peer id
-	 */
-	public int id;
-	/**
-	 * Remote peer bitfield.
-	 */
-	public char bitfield[];
-	/**
-	 * Remote peer mailbox
-	 */
-	public String mailbox;
-	/**
-	 * Indicates if we are interested in something this peer has
-	 */
-	public boolean amInterested = false;
-	/**
-	 * Indicates if the peer is interested in one of our pieces
-	 */
-	public boolean interested = false;
-	/**
-	 * Indicates if the peer is choked for the current peer
-	 */
-	public boolean chokedUpload = true;
-	/**
-	 * Indicates if the peer has choked the current peer
-	 */
-	public boolean chokedDownload = true;
-	/**
-	 * Number of messages we have received from the peer
-	 */
-	public int messagesCount = 0;
-	/**
-	 * Peer speed.
-	 */
-	public double peerSpeed = 0;
-	/**
-	 * Last time the peer was unchoked
-	 */
-	public double lastUnchoke = 0;
-	/**
-	 * Constructor
-	 */
-	public Connection(int id) {
-		this.id = id;
-		this.mailbox = Integer.toString(id);
-	}
-	/**
-	 * Add a new value to the peer speed average
-	 */
-	public void addSpeedValue(double speed) {
-		peerSpeed = peerSpeed * 0.55 + speed * 0.45;
-		//		peerSpeed = (peerSpeed * messagesCount + speed) / (++messagesCount);		
-	}
-		
-	@Override
-	public String toString() {
-		return "Connection [id=" + id + ", bitfield="
-				+ Arrays.toString(bitfield) + ", mailbox=" + mailbox
-				+ ", amInterested=" + amInterested + ", interested="
-				+ interested + ", chokedUpload=" + chokedUpload
-				+ ", chokedDownload=" + chokedDownload + "]";
-	}
-	
-	
+  public int id;
+  public char bitfield[];
+  public String mailbox;
+  // Indicates if we are interested in something this peer has
+  public boolean amInterested = false;
+  // Indicates if the peer is interested in one of our pieces
+  public boolean interested = false;
+  // Indicates if the peer is choked for the current peer
+  public boolean chokedUpload = true;
+  // Indicates if the peer has choked the current peer
+  public boolean chokedDownload = true;
+  // Number of messages we have received from the peer
+  public int messagesCount = 0;
+  public double peerSpeed = 0;
+  public double lastUnchoke = 0;
+
+  public Connection(int id) {
+    this.id = id;
+    this.mailbox = Integer.toString(id);
+  }
+
+  // Add a new value to the peer speed average
+  public void addSpeedValue(double speed) {
+    peerSpeed = peerSpeed * 0.55 + speed * 0.45;
+    // peerSpeed = (peerSpeed * messagesCount + speed) / (++messagesCount);    
+  }
+
+  @Override
+  public String toString() {
+    return "Connection [id=" + id + ", bitfield=" + Arrays.toString(bitfield) + ", mailbox=" + mailbox
+        + ", amInterested=" + amInterested + ", interested=" + interested + ", chokedUpload=" + chokedUpload
+        + ", chokedDownload=" + chokedDownload + "]";
+  }
 }
- 
\ No newline at end of file