From 8e766476bf93d444f07aadf0554b8aace46c468a Mon Sep 17 00:00:00 2001 From: icasrod Date: Tue, 23 Feb 2016 19:31:57 +0000 Subject: [PATCH] Cambiado paquete de utils a iis --- .../function/BetaLimitedVariate.java | 4 ++-- .../function/ConstantFunction.java | 4 ++-- .../{isaatc => iis}/function/LinearFunction.java | 2 +- .../function/NextHighFunction.java | 6 +++--- .../function/PeriodicProportionFunction.java | 6 +++--- .../function/PolynomialFunction.java | 2 +- .../{isaatc => iis}/function/RandomFunction.java | 4 ++-- .../{isaatc => iis}/function/RoundFunction.java | 8 ++++---- .../{isaatc => iis}/function/TimeFunction.java | 2 +- .../function/TimeFunctionFactory.java | 8 ++++---- .../UniformlyDistributedSplitFunction.java | 6 +++--- .../{isaatc => iis}/function/package-info.java | 4 ++-- .../es/ull/{isaatc => iis}/test/CycleTest.java | 16 ++++++++-------- .../{isaatc => iis}/test/TestClassCreation.java | 2 +- .../es/ull/{isaatc => iis}/test/TestEvents.java | 2 +- .../es/ull/{isaatc => iis}/test/TestHash.java | 2 +- .../es/ull/{isaatc => iis}/test/TestLists.java | 2 +- .../{isaatc => iis}/test/TestSimKitRandom.java | 2 +- .../{isaatc => iis}/test/TestStupidMethod.java | 2 +- utils/src/es/ull/{isaatc => iis}/util/.nbattrs | 0 .../{isaatc => iis}/util/ClassPathHacker.java | 2 +- utils/src/es/ull/{isaatc => iis}/util/Cycle.java | 2 +- .../ull/{isaatc => iis}/util/CycleIterator.java | 2 +- .../util/DiscreteCycleIterator.java | 2 +- .../es/ull/{isaatc => iis}/util/ExcelTools.java | 2 +- .../ull/{isaatc => iis}/util/ExtendedMath.java | 2 +- .../src/es/ull/{isaatc => iis}/util/Output.java | 2 +- .../ull/{isaatc => iis}/util/PeriodicCycle.java | 6 +++--- .../ull/{isaatc => iis}/util/Prioritizable.java | 2 +- .../ull/{isaatc => iis}/util/PrioritizedMap.java | 2 +- .../{isaatc => iis}/util/PrioritizedTable.java | 2 +- .../{isaatc => iis}/util/RandomPermutation.java | 2 +- .../util/RoundedPeriodicCycle.java | 4 ++-- .../{isaatc => iis}/util/SingleThreadPool.java | 2 +- .../{isaatc => iis}/util/StandardThreadPool.java | 2 +- .../es/ull/{isaatc => iis}/util/Statistics.java | 2 +- .../es/ull/{isaatc => iis}/util/TableCycle.java | 4 ++-- .../es/ull/{isaatc => iis}/util/ThreadPool.java | 2 +- .../util/WeeklyPeriodicCycle.java | 4 ++-- utils/src/es/ull/iis/util/package-info.java | 7 +++++++ utils/src/es/ull/isaatc/util/package-info.java | 7 ------- 41 files changed, 73 insertions(+), 73 deletions(-) rename utils/src/es/ull/{isaatc => iis}/function/BetaLimitedVariate.java (90%) rename utils/src/es/ull/{isaatc => iis}/function/ConstantFunction.java (85%) rename utils/src/es/ull/{isaatc => iis}/function/LinearFunction.java (94%) rename utils/src/es/ull/{isaatc => iis}/function/NextHighFunction.java (88%) rename utils/src/es/ull/{isaatc => iis}/function/PeriodicProportionFunction.java (90%) rename utils/src/es/ull/{isaatc => iis}/function/PolynomialFunction.java (94%) rename utils/src/es/ull/{isaatc => iis}/function/RandomFunction.java (84%) rename utils/src/es/ull/{isaatc => iis}/function/RoundFunction.java (88%) rename utils/src/es/ull/{isaatc => iis}/function/TimeFunction.java (94%) rename utils/src/es/ull/{isaatc => iis}/function/TimeFunctionFactory.java (93%) rename utils/src/es/ull/{isaatc => iis}/function/UniformlyDistributedSplitFunction.java (87%) rename utils/src/es/ull/{isaatc => iis}/function/package-info.java (68%) rename utils/src/es/ull/{isaatc => iis}/test/CycleTest.java (95%) rename utils/src/es/ull/{isaatc => iis}/test/TestClassCreation.java (93%) rename utils/src/es/ull/{isaatc => iis}/test/TestEvents.java (90%) rename utils/src/es/ull/{isaatc => iis}/test/TestHash.java (94%) rename utils/src/es/ull/{isaatc => iis}/test/TestLists.java (96%) rename utils/src/es/ull/{isaatc => iis}/test/TestSimKitRandom.java (99%) rename utils/src/es/ull/{isaatc => iis}/test/TestStupidMethod.java (92%) rename utils/src/es/ull/{isaatc => iis}/util/.nbattrs (100%) rename utils/src/es/ull/{isaatc => iis}/util/ClassPathHacker.java (93%) rename utils/src/es/ull/{isaatc => iis}/util/Cycle.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/CycleIterator.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/DiscreteCycleIterator.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/ExcelTools.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/ExtendedMath.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/Output.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/PeriodicCycle.java (94%) rename utils/src/es/ull/{isaatc => iis}/util/Prioritizable.java (92%) rename utils/src/es/ull/{isaatc => iis}/util/PrioritizedMap.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/PrioritizedTable.java (99%) rename utils/src/es/ull/{isaatc => iis}/util/RandomPermutation.java (90%) rename utils/src/es/ull/{isaatc => iis}/util/RoundedPeriodicCycle.java (96%) rename utils/src/es/ull/{isaatc => iis}/util/SingleThreadPool.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/StandardThreadPool.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/Statistics.java (95%) rename utils/src/es/ull/{isaatc => iis}/util/TableCycle.java (93%) rename utils/src/es/ull/{isaatc => iis}/util/ThreadPool.java (92%) rename utils/src/es/ull/{isaatc => iis}/util/WeeklyPeriodicCycle.java (93%) create mode 100644 utils/src/es/ull/iis/util/package-info.java delete mode 100644 utils/src/es/ull/isaatc/util/package-info.java diff --git a/utils/src/es/ull/isaatc/function/BetaLimitedVariate.java b/utils/src/es/ull/iis/function/BetaLimitedVariate.java similarity index 90% rename from utils/src/es/ull/isaatc/function/BetaLimitedVariate.java rename to utils/src/es/ull/iis/function/BetaLimitedVariate.java index 1e683066..c5447a02 100644 --- a/utils/src/es/ull/isaatc/function/BetaLimitedVariate.java +++ b/utils/src/es/ull/iis/function/BetaLimitedVariate.java @@ -1,7 +1,7 @@ -package es.ull.isaatc.function; +package es.ull.iis.function; +import es.ull.iis.function.TimeFunction; import simkit.random.BetaVariate; -import es.ull.isaatc.function.TimeFunction; public class BetaLimitedVariate extends TimeFunction { diff --git a/utils/src/es/ull/isaatc/function/ConstantFunction.java b/utils/src/es/ull/iis/function/ConstantFunction.java similarity index 85% rename from utils/src/es/ull/isaatc/function/ConstantFunction.java rename to utils/src/es/ull/iis/function/ConstantFunction.java index 0c832224..015126f6 100644 --- a/utils/src/es/ull/isaatc/function/ConstantFunction.java +++ b/utils/src/es/ull/iis/function/ConstantFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; /** * A constant value wrapped by a time function. @@ -29,7 +29,7 @@ public void setValue(double val) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#getValue(double) + * @see es.ull.iis.function.TimeFunction#getValue(double) */ public double getValue(double ts) { return val; diff --git a/utils/src/es/ull/isaatc/function/LinearFunction.java b/utils/src/es/ull/iis/function/LinearFunction.java similarity index 94% rename from utils/src/es/ull/isaatc/function/LinearFunction.java rename to utils/src/es/ull/iis/function/LinearFunction.java index 047f0070..490d8885 100644 --- a/utils/src/es/ull/isaatc/function/LinearFunction.java +++ b/utils/src/es/ull/iis/function/LinearFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; /** diff --git a/utils/src/es/ull/isaatc/function/NextHighFunction.java b/utils/src/es/ull/iis/function/NextHighFunction.java similarity index 88% rename from utils/src/es/ull/isaatc/function/NextHighFunction.java rename to utils/src/es/ull/iis/function/NextHighFunction.java index c8ed341f..5cb97c90 100644 --- a/utils/src/es/ull/isaatc/function/NextHighFunction.java +++ b/utils/src/es/ull/iis/function/NextHighFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; /** @@ -32,7 +32,7 @@ public NextHighFunction(TimeFunction func, double scale, double shift) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#getValue(double) + * @see es.ull.iis.function.TimeFunction#getValue(double) */ @Override public double getValue(double ts) { @@ -42,7 +42,7 @@ public double getValue(double ts) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#setParameters(java.lang.Object[]) + * @see es.ull.iis.function.TimeFunction#setParameters(java.lang.Object[]) */ @Override public void setParameters(Object... params) { diff --git a/utils/src/es/ull/isaatc/function/PeriodicProportionFunction.java b/utils/src/es/ull/iis/function/PeriodicProportionFunction.java similarity index 90% rename from utils/src/es/ull/isaatc/function/PeriodicProportionFunction.java rename to utils/src/es/ull/iis/function/PeriodicProportionFunction.java index 2c76147e..b0391b52 100644 --- a/utils/src/es/ull/isaatc/function/PeriodicProportionFunction.java +++ b/utils/src/es/ull/iis/function/PeriodicProportionFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; import java.util.Collection; @@ -54,7 +54,7 @@ public PeriodicProportionFunction(Collection elem, Collection p } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#getValue(double) + * @see es.ull.iis.function.TimeFunction#getValue(double) */ @Override public double getValue(double ts) { @@ -65,7 +65,7 @@ public double getValue(double ts) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#setParameters(java.lang.Object[]) + * @see es.ull.iis.function.TimeFunction#setParameters(java.lang.Object[]) */ @Override public void setParameters(Object... params) { diff --git a/utils/src/es/ull/isaatc/function/PolynomialFunction.java b/utils/src/es/ull/iis/function/PolynomialFunction.java similarity index 94% rename from utils/src/es/ull/isaatc/function/PolynomialFunction.java rename to utils/src/es/ull/iis/function/PolynomialFunction.java index 59215e60..0ab4dce7 100644 --- a/utils/src/es/ull/isaatc/function/PolynomialFunction.java +++ b/utils/src/es/ull/iis/function/PolynomialFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; import simkit.random.RandomVariateFactory; diff --git a/utils/src/es/ull/isaatc/function/RandomFunction.java b/utils/src/es/ull/iis/function/RandomFunction.java similarity index 84% rename from utils/src/es/ull/isaatc/function/RandomFunction.java rename to utils/src/es/ull/iis/function/RandomFunction.java index ef514382..9e64326f 100644 --- a/utils/src/es/ull/isaatc/function/RandomFunction.java +++ b/utils/src/es/ull/iis/function/RandomFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; import simkit.random.RandomVariate; @@ -42,7 +42,7 @@ public void setRandom(RandomVariate rnd) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#getValue(double) + * @see es.ull.iis.function.TimeFunction#getValue(double) */ public double getValue(double ts) { return rnd.generate(); diff --git a/utils/src/es/ull/isaatc/function/RoundFunction.java b/utils/src/es/ull/iis/function/RoundFunction.java similarity index 88% rename from utils/src/es/ull/isaatc/function/RoundFunction.java rename to utils/src/es/ull/iis/function/RoundFunction.java index e9cf2540..8726c7a0 100644 --- a/utils/src/es/ull/isaatc/function/RoundFunction.java +++ b/utils/src/es/ull/iis/function/RoundFunction.java @@ -1,6 +1,6 @@ -package es.ull.isaatc.function; +package es.ull.iis.function; -import es.ull.isaatc.util.ExtendedMath; +import es.ull.iis.util.ExtendedMath; /** @@ -38,7 +38,7 @@ public RoundFunction(Type type, TimeFunction func, double scale, double shift) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#getValue(double) + * @see es.ull.iis.function.TimeFunction#getValue(double) */ @Override public double getValue(double ts) { @@ -61,7 +61,7 @@ public double getValue(double ts) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#setParameters(java.lang.Object[]) + * @see es.ull.iis.function.TimeFunction#setParameters(java.lang.Object[]) */ @Override public void setParameters(Object... params) { diff --git a/utils/src/es/ull/isaatc/function/TimeFunction.java b/utils/src/es/ull/iis/function/TimeFunction.java similarity index 94% rename from utils/src/es/ull/isaatc/function/TimeFunction.java rename to utils/src/es/ull/iis/function/TimeFunction.java index 7efba2ee..e71cb0ee 100644 --- a/utils/src/es/ull/isaatc/function/TimeFunction.java +++ b/utils/src/es/ull/iis/function/TimeFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; /** * An abstract class to return values corresponding to a specified function, which can depend on time. diff --git a/utils/src/es/ull/isaatc/function/TimeFunctionFactory.java b/utils/src/es/ull/iis/function/TimeFunctionFactory.java similarity index 93% rename from utils/src/es/ull/isaatc/function/TimeFunctionFactory.java rename to utils/src/es/ull/iis/function/TimeFunctionFactory.java index ee470e3e..c97591dd 100644 --- a/utils/src/es/ull/isaatc/function/TimeFunctionFactory.java +++ b/utils/src/es/ull/iis/function/TimeFunctionFactory.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; import java.util.LinkedHashSet; import java.util.Map; @@ -54,7 +54,7 @@ public class TimeFunctionFactory { static { searchPackages = new LinkedHashSet(); - searchPackages.add("es.ull.isaatc.function"); + searchPackages.add("es.ull.iis.function"); cache = new WeakHashMap>(); } @@ -131,7 +131,7 @@ public static Set getSearchPackages() { /** * Finds the TimeFunction Class corresponding to the given name. First * attempts to find the TimeFunction assuming the the name is fully qualified. - * Then searches the "search packages." The search path defaults to "es.ull.isaatc.function" + * Then searches the "search packages." The search path defaults to "es.ull.iis.function" * but additional search packages can be added. * @see #addSearchPackage(String) * @see #setSearchPackages(Set) @@ -152,7 +152,7 @@ public static Class findFullyQualifiedNameFor(String className) { try { theClass = Thread.currentThread().getContextClassLoader().loadClass( searchPackage + "." + className ); - if (!es.ull.isaatc.function.TimeFunction.class.isAssignableFrom(theClass)) { + if (!es.ull.iis.function.TimeFunction.class.isAssignableFrom(theClass)) { continue; } } catch (ClassNotFoundException e) { continue; } diff --git a/utils/src/es/ull/isaatc/function/UniformlyDistributedSplitFunction.java b/utils/src/es/ull/iis/function/UniformlyDistributedSplitFunction.java similarity index 87% rename from utils/src/es/ull/isaatc/function/UniformlyDistributedSplitFunction.java rename to utils/src/es/ull/iis/function/UniformlyDistributedSplitFunction.java index f9d7fc1d..5aacaede 100644 --- a/utils/src/es/ull/isaatc/function/UniformlyDistributedSplitFunction.java +++ b/utils/src/es/ull/iis/function/UniformlyDistributedSplitFunction.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.function; +package es.ull.iis.function; /** * Defines a time function which consists of an array of other time functions. The time unit @@ -30,7 +30,7 @@ public UniformlyDistributedSplitFunction(TimeFunction[] part, double timeUnit) { /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#getValue(double) + * @see es.ull.iis.function.TimeFunction#getValue(double) */ @Override public double getValue(double ts) { @@ -40,7 +40,7 @@ public double getValue(double ts) { } /* (non-Javadoc) - * @see es.ull.isaatc.function.TimeFunction#setParameters(java.lang.Object[]) + * @see es.ull.iis.function.TimeFunction#setParameters(java.lang.Object[]) */ @Override public void setParameters(Object... params) { diff --git a/utils/src/es/ull/isaatc/function/package-info.java b/utils/src/es/ull/iis/function/package-info.java similarity index 68% rename from utils/src/es/ull/isaatc/function/package-info.java rename to utils/src/es/ull/iis/function/package-info.java index 740501c0..5e363d94 100644 --- a/utils/src/es/ull/isaatc/function/package-info.java +++ b/utils/src/es/ull/iis/function/package-info.java @@ -1,5 +1,5 @@ /** * Provides classes which can define time-depending functions. These functions are - * also used as wrappers for random number generators {@link es.ull.isaatc.function.RandomFunction}. + * also used as wrappers for random number generators {@link es.ull.iis.function.RandomFunction}. */ -package es.ull.isaatc.function; \ No newline at end of file +package es.ull.iis.function; \ No newline at end of file diff --git a/utils/src/es/ull/isaatc/test/CycleTest.java b/utils/src/es/ull/iis/test/CycleTest.java similarity index 95% rename from utils/src/es/ull/isaatc/test/CycleTest.java rename to utils/src/es/ull/iis/test/CycleTest.java index 7ea6c6f5..7fac05d5 100644 --- a/utils/src/es/ull/isaatc/test/CycleTest.java +++ b/utils/src/es/ull/iis/test/CycleTest.java @@ -1,15 +1,15 @@ /** * */ -package es.ull.isaatc.test; +package es.ull.iis.test; -import es.ull.isaatc.function.TimeFunctionFactory; -import es.ull.isaatc.util.Cycle; -import es.ull.isaatc.util.CycleIterator; -import es.ull.isaatc.util.PeriodicCycle; -import es.ull.isaatc.util.RoundedPeriodicCycle; -import es.ull.isaatc.util.TableCycle; -import es.ull.isaatc.util.WeeklyPeriodicCycle; +import es.ull.iis.function.TimeFunctionFactory; +import es.ull.iis.util.Cycle; +import es.ull.iis.util.CycleIterator; +import es.ull.iis.util.PeriodicCycle; +import es.ull.iis.util.RoundedPeriodicCycle; +import es.ull.iis.util.TableCycle; +import es.ull.iis.util.WeeklyPeriodicCycle; /** * Base model for testing diff --git a/utils/src/es/ull/isaatc/test/TestClassCreation.java b/utils/src/es/ull/iis/test/TestClassCreation.java similarity index 93% rename from utils/src/es/ull/isaatc/test/TestClassCreation.java rename to utils/src/es/ull/iis/test/TestClassCreation.java index 2287da26..75b3e67d 100644 --- a/utils/src/es/ull/isaatc/test/TestClassCreation.java +++ b/utils/src/es/ull/iis/test/TestClassCreation.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.test; +package es.ull.iis.test; class MyIntegerObject implements Comparable { diff --git a/utils/src/es/ull/isaatc/test/TestEvents.java b/utils/src/es/ull/iis/test/TestEvents.java similarity index 90% rename from utils/src/es/ull/isaatc/test/TestEvents.java rename to utils/src/es/ull/iis/test/TestEvents.java index 54a2f24d..a7a9756f 100644 --- a/utils/src/es/ull/isaatc/test/TestEvents.java +++ b/utils/src/es/ull/iis/test/TestEvents.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.test; +package es.ull.iis.test; import java.util.ArrayList; import java.util.EventListener; import java.util.EventObject; diff --git a/utils/src/es/ull/isaatc/test/TestHash.java b/utils/src/es/ull/iis/test/TestHash.java similarity index 94% rename from utils/src/es/ull/isaatc/test/TestHash.java rename to utils/src/es/ull/iis/test/TestHash.java index 94b316a1..e9804211 100644 --- a/utils/src/es/ull/isaatc/test/TestHash.java +++ b/utils/src/es/ull/iis/test/TestHash.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.test; +package es.ull.iis.test; import java.util.HashMap; import java.util.TreeMap; diff --git a/utils/src/es/ull/isaatc/test/TestLists.java b/utils/src/es/ull/iis/test/TestLists.java similarity index 96% rename from utils/src/es/ull/isaatc/test/TestLists.java rename to utils/src/es/ull/iis/test/TestLists.java index 865fca9a..dd06a61a 100644 --- a/utils/src/es/ull/isaatc/test/TestLists.java +++ b/utils/src/es/ull/iis/test/TestLists.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.test; +package es.ull.iis.test; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/utils/src/es/ull/isaatc/test/TestSimKitRandom.java b/utils/src/es/ull/iis/test/TestSimKitRandom.java similarity index 99% rename from utils/src/es/ull/isaatc/test/TestSimKitRandom.java rename to utils/src/es/ull/iis/test/TestSimKitRandom.java index c1b5002d..5172fc42 100644 --- a/utils/src/es/ull/isaatc/test/TestSimKitRandom.java +++ b/utils/src/es/ull/iis/test/TestSimKitRandom.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.test; +package es.ull.iis.test; import simkit.random.*; import java.io.*; diff --git a/utils/src/es/ull/isaatc/test/TestStupidMethod.java b/utils/src/es/ull/iis/test/TestStupidMethod.java similarity index 92% rename from utils/src/es/ull/isaatc/test/TestStupidMethod.java rename to utils/src/es/ull/iis/test/TestStupidMethod.java index 33eb8648..12be6dd2 100644 --- a/utils/src/es/ull/isaatc/test/TestStupidMethod.java +++ b/utils/src/es/ull/iis/test/TestStupidMethod.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.test; +package es.ull.iis.test; /** * @author Iv�n Castilla Rodr�guez diff --git a/utils/src/es/ull/isaatc/util/.nbattrs b/utils/src/es/ull/iis/util/.nbattrs similarity index 100% rename from utils/src/es/ull/isaatc/util/.nbattrs rename to utils/src/es/ull/iis/util/.nbattrs diff --git a/utils/src/es/ull/isaatc/util/ClassPathHacker.java b/utils/src/es/ull/iis/util/ClassPathHacker.java similarity index 93% rename from utils/src/es/ull/isaatc/util/ClassPathHacker.java rename to utils/src/es/ull/iis/util/ClassPathHacker.java index 19318d4f..399c35e2 100644 --- a/utils/src/es/ull/isaatc/util/ClassPathHacker.java +++ b/utils/src/es/ull/iis/util/ClassPathHacker.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.io.File; import java.io.IOException; diff --git a/utils/src/es/ull/isaatc/util/Cycle.java b/utils/src/es/ull/iis/util/Cycle.java similarity index 95% rename from utils/src/es/ull/isaatc/util/Cycle.java rename to utils/src/es/ull/iis/util/Cycle.java index 5310f60b..e63cf555 100644 --- a/utils/src/es/ull/isaatc/util/Cycle.java +++ b/utils/src/es/ull/iis/util/Cycle.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * Defines a repeated sequence of events.

diff --git a/utils/src/es/ull/isaatc/util/CycleIterator.java b/utils/src/es/ull/iis/util/CycleIterator.java similarity index 95% rename from utils/src/es/ull/isaatc/util/CycleIterator.java rename to utils/src/es/ull/iis/util/CycleIterator.java index 0da92b50..86e07527 100644 --- a/utils/src/es/ull/isaatc/util/CycleIterator.java +++ b/utils/src/es/ull/iis/util/CycleIterator.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * Allows to iterate over a cycle definition. The start and end timestamp of diff --git a/utils/src/es/ull/isaatc/util/DiscreteCycleIterator.java b/utils/src/es/ull/iis/util/DiscreteCycleIterator.java similarity index 95% rename from utils/src/es/ull/isaatc/util/DiscreteCycleIterator.java rename to utils/src/es/ull/iis/util/DiscreteCycleIterator.java index 56e030bf..4be22103 100644 --- a/utils/src/es/ull/isaatc/util/DiscreteCycleIterator.java +++ b/utils/src/es/ull/iis/util/DiscreteCycleIterator.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * Allows to iterate over a cycle definition. The start and end timestamp of diff --git a/utils/src/es/ull/isaatc/util/ExcelTools.java b/utils/src/es/ull/iis/util/ExcelTools.java similarity index 95% rename from utils/src/es/ull/isaatc/util/ExcelTools.java rename to utils/src/es/ull/iis/util/ExcelTools.java index 945a534f..93d8f199 100644 --- a/utils/src/es/ull/isaatc/util/ExcelTools.java +++ b/utils/src/es/ull/iis/util/ExcelTools.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; diff --git a/utils/src/es/ull/isaatc/util/ExtendedMath.java b/utils/src/es/ull/iis/util/ExtendedMath.java similarity index 95% rename from utils/src/es/ull/isaatc/util/ExtendedMath.java rename to utils/src/es/ull/iis/util/ExtendedMath.java index c2c3fe64..81321866 100644 --- a/utils/src/es/ull/isaatc/util/ExtendedMath.java +++ b/utils/src/es/ull/iis/util/ExtendedMath.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * A simple class which provides classes to perform some mathematical operations. diff --git a/utils/src/es/ull/isaatc/util/Output.java b/utils/src/es/ull/iis/util/Output.java similarity index 95% rename from utils/src/es/ull/isaatc/util/Output.java rename to utils/src/es/ull/iis/util/Output.java index 14c5fb87..69928a72 100644 --- a/utils/src/es/ull/isaatc/util/Output.java +++ b/utils/src/es/ull/iis/util/Output.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.io.*; diff --git a/utils/src/es/ull/isaatc/util/PeriodicCycle.java b/utils/src/es/ull/iis/util/PeriodicCycle.java similarity index 94% rename from utils/src/es/ull/isaatc/util/PeriodicCycle.java rename to utils/src/es/ull/iis/util/PeriodicCycle.java index 19d25264..75df84d7 100644 --- a/utils/src/es/ull/isaatc/util/PeriodicCycle.java +++ b/utils/src/es/ull/iis/util/PeriodicCycle.java @@ -1,6 +1,6 @@ -package es.ull.isaatc.util; +package es.ull.iis.util; -import es.ull.isaatc.function.TimeFunction; +import es.ull.iis.function.TimeFunction; /** * Defines a periodically repeated sequence of events. It can be defined in @@ -127,7 +127,7 @@ public String toString() { } /* (non-Javadoc) - * @see es.ull.isaatc.util.Cycle#getIteratorLevel(es.ull.isaatc.util.Cycle.CycleIterator, double, double) + * @see es.ull.iis.util.Cycle#getIteratorLevel(es.ull.iis.util.Cycle.CycleIterator, double, double) */ @Override protected IteratorLevel getIteratorLevel(double start, double end) { diff --git a/utils/src/es/ull/isaatc/util/Prioritizable.java b/utils/src/es/ull/iis/util/Prioritizable.java similarity index 92% rename from utils/src/es/ull/isaatc/util/Prioritizable.java rename to utils/src/es/ull/iis/util/Prioritizable.java index 84661f77..28b41117 100644 --- a/utils/src/es/ull/isaatc/util/Prioritizable.java +++ b/utils/src/es/ull/iis/util/Prioritizable.java @@ -4,7 +4,7 @@ * Created on 18 de noviembre de 2005, 10:47 */ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * A prioritizable object has a priority and can be used in a Prioritized Table. diff --git a/utils/src/es/ull/isaatc/util/PrioritizedMap.java b/utils/src/es/ull/iis/util/PrioritizedMap.java similarity index 95% rename from utils/src/es/ull/isaatc/util/PrioritizedMap.java rename to utils/src/es/ull/iis/util/PrioritizedMap.java index 9ae13390..fe95ee0d 100644 --- a/utils/src/es/ull/isaatc/util/PrioritizedMap.java +++ b/utils/src/es/ull/iis/util/PrioritizedMap.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.util.Collection; import java.util.Iterator; diff --git a/utils/src/es/ull/isaatc/util/PrioritizedTable.java b/utils/src/es/ull/iis/util/PrioritizedTable.java similarity index 99% rename from utils/src/es/ull/isaatc/util/PrioritizedTable.java rename to utils/src/es/ull/iis/util/PrioritizedTable.java index ae932fa4..15794035 100644 --- a/utils/src/es/ull/isaatc/util/PrioritizedTable.java +++ b/utils/src/es/ull/iis/util/PrioritizedTable.java @@ -1,5 +1,5 @@ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/utils/src/es/ull/isaatc/util/RandomPermutation.java b/utils/src/es/ull/iis/util/RandomPermutation.java similarity index 90% rename from utils/src/es/ull/isaatc/util/RandomPermutation.java rename to utils/src/es/ull/iis/util/RandomPermutation.java index 5903dd12..00f30db2 100644 --- a/utils/src/es/ull/isaatc/util/RandomPermutation.java +++ b/utils/src/es/ull/iis/util/RandomPermutation.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.util.Random; diff --git a/utils/src/es/ull/isaatc/util/RoundedPeriodicCycle.java b/utils/src/es/ull/iis/util/RoundedPeriodicCycle.java similarity index 96% rename from utils/src/es/ull/isaatc/util/RoundedPeriodicCycle.java rename to utils/src/es/ull/iis/util/RoundedPeriodicCycle.java index 4e07f141..6de66b36 100644 --- a/utils/src/es/ull/isaatc/util/RoundedPeriodicCycle.java +++ b/utils/src/es/ull/iis/util/RoundedPeriodicCycle.java @@ -1,9 +1,9 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; -import es.ull.isaatc.function.TimeFunction; +import es.ull.iis.function.TimeFunction; /** * An special periodic cycle which rounds (or trunks) the incidence of events. diff --git a/utils/src/es/ull/isaatc/util/SingleThreadPool.java b/utils/src/es/ull/iis/util/SingleThreadPool.java similarity index 95% rename from utils/src/es/ull/isaatc/util/SingleThreadPool.java rename to utils/src/es/ull/iis/util/SingleThreadPool.java index e51744c1..7764484f 100644 --- a/utils/src/es/ull/isaatc/util/SingleThreadPool.java +++ b/utils/src/es/ull/iis/util/SingleThreadPool.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.util.ArrayDeque; import java.util.concurrent.Semaphore; diff --git a/utils/src/es/ull/isaatc/util/StandardThreadPool.java b/utils/src/es/ull/iis/util/StandardThreadPool.java similarity index 95% rename from utils/src/es/ull/isaatc/util/StandardThreadPool.java rename to utils/src/es/ull/iis/util/StandardThreadPool.java index d389585d..de9372ab 100644 --- a/utils/src/es/ull/isaatc/util/StandardThreadPool.java +++ b/utils/src/es/ull/iis/util/StandardThreadPool.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.util.ArrayDeque; import java.util.concurrent.Semaphore; diff --git a/utils/src/es/ull/isaatc/util/Statistics.java b/utils/src/es/ull/iis/util/Statistics.java similarity index 95% rename from utils/src/es/ull/isaatc/util/Statistics.java rename to utils/src/es/ull/iis/util/Statistics.java index 8e162431..4673082c 100644 --- a/utils/src/es/ull/isaatc/util/Statistics.java +++ b/utils/src/es/ull/iis/util/Statistics.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * A simple package to get some basic statistics. diff --git a/utils/src/es/ull/isaatc/util/TableCycle.java b/utils/src/es/ull/iis/util/TableCycle.java similarity index 93% rename from utils/src/es/ull/isaatc/util/TableCycle.java rename to utils/src/es/ull/iis/util/TableCycle.java index 1037c29b..bf5d6793 100644 --- a/utils/src/es/ull/isaatc/util/TableCycle.java +++ b/utils/src/es/ull/iis/util/TableCycle.java @@ -1,7 +1,7 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; /** * Defines a set of timestamps when something happens. @@ -46,7 +46,7 @@ public String toString() { } /* (non-Javadoc) - * @see es.ull.isaatc.util.Cycle#getIteratorLevel(double, double) + * @see es.ull.iis.util.Cycle#getIteratorLevel(double, double) */ @Override protected IteratorLevel getIteratorLevel(double start, double end) { diff --git a/utils/src/es/ull/isaatc/util/ThreadPool.java b/utils/src/es/ull/iis/util/ThreadPool.java similarity index 92% rename from utils/src/es/ull/isaatc/util/ThreadPool.java rename to utils/src/es/ull/iis/util/ThreadPool.java index b05f9190..b27c69ea 100644 --- a/utils/src/es/ull/isaatc/util/ThreadPool.java +++ b/utils/src/es/ull/iis/util/ThreadPool.java @@ -1,4 +1,4 @@ -package es.ull.isaatc.util; +package es.ull.iis.util; /** diff --git a/utils/src/es/ull/isaatc/util/WeeklyPeriodicCycle.java b/utils/src/es/ull/iis/util/WeeklyPeriodicCycle.java similarity index 93% rename from utils/src/es/ull/isaatc/util/WeeklyPeriodicCycle.java rename to utils/src/es/ull/iis/util/WeeklyPeriodicCycle.java index 24aac505..68aab728 100644 --- a/utils/src/es/ull/isaatc/util/WeeklyPeriodicCycle.java +++ b/utils/src/es/ull/iis/util/WeeklyPeriodicCycle.java @@ -1,11 +1,11 @@ /** * */ -package es.ull.isaatc.util; +package es.ull.iis.util; import java.util.EnumSet; -import es.ull.isaatc.function.TimeFunctionFactory; +import es.ull.iis.function.TimeFunctionFactory; /** * A week-based periodic cycle which allows a user to define events happening diff --git a/utils/src/es/ull/iis/util/package-info.java b/utils/src/es/ull/iis/util/package-info.java new file mode 100644 index 00000000..1f4fea0e --- /dev/null +++ b/utils/src/es/ull/iis/util/package-info.java @@ -0,0 +1,7 @@ +/** + * Provides miscellaneous utility classes, such as simulation cycle management + * ({@link es.ull.iis.util.Cycle}, {@link es.ull.iis.util.CycleIterator}...), + * complex data structures ({@link es.ull.iis.util.PrioritizedMap}), and other utilities + * ({@link es.ull.iis.util.ClassPathHacker}, {@link es.ull.iis.util.RandomPermutation}). + */ +package es.ull.iis.util; \ No newline at end of file diff --git a/utils/src/es/ull/isaatc/util/package-info.java b/utils/src/es/ull/isaatc/util/package-info.java deleted file mode 100644 index 15591301..00000000 --- a/utils/src/es/ull/isaatc/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Provides miscellaneous utility classes, such as simulation cycle management - * ({@link es.ull.isaatc.util.Cycle}, {@link es.ull.isaatc.util.CycleIterator}...), - * complex data structures ({@link es.ull.isaatc.util.PrioritizedMap}), and other utilities - * ({@link es.ull.isaatc.util.ClassPathHacker}, {@link es.ull.isaatc.util.RandomPermutation}). - */ -package es.ull.isaatc.util; \ No newline at end of file