Cambiado paquete de utils a iis

utils/src/es/ull/isaatc/function/BetaLimitedVariate.java → 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 {
 

utils/src/es/ull/isaatc/function/ConstantFunction.java → 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;

utils/src/es/ull/isaatc/function/LinearFunction.java → utils/src/es/ull/iis/function/LinearFunction.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package es.ull.isaatc.function;
+package es.ull.iis.function;
 
 
 /**

utils/src/es/ull/isaatc/function/NextHighFunction.java → 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) {

utils/src/es/ull/isaatc/function/PeriodicProportionFunction.java → 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<Integer> elem, Collection<Double> 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) {

utils/src/es/ull/isaatc/function/PolynomialFunction.java → 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;
 

utils/src/es/ull/isaatc/function/RandomFunction.java → 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();

utils/src/es/ull/isaatc/function/RoundFunction.java → 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) {

utils/src/es/ull/isaatc/function/TimeFunction.java → 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.

utils/src/es/ull/isaatc/function/TimeFunctionFactory.java → 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<String>();
-        searchPackages.add("es.ull.isaatc.function");
+        searchPackages.add("es.ull.iis.function");
         cache = new WeakHashMap<String, Class<?>>();
 	}
 
@@ -131,7 +131,7 @@ public static Set<String> 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; }

utils/src/es/ull/isaatc/function/UniformlyDistributedSplitFunction.java → 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) {

utils/src/es/ull/isaatc/function/package-info.java → 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;
+package es.ull.iis.function;

utils/src/es/ull/isaatc/test/CycleTest.java → 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

utils/src/es/ull/isaatc/test/TestClassCreation.java → 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<MyIntegerObject> {

utils/src/es/ull/isaatc/test/TestEvents.java → 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;

utils/src/es/ull/isaatc/test/TestHash.java → 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;
 

utils/src/es/ull/isaatc/test/TestLists.java → 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;

utils/src/es/ull/isaatc/test/TestSimKitRandom.java → 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.*;

utils/src/es/ull/isaatc/test/TestStupidMethod.java → 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

utils/src/es/ull/isaatc/util/ClassPathHacker.java → 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;

utils/src/es/ull/isaatc/util/Cycle.java → 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. <p>

utils/src/es/ull/isaatc/util/CycleIterator.java → 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

utils/src/es/ull/isaatc/util/DiscreteCycleIterator.java → 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

utils/src/es/ull/isaatc/util/ExcelTools.java → 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;

utils/src/es/ull/isaatc/util/ExtendedMath.java → 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. 

utils/src/es/ull/isaatc/util/Output.java → 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.*;
 

utils/src/es/ull/isaatc/util/PeriodicCycle.java → 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) {

utils/src/es/ull/isaatc/util/Prioritizable.java → 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.

utils/src/es/ull/isaatc/util/PrioritizedMap.java → 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;

utils/src/es/ull/isaatc/util/PrioritizedTable.java → 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;