From d6b9a24a1d3e9252ea09a46fde3e0266d286912d Mon Sep 17 00:00:00 2001
From: multi <multi@DURANROG>
Date: Mon, 6 Jun 2022 08:10:02 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
README.md
---
.../Duran/ExampleSimulationProgramDuran.java | 13 ++-----------
.../Duran/ExampleTrackInterpolationDuran.java | 16 +---------------
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleSimulationProgramDuran.java b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleSimulationProgramDuran.java
index a602e022b8..73b08e190d 100644
--- a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleSimulationProgramDuran.java
+++ b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleSimulationProgramDuran.java
@@ -1,8 +1,4 @@
-/**
- * Copyright (c) 2008-2022, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- * @author brutzman@nps.edu
- */
+
package MV3500Cohort2022MayJune.homework2.Duran;
import edu.nps.moves.dis7.entities.swe.platform.surface._001Poseidon;
@@ -20,12 +16,7 @@ import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-/** The purpose of this inheritable class is to provide an easily modifiable example simulation program
- * that includes DIS-capable entities performing tasks of interest, and then reporting activity via PDUs
- * to the network.
- * Default program initialization includes PDU recording turned on by default.
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt">ExampleSimulationProgramLog.txt</a>
- */
+
public class ExampleSimulationProgramDuran
{
private boolean verboseComments = true;
diff --git a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleTrackInterpolationDuran.java b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleTrackInterpolationDuran.java
index 302adbc7b7..c2a9b54dde 100644
--- a/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleTrackInterpolationDuran.java
+++ b/assignments/src/MV3500Cohort2022MayJune/homework2/Duran/ExampleTrackInterpolationDuran.java
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) 2008-2022, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- *
- * @author brutzman@nps.edu
- */
+
package MV3500Cohort2022MayJune.homework2.Duran;
import edu.nps.moves.dis7.entities.swe.platform.surface._001Poseidon;
@@ -18,15 +13,6 @@ import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-/**
- * The purpose of this program is to provide an easily modifiable example
- * simulation for networked entity tracks and presentation, including
- * DIS-capable entities doing tasks and reporting them to the network.
- * Default settings include PDU recording turned on by default.
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleTrackInterpolationLog.txt">ExampleTrackInterpolationLog.txt</a>
- * @see <a href="https://calhoun.nps.edu/handle/10945/65436">REPEATABLE UNIT TESTING OF DISTRIBUTED INTERACTIVE SIMULATION (DIS) PROTOCOL BEHAVIOR STREAMS USING WEB STANDARDS</a> by Tobias Brennenstuhl, Masters Thesis, Naval Postgraduate School (NPS), June 2020
- * @see <a href="https://gitlab.nps.edu/Savage/SavageTheses/-/tree/master/BrennenstuhlTobias">https://gitlab.nps.edu/Savage/SavageTheses/-/tree/master/BrennenstuhlTobias</a>
- */
public class ExampleTrackInterpolationDuran extends ExampleSimulationProgramDuran
{
// -------------------- Begin Variables for X3D autogenerated code
--
GitLab