Commit 53843b97 authored by Eduardo Varas Gandara's avatar Eduardo Varas Gandara
Browse files

Lectura por config.props

Se ha añadido la colocación de personas y de emergencia(fuego) desde el
fichero de configuración. Además se han añadido ciertos comportamientos,
auneque esa parte esta incompleta.
parents
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/abbot.jar"/>
<classpathentry kind="lib" path="lib/annas-01-12-10.jar"/>
<classpathentry kind="lib" path="lib/AppleJavaExtensions.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.0.jar"/>
<classpathentry kind="lib" path="lib/DistLib.jar"/>
<classpathentry kind="lib" path="lib/flanagan.jar"/>
<classpathentry kind="lib" path="lib/freehep-vectorgraphics-svg-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/gnu-regexp-1.1.0.jar"/>
<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/javacsv.jar"/>
<classpathentry kind="lib" path="lib/jcommon-1.0.16.jar"/>
<classpathentry kind="lib" path="lib/jdepend-2.9.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.0.jar"/>
<classpathentry kind="lib" path="lib/jena-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/jfreechart-1.0.13.jar"/>
<classpathentry kind="lib" path="lib/jmf.jar"/>
<classpathentry kind="lib" path="lib/jnlp.jar"/>
<classpathentry kind="lib" path="lib/JRI.jar"/>
<classpathentry kind="lib" path="lib/jts-1.12.jar"/>
<classpathentry kind="lib" path="lib/Loader3DS1_2u.jar"/>
<classpathentry kind="lib" path="lib/mason.16.jar"/>
<classpathentry kind="lib" path="lib/ocpClient.jar"/>
<classpathentry kind="lib" path="lib/ocpCore.jar"/>
<classpathentry kind="lib" path="lib/profile.jar"/>
<classpathentry kind="lib" path="lib/slick.jar"/>
<classpathentry kind="lib" path="lib/sunflow-0.07.3g.jar"/>
<classpathentry kind="lib" path="lib/UbikEditor.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
# Auto detect text files and perform LF normalization
* text=auto
# Custom for Visual Studio
*.cs diff=csharp
# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
build/
dist/
# Package Files #
#*.jar
#*.war
#*.ear
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>UbikSim2</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
This diff is collapsed.
## UbikSim
UbikSim has been developed by:
* Juan A. Bota , juanbot [at] um.es
* Pablo Campillo, pablocampillo [at] um.es
* Francisco Campuzano, fjcampuzano [at] um.es
* Emilio Serrano, emilioserra [at] dit.upm.es
The authors belong to the University of Murcia and the Technical University of Madrid
Contact and UbikSim project here: [https://github.com/emilioserra/UbikSim/wiki](https://github.com/emilioserra/UbikSim/wiki)
UbikSim has been developed by:
* Juan A. Bota , juanbot[at] um.es
* Pablo Campillo, pablocampillo[at] um.es
* Francisco Campuzano, fjcampuzano[at] um.es
* Emilio Serrano, emilioserra [at] dit.upm.es
The authors belong to the University of Murcia and the Technical University of Madrid
Contact: https://github.com/emilioserra/UbikSim/wiki
This file is part of UbikSimIDE.
UbikSimIDE is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
UbikSimIDE is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with UbikSimIDE. If not, see <http://www.gnu.org/licenses/>
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="UbikSim2" default="default" basedir=".">
<description>Builds, tests, and runs the project UbikSim2.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="UbikSim2-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
#Configuracion de UbikSim
# Modo de vision, 3 valores: "0D","2D","3D"
mode=3D
#Tamaño de la celda en centimetros
cellSize=30
# Lista deficheros de cada planta separados por comas, e.j., "floors=f0.sh3d,f1.sh3d,f2.sh3d"
floors=./environments/EtsitEdificioBPlantaBaja.ubiksim
# Valor de la semilla para la simulacion, valores: "random" o un numero.
seed=2
# url o ip donde esta corriendo OCP, para ejecuciones sin entorno OSGi
# ipOCP=localhost
ocp=off
#mobileIP=192.168.1.21
#mobilePort=9278
initialDate=2012-01-01 00:00:00
# perspectiva de la camara 1 primera persona, 0 vista aerea.
cameraMode=0
#Valores iniciales de emergencia
xfire=60
yfire=50
sizefire=1
speedfire=1
delayfire=100
#Personas:
pospeople=/30,30/50,50/60,60/70,70/
# nombre del personaje que se quiere controlar con el teclado
#keyboardControlled=Paula
#Integracion con Prodia
prodia=off
\ No newline at end of file
<center><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">EtsitEdificioBPlantaBaja.ubiksim for UbikSim</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.gsi.dit.upm.es/" property="cc:attributionName" rel="cc:attributionURL">Emilio Serrano</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License.</a>
<p>It represents a floor of the ETSIT building at the Technical University of Madrid<p></center>
\ No newline at end of file
<center><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">mapExample.ubiksim for UbikSim</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.gsi.dit.upm.es/" property="cc:attributionName" rel="cc:attributionURL">Daniel Lara and Emilio Serrano</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License.</a>
<p>It represents a floor of the CeDInt building at the Technical University of Madrid<p></center>
\ No newline at end of file
<center><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">primeraPlantaUMU_DIIC.ubiksim for UbikSim</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.gsi.dit.upm.es/" property="cc:attributionName" rel="cc:attributionURL">Francisco Campuzano and Juan Bota</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License.</a>
<p>It represents a floor of the computer sciences faculty at the University of Murcia<p></center>
</center>.
\ No newline at end of file
<center><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">twoRooms.ubiksim for UbikSim</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.gsi.dit.upm.es/" property="cc:attributionName" rel="cc:attributionURL">Emilio Serrano and Juan Bota</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a></center>.
\ No newline at end of file
AirCond
AndroidMobile
DoorSensor
Mobile
PC
PresenceSensor
PressureSensor
RFIDAntenna
RFIDTag
RQTag
SlaveBluetooth
TV
Thermometer
TV unit
Bed
Chair
Stairs
Door
Assistant
Attended
DisabledElder
ElderResident
Fireman
Mama
MyAttended
Teacher
TestPerson
Worker
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment