")
+
+ // inject the contents of the document in, removing the scripts
+ // to avoid any 'Permission Denied' errors in IE
+ .append( responseText.replace( rscript, "" ) )
+
+ // Locate the specified elements
+ .find( selector ) :
+
+ // If not, just inject the full result
+ responseText );
+
+ });
+
+ return this;
+};
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+ jQuery.fn[ o ] = function( f ){
+ return this.on( o, f );
+ };
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+ jQuery[ method ] = function( url, data, callback, type ) {
+ // shift arguments if data argument was omitted
+ if ( jQuery.isFunction( data ) ) {
+ type = type || callback;
+ callback = data;
+ data = undefined;
+ }
+
+ return jQuery.ajax({
+ type: method,
+ url: url,
+ data: data,
+ success: callback,
+ dataType: type
+ });
+ };
+});
+
+jQuery.extend({
+
+ getScript: function( url, callback ) {
+ return jQuery.get( url, undefined, callback, "script" );
+ },
+
+ getJSON: function( url, data, callback ) {
+ return jQuery.get( url, data, callback, "json" );
+ },
+
+ // Creates a full fledged settings object into target
+ // with both ajaxSettings and settings fields.
+ // If target is omitted, writes into ajaxSettings.
+ ajaxSetup: function( target, settings ) {
+ if ( settings ) {
+ // Building a settings object
+ ajaxExtend( target, jQuery.ajaxSettings );
+ } else {
+ // Extending ajaxSettings
+ settings = target;
+ target = jQuery.ajaxSettings;
+ }
+ ajaxExtend( target, settings );
+ return target;
+ },
+
+ ajaxSettings: {
+ url: ajaxLocation,
+ isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+ global: true,
+ type: "GET",
+ contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+ processData: true,
+ async: true,
+ /*
+ timeout: 0,
+ data: null,
+ dataType: null,
+ username: null,
+ password: null,
+ cache: null,
+ throws: false,
+ traditional: false,
+ headers: {},
+ */
+
+ accepts: {
+ xml: "application/xml, text/xml",
+ html: "text/html",
+ text: "text/plain",
+ json: "application/json, text/javascript",
+ "*": allTypes
+ },
+
+ contents: {
+ xml: /xml/,
+ html: /html/,
+ json: /json/
+ },
+
+ responseFields: {
+ xml: "responseXML",
+ text: "responseText"
+ },
+
+ // List of data converters
+ // 1) key format is "source_type destination_type" (a single space in-between)
+ // 2) the catchall symbol "*" can be used for source_type
+ converters: {
+
+ // Convert anything to text
+ "* text": window.String,
+
+ // Text to html (true = no transformation)
+ "text html": true,
+
+ // Evaluate text as a json expression
+ "text json": jQuery.parseJSON,
+
+ // Parse text as xml
+ "text xml": jQuery.parseXML
+ },
+
+ // For options that shouldn't be deep extended:
+ // you can add your own custom options here if
+ // and when you create one that shouldn't be
+ // deep extended (see ajaxExtend)
+ flatOptions: {
+ context: true,
+ url: true
+ }
+ },
+
+ ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+ ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+ // Main method
+ ajax: function( url, options ) {
+
+ // If url is an object, simulate pre-1.5 signature
+ if ( typeof url === "object" ) {
+ options = url;
+ url = undefined;
+ }
+
+ // Force options to be an object
+ options = options || {};
+
+ var // ifModified key
+ ifModifiedKey,
+ // Response headers
+ responseHeadersString,
+ responseHeaders,
+ // transport
+ transport,
+ // timeout handle
+ timeoutTimer,
+ // Cross-domain detection vars
+ parts,
+ // To know if global events are to be dispatched
+ fireGlobals,
+ // Loop variable
+ i,
+ // Create the final options object
+ s = jQuery.ajaxSetup( {}, options ),
+ // Callbacks context
+ callbackContext = s.context || s,
+ // Context for global events
+ // It's the callbackContext if one was provided in the options
+ // and if it's a DOM node or a jQuery collection
+ globalEventContext = callbackContext !== s &&
+ ( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+ jQuery( callbackContext ) : jQuery.event,
+ // Deferreds
+ deferred = jQuery.Deferred(),
+ completeDeferred = jQuery.Callbacks( "once memory" ),
+ // Status-dependent callbacks
+ statusCode = s.statusCode || {},
+ // Headers (they are sent all at once)
+ requestHeaders = {},
+ requestHeadersNames = {},
+ // The jqXHR state
+ state = 0,
+ // Default abort message
+ strAbort = "canceled",
+ // Fake xhr
+ jqXHR = {
+
+ readyState: 0,
+
+ // Caches the header
+ setRequestHeader: function( name, value ) {
+ if ( !state ) {
+ var lname = name.toLowerCase();
+ name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+ requestHeaders[ name ] = value;
+ }
+ return this;
+ },
+
+ // Raw string
+ getAllResponseHeaders: function() {
+ return state === 2 ? responseHeadersString : null;
+ },
+
+ // Builds headers hashtable if needed
+ getResponseHeader: function( key ) {
+ var match;
+ if ( state === 2 ) {
+ if ( !responseHeaders ) {
+ responseHeaders = {};
+ while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+ responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+ }
+ }
+ match = responseHeaders[ key.toLowerCase() ];
+ }
+ return match === undefined ? null : match;
+ },
+
+ // Overrides response content-type header
+ overrideMimeType: function( type ) {
+ if ( !state ) {
+ s.mimeType = type;
+ }
+ return this;
+ },
+
+ // Cancel the request
+ abort: function( statusText ) {
+ statusText = statusText || strAbort;
+ if ( transport ) {
+ transport.abort( statusText );
+ }
+ done( 0, statusText );
+ return this;
+ }
+ };
+
+ // Callback for when everything is done
+ // It is defined here because jslint complains if it is declared
+ // at the end of the function (which would be more logical and readable)
+ function done( status, nativeStatusText, responses, headers ) {
+ var isSuccess, success, error, response, modified,
+ statusText = nativeStatusText;
+
+ // Called once
+ if ( state === 2 ) {
+ return;
+ }
+
+ // State is "done" now
+ state = 2;
+
+ // Clear timeout if it exists
+ if ( timeoutTimer ) {
+ clearTimeout( timeoutTimer );
+ }
+
+ // Dereference transport for early garbage collection
+ // (no matter how long the jqXHR object will be used)
+ transport = undefined;
+
+ // Cache response headers
+ responseHeadersString = headers || "";
+
+ // Set readyState
+ jqXHR.readyState = status > 0 ? 4 : 0;
+
+ // Get response data
+ if ( responses ) {
+ response = ajaxHandleResponses( s, jqXHR, responses );
+ }
+
+ // If successful, handle type chaining
+ if ( status >= 200 && status < 300 || status === 304 ) {
+
+ // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+ if ( s.ifModified ) {
+
+ modified = jqXHR.getResponseHeader("Last-Modified");
+ if ( modified ) {
+ jQuery.lastModified[ ifModifiedKey ] = modified;
+ }
+ modified = jqXHR.getResponseHeader("Etag");
+ if ( modified ) {
+ jQuery.etag[ ifModifiedKey ] = modified;
+ }
+ }
+
+ // If not modified
+ if ( status === 304 ) {
+
+ statusText = "notmodified";
+ isSuccess = true;
+
+ // If we have data
+ } else {
+
+ isSuccess = ajaxConvert( s, response );
+ statusText = isSuccess.state;
+ success = isSuccess.data;
+ error = isSuccess.error;
+ isSuccess = !error;
+ }
+ } else {
+ // We extract error from statusText
+ // then normalize statusText and status for non-aborts
+ error = statusText;
+ if ( !statusText || status ) {
+ statusText = "error";
+ if ( status < 0 ) {
+ status = 0;
+ }
+ }
+ }
+
+ // Set data for the fake xhr object
+ jqXHR.status = status;
+ jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+ // Success/Error
+ if ( isSuccess ) {
+ deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+ } else {
+ deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+ }
+
+ // Status-dependent callbacks
+ jqXHR.statusCode( statusCode );
+ statusCode = undefined;
+
+ if ( fireGlobals ) {
+ globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+ [ jqXHR, s, isSuccess ? success : error ] );
+ }
+
+ // Complete
+ completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+ if ( fireGlobals ) {
+ globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+ // Handle the global AJAX counter
+ if ( !( --jQuery.active ) ) {
+ jQuery.event.trigger( "ajaxStop" );
+ }
+ }
+ }
+
+ // Attach deferreds
+ deferred.promise( jqXHR );
+ jqXHR.success = jqXHR.done;
+ jqXHR.error = jqXHR.fail;
+ jqXHR.complete = completeDeferred.add;
+
+ // Status-dependent callbacks
+ jqXHR.statusCode = function( map ) {
+ if ( map ) {
+ var tmp;
+ if ( state < 2 ) {
+ for ( tmp in map ) {
+ statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+ }
+ } else {
+ tmp = map[ jqXHR.status ];
+ jqXHR.always( tmp );
+ }
+ }
+ return this;
+ };
+
+ // Remove hash character (#7531: and string promotion)
+ // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+ // We also use the url parameter if available
+ s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+ // Extract dataTypes list
+ s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
+
+ // A cross-domain request is in order when we have a protocol:host:port mismatch
+ if ( s.crossDomain == null ) {
+ parts = rurl.exec( s.url.toLowerCase() );
+ s.crossDomain = !!( parts &&
+ ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+ ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+ ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+ );
+ }
+
+ // Convert data if not already a string
+ if ( s.data && s.processData && typeof s.data !== "string" ) {
+ s.data = jQuery.param( s.data, s.traditional );
+ }
+
+ // Apply prefilters
+ inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+ // If request was aborted inside a prefilter, stop there
+ if ( state === 2 ) {
+ return jqXHR;
+ }
+
+ // We can fire global events as of now if asked to
+ fireGlobals = s.global;
+
+ // Uppercase the type
+ s.type = s.type.toUpperCase();
+
+ // Determine if request has content
+ s.hasContent = !rnoContent.test( s.type );
+
+ // Watch for a new set of requests
+ if ( fireGlobals && jQuery.active++ === 0 ) {
+ jQuery.event.trigger( "ajaxStart" );
+ }
+
+ // More options handling for requests with no content
+ if ( !s.hasContent ) {
+
+ // If data is available, append data to url
+ if ( s.data ) {
+ s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+ // #9682: remove data so that it's not used in an eventual retry
+ delete s.data;
+ }
+
+ // Get ifModifiedKey before adding the anti-cache parameter
+ ifModifiedKey = s.url;
+
+ // Add anti-cache in url if needed
+ if ( s.cache === false ) {
+
+ var ts = jQuery.now(),
+ // try replacing _= if it is there
+ ret = s.url.replace( rts, "$1_=" + ts );
+
+ // if nothing was replaced, add timestamp to the end
+ s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+ }
+ }
+
+ // Set the correct header, if data is being sent
+ if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+ jqXHR.setRequestHeader( "Content-Type", s.contentType );
+ }
+
+ // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+ if ( s.ifModified ) {
+ ifModifiedKey = ifModifiedKey || s.url;
+ if ( jQuery.lastModified[ ifModifiedKey ] ) {
+ jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+ }
+ if ( jQuery.etag[ ifModifiedKey ] ) {
+ jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+ }
+ }
+
+ // Set the Accepts header for the server, depending on the dataType
+ jqXHR.setRequestHeader(
+ "Accept",
+ s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+ s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+ s.accepts[ "*" ]
+ );
+
+ // Check for headers option
+ for ( i in s.headers ) {
+ jqXHR.setRequestHeader( i, s.headers[ i ] );
+ }
+
+ // Allow custom headers/mimetypes and early abort
+ if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+ // Abort if not done already and return
+ return jqXHR.abort();
+
+ }
+
+ // aborting is no longer a cancellation
+ strAbort = "abort";
+
+ // Install callbacks on deferreds
+ for ( i in { success: 1, error: 1, complete: 1 } ) {
+ jqXHR[ i ]( s[ i ] );
+ }
+
+ // Get transport
+ transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+ // If no transport, we auto-abort
+ if ( !transport ) {
+ done( -1, "No Transport" );
+ } else {
+ jqXHR.readyState = 1;
+ // Send global event
+ if ( fireGlobals ) {
+ globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+ }
+ // Timeout
+ if ( s.async && s.timeout > 0 ) {
+ timeoutTimer = setTimeout( function(){
+ jqXHR.abort( "timeout" );
+ }, s.timeout );
+ }
+
+ try {
+ state = 1;
+ transport.send( requestHeaders, done );
+ } catch (e) {
+ // Propagate exception as error if not done
+ if ( state < 2 ) {
+ done( -1, e );
+ // Simply rethrow otherwise
+ } else {
+ throw e;
+ }
+ }
+ }
+
+ return jqXHR;
+ },
+
+ // Counter for holding the number of active queries
+ active: 0,
+
+ // Last-Modified header cache for next request
+ lastModified: {},
+ etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+ var ct, type, finalDataType, firstDataType,
+ contents = s.contents,
+ dataTypes = s.dataTypes,
+ responseFields = s.responseFields;
+
+ // Fill responseXXX fields
+ for ( type in responseFields ) {
+ if ( type in responses ) {
+ jqXHR[ responseFields[type] ] = responses[ type ];
+ }
+ }
+
+ // Remove auto dataType and get content-type in the process
+ while( dataTypes[ 0 ] === "*" ) {
+ dataTypes.shift();
+ if ( ct === undefined ) {
+ ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+ }
+ }
+
+ // Check if we're dealing with a known content-type
+ if ( ct ) {
+ for ( type in contents ) {
+ if ( contents[ type ] && contents[ type ].test( ct ) ) {
+ dataTypes.unshift( type );
+ break;
+ }
+ }
+ }
+
+ // Check to see if we have a response for the expected dataType
+ if ( dataTypes[ 0 ] in responses ) {
+ finalDataType = dataTypes[ 0 ];
+ } else {
+ // Try convertible dataTypes
+ for ( type in responses ) {
+ if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+ finalDataType = type;
+ break;
+ }
+ if ( !firstDataType ) {
+ firstDataType = type;
+ }
+ }
+ // Or just use first one
+ finalDataType = finalDataType || firstDataType;
+ }
+
+ // If we found a dataType
+ // We add the dataType to the list if needed
+ // and return the corresponding response
+ if ( finalDataType ) {
+ if ( finalDataType !== dataTypes[ 0 ] ) {
+ dataTypes.unshift( finalDataType );
+ }
+ return responses[ finalDataType ];
+ }
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+ var conv, conv2, current, tmp,
+ // Work with a copy of dataTypes in case we need to modify it for conversion
+ dataTypes = s.dataTypes.slice(),
+ prev = dataTypes[ 0 ],
+ converters = {},
+ i = 0;
+
+ // Apply the dataFilter if provided
+ if ( s.dataFilter ) {
+ response = s.dataFilter( response, s.dataType );
+ }
+
+ // Create converters map with lowercased keys
+ if ( dataTypes[ 1 ] ) {
+ for ( conv in s.converters ) {
+ converters[ conv.toLowerCase() ] = s.converters[ conv ];
+ }
+ }
+
+ // Convert to each sequential dataType, tolerating list modification
+ for ( ; (current = dataTypes[++i]); ) {
+
+ // There's only work to do if current dataType is non-auto
+ if ( current !== "*" ) {
+
+ // Convert response if prev dataType is non-auto and differs from current
+ if ( prev !== "*" && prev !== current ) {
+
+ // Seek a direct converter
+ conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+ // If none found, seek a pair
+ if ( !conv ) {
+ for ( conv2 in converters ) {
+
+ // If conv2 outputs current
+ tmp = conv2.split(" ");
+ if ( tmp[ 1 ] === current ) {
+
+ // If prev can be converted to accepted input
+ conv = converters[ prev + " " + tmp[ 0 ] ] ||
+ converters[ "* " + tmp[ 0 ] ];
+ if ( conv ) {
+ // Condense equivalence converters
+ if ( conv === true ) {
+ conv = converters[ conv2 ];
+
+ // Otherwise, insert the intermediate dataType
+ } else if ( converters[ conv2 ] !== true ) {
+ current = tmp[ 0 ];
+ dataTypes.splice( i--, 0, current );
+ }
+
+ break;
+ }
+ }
+ }
+ }
+
+ // Apply converter (if not an equivalence)
+ if ( conv !== true ) {
+
+ // Unless errors are allowed to bubble, catch and return them
+ if ( conv && s["throws"] ) {
+ response = conv( response );
+ } else {
+ try {
+ response = conv( response );
+ } catch ( e ) {
+ return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+ }
+ }
+ }
+ }
+
+ // Update prev for next iteration
+ prev = current;
+ }
+ }
+
+ return { state: "success", data: response };
+}
+var oldCallbacks = [],
+ rquestion = /\?/,
+ rjsonp = /(=)\?(?=&|$)|\?\?/,
+ nonce = jQuery.now();
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+ jsonp: "callback",
+ jsonpCallback: function() {
+ var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+ this[ callback ] = true;
+ return callback;
+ }
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+ var callbackName, overwritten, responseContainer,
+ data = s.data,
+ url = s.url,
+ hasCallback = s.jsonp !== false,
+ replaceInUrl = hasCallback && rjsonp.test( url ),
+ replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
+ !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
+ rjsonp.test( data );
+
+ // Handle iff the expected data type is "jsonp" or we have a parameter to set
+ if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
+
+ // Get callback name, remembering preexisting value associated with it
+ callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+ s.jsonpCallback() :
+ s.jsonpCallback;
+ overwritten = window[ callbackName ];
+
+ // Insert callback into url or form data
+ if ( replaceInUrl ) {
+ s.url = url.replace( rjsonp, "$1" + callbackName );
+ } else if ( replaceInData ) {
+ s.data = data.replace( rjsonp, "$1" + callbackName );
+ } else if ( hasCallback ) {
+ s.url += ( rquestion.test( url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+ }
+
+ // Use data converter to retrieve json after script execution
+ s.converters["script json"] = function() {
+ if ( !responseContainer ) {
+ jQuery.error( callbackName + " was not called" );
+ }
+ return responseContainer[ 0 ];
+ };
+
+ // force json dataType
+ s.dataTypes[ 0 ] = "json";
+
+ // Install callback
+ window[ callbackName ] = function() {
+ responseContainer = arguments;
+ };
+
+ // Clean-up function (fires after converters)
+ jqXHR.always(function() {
+ // Restore preexisting value
+ window[ callbackName ] = overwritten;
+
+ // Save back as free
+ if ( s[ callbackName ] ) {
+ // make sure that re-using the options doesn't screw things around
+ s.jsonpCallback = originalSettings.jsonpCallback;
+
+ // save the callback name for future use
+ oldCallbacks.push( callbackName );
+ }
+
+ // Call if it was a function and we have a response
+ if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+ overwritten( responseContainer[ 0 ] );
+ }
+
+ responseContainer = overwritten = undefined;
+ });
+
+ // Delegate to script
+ return "script";
+ }
+});
+// Install script dataType
+jQuery.ajaxSetup({
+ accepts: {
+ script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+ },
+ contents: {
+ script: /javascript|ecmascript/
+ },
+ converters: {
+ "text script": function( text ) {
+ jQuery.globalEval( text );
+ return text;
+ }
+ }
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+ if ( s.cache === undefined ) {
+ s.cache = false;
+ }
+ if ( s.crossDomain ) {
+ s.type = "GET";
+ s.global = false;
+ }
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+ // This transport only deals with cross domain requests
+ if ( s.crossDomain ) {
+
+ var script,
+ head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+ return {
+
+ send: function( _, callback ) {
+
+ script = document.createElement( "script" );
+
+ script.async = "async";
+
+ if ( s.scriptCharset ) {
+ script.charset = s.scriptCharset;
+ }
+
+ script.src = s.url;
+
+ // Attach handlers for all browsers
+ script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+ if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+ // Handle memory leak in IE
+ script.onload = script.onreadystatechange = null;
+
+ // Remove the script
+ if ( head && script.parentNode ) {
+ head.removeChild( script );
+ }
+
+ // Dereference the script
+ script = undefined;
+
+ // Callback if not abort
+ if ( !isAbort ) {
+ callback( 200, "success" );
+ }
+ }
+ };
+ // Use insertBefore instead of appendChild to circumvent an IE6 bug.
+ // This arises when a base node is used (#2709 and #4378).
+ head.insertBefore( script, head.firstChild );
+ },
+
+ abort: function() {
+ if ( script ) {
+ script.onload( 0, 1 );
+ }
+ }
+ };
+ }
+});
+var xhrCallbacks,
+ // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+ xhrOnUnloadAbort = window.ActiveXObject ? function() {
+ // Abort all pending requests
+ for ( var key in xhrCallbacks ) {
+ xhrCallbacks[ key ]( 0, 1 );
+ }
+ } : false,
+ xhrId = 0;
+
+// Functions to create xhrs
+function createStandardXHR() {
+ try {
+ return new window.XMLHttpRequest();
+ } catch( e ) {}
+}
+
+function createActiveXHR() {
+ try {
+ return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+ } catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+ /* Microsoft failed to properly
+ * implement the XMLHttpRequest in IE7 (can't request local files),
+ * so we use the ActiveXObject when it is available
+ * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+ * we need a fallback.
+ */
+ function() {
+ return !this.isLocal && createStandardXHR() || createActiveXHR();
+ } :
+ // For all other browsers, use the standard XMLHttpRequest object
+ createStandardXHR;
+
+// Determine support properties
+(function( xhr ) {
+ jQuery.extend( jQuery.support, {
+ ajax: !!xhr,
+ cors: !!xhr && ( "withCredentials" in xhr )
+ });
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+ jQuery.ajaxTransport(function( s ) {
+ // Cross domain only allowed if supported through XMLHttpRequest
+ if ( !s.crossDomain || jQuery.support.cors ) {
+
+ var callback;
+
+ return {
+ send: function( headers, complete ) {
+
+ // Get a new xhr
+ var handle, i,
+ xhr = s.xhr();
+
+ // Open the socket
+ // Passing null username, generates a login popup on Opera (#2865)
+ if ( s.username ) {
+ xhr.open( s.type, s.url, s.async, s.username, s.password );
+ } else {
+ xhr.open( s.type, s.url, s.async );
+ }
+
+ // Apply custom fields if provided
+ if ( s.xhrFields ) {
+ for ( i in s.xhrFields ) {
+ xhr[ i ] = s.xhrFields[ i ];
+ }
+ }
+
+ // Override mime type if needed
+ if ( s.mimeType && xhr.overrideMimeType ) {
+ xhr.overrideMimeType( s.mimeType );
+ }
+
+ // X-Requested-With header
+ // For cross-domain requests, seeing as conditions for a preflight are
+ // akin to a jigsaw puzzle, we simply never set it to be sure.
+ // (it can always be set on a per-request basis or even using ajaxSetup)
+ // For same-domain requests, won't change header if already provided.
+ if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+ headers[ "X-Requested-With" ] = "XMLHttpRequest";
+ }
+
+ // Need an extra try/catch for cross domain requests in Firefox 3
+ try {
+ for ( i in headers ) {
+ xhr.setRequestHeader( i, headers[ i ] );
+ }
+ } catch( _ ) {}
+
+ // Do send the request
+ // This may raise an exception which is actually
+ // handled in jQuery.ajax (so no try/catch here)
+ xhr.send( ( s.hasContent && s.data ) || null );
+
+ // Listener
+ callback = function( _, isAbort ) {
+
+ var status,
+ statusText,
+ responseHeaders,
+ responses,
+ xml;
+
+ // Firefox throws exceptions when accessing properties
+ // of an xhr when a network error occurred
+ // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+ try {
+
+ // Was never called and is aborted or complete
+ if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+ // Only called once
+ callback = undefined;
+
+ // Do not keep as active anymore
+ if ( handle ) {
+ xhr.onreadystatechange = jQuery.noop;
+ if ( xhrOnUnloadAbort ) {
+ delete xhrCallbacks[ handle ];
+ }
+ }
+
+ // If it's an abort
+ if ( isAbort ) {
+ // Abort it manually if needed
+ if ( xhr.readyState !== 4 ) {
+ xhr.abort();
+ }
+ } else {
+ status = xhr.status;
+ responseHeaders = xhr.getAllResponseHeaders();
+ responses = {};
+ xml = xhr.responseXML;
+
+ // Construct response list
+ if ( xml && xml.documentElement /* #4958 */ ) {
+ responses.xml = xml;
+ }
+
+ // When requesting binary data, IE6-9 will throw an exception
+ // on any attempt to access responseText (#11426)
+ try {
+ responses.text = xhr.responseText;
+ } catch( e ) {
+ }
+
+ // Firefox throws an exception when accessing
+ // statusText for faulty cross-domain requests
+ try {
+ statusText = xhr.statusText;
+ } catch( e ) {
+ // We normalize with Webkit giving an empty statusText
+ statusText = "";
+ }
+
+ // Filter status for non standard behaviors
+
+ // If the request is local and we have data: assume a success
+ // (success with no data won't get notified, that's the best we
+ // can do given current implementations)
+ if ( !status && s.isLocal && !s.crossDomain ) {
+ status = responses.text ? 200 : 404;
+ // IE - #1450: sometimes returns 1223 when it should be 204
+ } else if ( status === 1223 ) {
+ status = 204;
+ }
+ }
+ }
+ } catch( firefoxAccessException ) {
+ if ( !isAbort ) {
+ complete( -1, firefoxAccessException );
+ }
+ }
+
+ // Call complete if needed
+ if ( responses ) {
+ complete( status, statusText, responses, responseHeaders );
+ }
+ };
+
+ if ( !s.async ) {
+ // if we're in sync mode we fire the callback
+ callback();
+ } else if ( xhr.readyState === 4 ) {
+ // (IE6 & IE7) if it's in cache and has been
+ // retrieved directly we need to fire the callback
+ setTimeout( callback, 0 );
+ } else {
+ handle = ++xhrId;
+ if ( xhrOnUnloadAbort ) {
+ // Create the active xhrs callbacks list if needed
+ // and attach the unload handler
+ if ( !xhrCallbacks ) {
+ xhrCallbacks = {};
+ jQuery( window ).unload( xhrOnUnloadAbort );
+ }
+ // Add to list of active xhrs callbacks
+ xhrCallbacks[ handle ] = callback;
+ }
+ xhr.onreadystatechange = callback;
+ }
+ },
+
+ abort: function() {
+ if ( callback ) {
+ callback(0,1);
+ }
+ }
+ };
+ }
+ });
+}
+var fxNow, timerId,
+ rfxtypes = /^(?:toggle|show|hide)$/,
+ rfxnum = new RegExp( "^(?:([-+])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
+ rrun = /queueHooks$/,
+ animationPrefilters = [ defaultPrefilter ],
+ tweeners = {
+ "*": [function( prop, value ) {
+ var end, unit,
+ tween = this.createTween( prop, value ),
+ parts = rfxnum.exec( value ),
+ target = tween.cur(),
+ start = +target || 0,
+ scale = 1,
+ maxIterations = 20;
+
+ if ( parts ) {
+ end = +parts[2];
+ unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+
+ // We need to compute starting value
+ if ( unit !== "px" && start ) {
+ // Iteratively approximate from a nonzero starting point
+ // Prefer the current property, because this process will be trivial if it uses the same units
+ // Fallback to end or a simple constant
+ start = jQuery.css( tween.elem, prop, true ) || end || 1;
+
+ do {
+ // If previous iteration zeroed out, double until we get *something*
+ // Use a string for doubling factor so we don't accidentally see scale as unchanged below
+ scale = scale || ".5";
+
+ // Adjust and apply
+ start = start / scale;
+ jQuery.style( tween.elem, prop, start + unit );
+
+ // Update scale, tolerating zero or NaN from tween.cur()
+ // And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+ } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+ }
+
+ tween.unit = unit;
+ tween.start = start;
+ // If a +=/-= token was provided, we're doing a relative animation
+ tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
+ }
+ return tween;
+ }]
+ };
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+ setTimeout(function() {
+ fxNow = undefined;
+ }, 0 );
+ return ( fxNow = jQuery.now() );
+}
+
+function createTweens( animation, props ) {
+ jQuery.each( props, function( prop, value ) {
+ var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+ index = 0,
+ length = collection.length;
+ for ( ; index < length; index++ ) {
+ if ( collection[ index ].call( animation, prop, value ) ) {
+
+ // we're done with this property
+ return;
+ }
+ }
+ });
+}
+
+function Animation( elem, properties, options ) {
+ var result,
+ index = 0,
+ tweenerIndex = 0,
+ length = animationPrefilters.length,
+ deferred = jQuery.Deferred().always( function() {
+ // don't match elem in the :animated selector
+ delete tick.elem;
+ }),
+ tick = function() {
+ var currentTime = fxNow || createFxNow(),
+ remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+ // archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+ temp = remaining / animation.duration || 0,
+ percent = 1 - temp,
+ index = 0,
+ length = animation.tweens.length;
+
+ for ( ; index < length ; index++ ) {
+ animation.tweens[ index ].run( percent );
+ }
+
+ deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+ if ( percent < 1 && length ) {
+ return remaining;
+ } else {
+ deferred.resolveWith( elem, [ animation ] );
+ return false;
+ }
+ },
+ animation = deferred.promise({
+ elem: elem,
+ props: jQuery.extend( {}, properties ),
+ opts: jQuery.extend( true, { specialEasing: {} }, options ),
+ originalProperties: properties,
+ originalOptions: options,
+ startTime: fxNow || createFxNow(),
+ duration: options.duration,
+ tweens: [],
+ createTween: function( prop, end, easing ) {
+ var tween = jQuery.Tween( elem, animation.opts, prop, end,
+ animation.opts.specialEasing[ prop ] || animation.opts.easing );
+ animation.tweens.push( tween );
+ return tween;
+ },
+ stop: function( gotoEnd ) {
+ var index = 0,
+ // if we are going to the end, we want to run all the tweens
+ // otherwise we skip this part
+ length = gotoEnd ? animation.tweens.length : 0;
+
+ for ( ; index < length ; index++ ) {
+ animation.tweens[ index ].run( 1 );
+ }
+
+ // resolve when we played the last frame
+ // otherwise, reject
+ if ( gotoEnd ) {
+ deferred.resolveWith( elem, [ animation, gotoEnd ] );
+ } else {
+ deferred.rejectWith( elem, [ animation, gotoEnd ] );
+ }
+ return this;
+ }
+ }),
+ props = animation.props;
+
+ propFilter( props, animation.opts.specialEasing );
+
+ for ( ; index < length ; index++ ) {
+ result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+ if ( result ) {
+ return result;
+ }
+ }
+
+ createTweens( animation, props );
+
+ if ( jQuery.isFunction( animation.opts.start ) ) {
+ animation.opts.start.call( elem, animation );
+ }
+
+ jQuery.fx.timer(
+ jQuery.extend( tick, {
+ anim: animation,
+ queue: animation.opts.queue,
+ elem: elem
+ })
+ );
+
+ // attach callbacks from options
+ return animation.progress( animation.opts.progress )
+ .done( animation.opts.done, animation.opts.complete )
+ .fail( animation.opts.fail )
+ .always( animation.opts.always );
+}
+
+function propFilter( props, specialEasing ) {
+ var index, name, easing, value, hooks;
+
+ // camelCase, specialEasing and expand cssHook pass
+ for ( index in props ) {
+ name = jQuery.camelCase( index );
+ easing = specialEasing[ name ];
+ value = props[ index ];
+ if ( jQuery.isArray( value ) ) {
+ easing = value[ 1 ];
+ value = props[ index ] = value[ 0 ];
+ }
+
+ if ( index !== name ) {
+ props[ name ] = value;
+ delete props[ index ];
+ }
+
+ hooks = jQuery.cssHooks[ name ];
+ if ( hooks && "expand" in hooks ) {
+ value = hooks.expand( value );
+ delete props[ name ];
+
+ // not quite $.extend, this wont overwrite keys already present.
+ // also - reusing 'index' from above because we have the correct "name"
+ for ( index in value ) {
+ if ( !( index in props ) ) {
+ props[ index ] = value[ index ];
+ specialEasing[ index ] = easing;
+ }
+ }
+ } else {
+ specialEasing[ name ] = easing;
+ }
+ }
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+ tweener: function( props, callback ) {
+ if ( jQuery.isFunction( props ) ) {
+ callback = props;
+ props = [ "*" ];
+ } else {
+ props = props.split(" ");
+ }
+
+ var prop,
+ index = 0,
+ length = props.length;
+
+ for ( ; index < length ; index++ ) {
+ prop = props[ index ];
+ tweeners[ prop ] = tweeners[ prop ] || [];
+ tweeners[ prop ].unshift( callback );
+ }
+ },
+
+ prefilter: function( callback, prepend ) {
+ if ( prepend ) {
+ animationPrefilters.unshift( callback );
+ } else {
+ animationPrefilters.push( callback );
+ }
+ }
+});
+
+function defaultPrefilter( elem, props, opts ) {
+ var index, prop, value, length, dataShow, toggle, tween, hooks, oldfire,
+ anim = this,
+ style = elem.style,
+ orig = {},
+ handled = [],
+ hidden = elem.nodeType && isHidden( elem );
+
+ // handle queue: false promises
+ if ( !opts.queue ) {
+ hooks = jQuery._queueHooks( elem, "fx" );
+ if ( hooks.unqueued == null ) {
+ hooks.unqueued = 0;
+ oldfire = hooks.empty.fire;
+ hooks.empty.fire = function() {
+ if ( !hooks.unqueued ) {
+ oldfire();
+ }
+ };
+ }
+ hooks.unqueued++;
+
+ anim.always(function() {
+ // doing this makes sure that the complete handler will be called
+ // before this completes
+ anim.always(function() {
+ hooks.unqueued--;
+ if ( !jQuery.queue( elem, "fx" ).length ) {
+ hooks.empty.fire();
+ }
+ });
+ });
+ }
+
+ // height/width overflow pass
+ if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+ // Make sure that nothing sneaks out
+ // Record all 3 overflow attributes because IE does not
+ // change the overflow attribute when overflowX and
+ // overflowY are set to the same value
+ opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+ // Set display property to inline-block for height/width
+ // animations on inline elements that are having width/height animated
+ if ( jQuery.css( elem, "display" ) === "inline" &&
+ jQuery.css( elem, "float" ) === "none" ) {
+
+ // inline-level elements accept inline-block;
+ // block-level elements need to be inline with layout
+ if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
+ style.display = "inline-block";
+
+ } else {
+ style.zoom = 1;
+ }
+ }
+ }
+
+ if ( opts.overflow ) {
+ style.overflow = "hidden";
+ if ( !jQuery.support.shrinkWrapBlocks ) {
+ anim.done(function() {
+ style.overflow = opts.overflow[ 0 ];
+ style.overflowX = opts.overflow[ 1 ];
+ style.overflowY = opts.overflow[ 2 ];
+ });
+ }
+ }
+
+
+ // show/hide pass
+ for ( index in props ) {
+ value = props[ index ];
+ if ( rfxtypes.exec( value ) ) {
+ delete props[ index ];
+ toggle = toggle || value === "toggle";
+ if ( value === ( hidden ? "hide" : "show" ) ) {
+ continue;
+ }
+ handled.push( index );
+ }
+ }
+
+ length = handled.length;
+ if ( length ) {
+ dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
+ if ( "hidden" in dataShow ) {
+ hidden = dataShow.hidden;
+ }
+
+ // store state if its toggle - enables .stop().toggle() to "reverse"
+ if ( toggle ) {
+ dataShow.hidden = !hidden;
+ }
+ if ( hidden ) {
+ jQuery( elem ).show();
+ } else {
+ anim.done(function() {
+ jQuery( elem ).hide();
+ });
+ }
+ anim.done(function() {
+ var prop;
+ jQuery.removeData( elem, "fxshow", true );
+ for ( prop in orig ) {
+ jQuery.style( elem, prop, orig[ prop ] );
+ }
+ });
+ for ( index = 0 ; index < length ; index++ ) {
+ prop = handled[ index ];
+ tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
+ orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
+
+ if ( !( prop in dataShow ) ) {
+ dataShow[ prop ] = tween.start;
+ if ( hidden ) {
+ tween.end = tween.start;
+ tween.start = prop === "width" || prop === "height" ? 1 : 0;
+ }
+ }
+ }
+ }
+}
+
+function Tween( elem, options, prop, end, easing ) {
+ return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+ constructor: Tween,
+ init: function( elem, options, prop, end, easing, unit ) {
+ this.elem = elem;
+ this.prop = prop;
+ this.easing = easing || "swing";
+ this.options = options;
+ this.start = this.now = this.cur();
+ this.end = end;
+ this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+ },
+ cur: function() {
+ var hooks = Tween.propHooks[ this.prop ];
+
+ return hooks && hooks.get ?
+ hooks.get( this ) :
+ Tween.propHooks._default.get( this );
+ },
+ run: function( percent ) {
+ var eased,
+ hooks = Tween.propHooks[ this.prop ];
+
+ if ( this.options.duration ) {
+ this.pos = eased = jQuery.easing[ this.easing ](
+ percent, this.options.duration * percent, 0, 1, this.options.duration
+ );
+ } else {
+ this.pos = eased = percent;
+ }
+ this.now = ( this.end - this.start ) * eased + this.start;
+
+ if ( this.options.step ) {
+ this.options.step.call( this.elem, this.now, this );
+ }
+
+ if ( hooks && hooks.set ) {
+ hooks.set( this );
+ } else {
+ Tween.propHooks._default.set( this );
+ }
+ return this;
+ }
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+ _default: {
+ get: function( tween ) {
+ var result;
+
+ if ( tween.elem[ tween.prop ] != null &&
+ (!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+ return tween.elem[ tween.prop ];
+ }
+
+ // passing any value as a 4th parameter to .css will automatically
+ // attempt a parseFloat and fallback to a string if the parse fails
+ // so, simple values such as "10px" are parsed to Float.
+ // complex values such as "rotate(1rad)" are returned as is.
+ result = jQuery.css( tween.elem, tween.prop, false, "" );
+ // Empty strings, null, undefined and "auto" are converted to 0.
+ return !result || result === "auto" ? 0 : result;
+ },
+ set: function( tween ) {
+ // use step hook for back compat - use cssHook if its there - use .style if its
+ // available and use plain properties where available
+ if ( jQuery.fx.step[ tween.prop ] ) {
+ jQuery.fx.step[ tween.prop ]( tween );
+ } else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+ jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+ } else {
+ tween.elem[ tween.prop ] = tween.now;
+ }
+ }
+ }
+};
+
+// Remove in 2.0 - this supports IE8's panic based approach
+// to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+ set: function( tween ) {
+ if ( tween.elem.nodeType && tween.elem.parentNode ) {
+ tween.elem[ tween.prop ] = tween.now;
+ }
+ }
+};
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+ var cssFn = jQuery.fn[ name ];
+ jQuery.fn[ name ] = function( speed, easing, callback ) {
+ return speed == null || typeof speed === "boolean" ||
+ // special check for .toggle( handler, handler, ... )
+ ( !i && jQuery.isFunction( speed ) && jQuery.isFunction( easing ) ) ?
+ cssFn.apply( this, arguments ) :
+ this.animate( genFx( name, true ), speed, easing, callback );
+ };
+});
+
+jQuery.fn.extend({
+ fadeTo: function( speed, to, easing, callback ) {
+
+ // show any hidden elements after setting opacity to 0
+ return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+ // animate to the value specified
+ .end().animate({ opacity: to }, speed, easing, callback );
+ },
+ animate: function( prop, speed, easing, callback ) {
+ var empty = jQuery.isEmptyObject( prop ),
+ optall = jQuery.speed( speed, easing, callback ),
+ doAnimation = function() {
+ // Operate on a copy of prop so per-property easing won't be lost
+ var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+ // Empty animations resolve immediately
+ if ( empty ) {
+ anim.stop( true );
+ }
+ };
+
+ return empty || optall.queue === false ?
+ this.each( doAnimation ) :
+ this.queue( optall.queue, doAnimation );
+ },
+ stop: function( type, clearQueue, gotoEnd ) {
+ var stopQueue = function( hooks ) {
+ var stop = hooks.stop;
+ delete hooks.stop;
+ stop( gotoEnd );
+ };
+
+ if ( typeof type !== "string" ) {
+ gotoEnd = clearQueue;
+ clearQueue = type;
+ type = undefined;
+ }
+ if ( clearQueue && type !== false ) {
+ this.queue( type || "fx", [] );
+ }
+
+ return this.each(function() {
+ var dequeue = true,
+ index = type != null && type + "queueHooks",
+ timers = jQuery.timers,
+ data = jQuery._data( this );
+
+ if ( index ) {
+ if ( data[ index ] && data[ index ].stop ) {
+ stopQueue( data[ index ] );
+ }
+ } else {
+ for ( index in data ) {
+ if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+ stopQueue( data[ index ] );
+ }
+ }
+ }
+
+ for ( index = timers.length; index--; ) {
+ if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+ timers[ index ].anim.stop( gotoEnd );
+ dequeue = false;
+ timers.splice( index, 1 );
+ }
+ }
+
+ // start the next in the queue if the last step wasn't forced
+ // timers currently will call their complete callbacks, which will dequeue
+ // but only if they were gotoEnd
+ if ( dequeue || !gotoEnd ) {
+ jQuery.dequeue( this, type );
+ }
+ });
+ }
+});
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+ var which,
+ attrs = { height: type },
+ i = 0;
+
+ // if we include width, step value is 1 to do all cssExpand values,
+ // if we don't include width, step value is 2 to skip over Left and Right
+ includeWidth = includeWidth? 1 : 0;
+ for( ; i < 4 ; i += 2 - includeWidth ) {
+ which = cssExpand[ i ];
+ attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+ }
+
+ if ( includeWidth ) {
+ attrs.opacity = attrs.width = type;
+ }
+
+ return attrs;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+ slideDown: genFx("show"),
+ slideUp: genFx("hide"),
+ slideToggle: genFx("toggle"),
+ fadeIn: { opacity: "show" },
+ fadeOut: { opacity: "hide" },
+ fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+ jQuery.fn[ name ] = function( speed, easing, callback ) {
+ return this.animate( props, speed, easing, callback );
+ };
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+ var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+ complete: fn || !fn && easing ||
+ jQuery.isFunction( speed ) && speed,
+ duration: speed,
+ easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+ };
+
+ opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+ opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+ // normalize opt.queue - true/undefined/null -> "fx"
+ if ( opt.queue == null || opt.queue === true ) {
+ opt.queue = "fx";
+ }
+
+ // Queueing
+ opt.old = opt.complete;
+
+ opt.complete = function() {
+ if ( jQuery.isFunction( opt.old ) ) {
+ opt.old.call( this );
+ }
+
+ if ( opt.queue ) {
+ jQuery.dequeue( this, opt.queue );
+ }
+ };
+
+ return opt;
+};
+
+jQuery.easing = {
+ linear: function( p ) {
+ return p;
+ },
+ swing: function( p ) {
+ return 0.5 - Math.cos( p*Math.PI ) / 2;
+ }
+};
+
+jQuery.timers = [];
+jQuery.fx = Tween.prototype.init;
+jQuery.fx.tick = function() {
+ var timer,
+ timers = jQuery.timers,
+ i = 0;
+
+ fxNow = jQuery.now();
+
+ for ( ; i < timers.length; i++ ) {
+ timer = timers[ i ];
+ // Checks the timer has not already been removed
+ if ( !timer() && timers[ i ] === timer ) {
+ timers.splice( i--, 1 );
+ }
+ }
+
+ if ( !timers.length ) {
+ jQuery.fx.stop();
+ }
+ fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+ if ( timer() && jQuery.timers.push( timer ) && !timerId ) {
+ timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+ }
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.stop = function() {
+ clearInterval( timerId );
+ timerId = null;
+};
+
+jQuery.fx.speeds = {
+ slow: 600,
+ fast: 200,
+ // Default speed
+ _default: 400
+};
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+ jQuery.expr.filters.animated = function( elem ) {
+ return jQuery.grep(jQuery.timers, function( fn ) {
+ return elem === fn.elem;
+ }).length;
+ };
+}
+var rroot = /^(?:body|html)$/i;
+
+jQuery.fn.offset = function( options ) {
+ if ( arguments.length ) {
+ return options === undefined ?
+ this :
+ this.each(function( i ) {
+ jQuery.offset.setOffset( this, options, i );
+ });
+ }
+
+ var docElem, body, win, clientTop, clientLeft, scrollTop, scrollLeft,
+ box = { top: 0, left: 0 },
+ elem = this[ 0 ],
+ doc = elem && elem.ownerDocument;
+
+ if ( !doc ) {
+ return;
+ }
+
+ if ( (body = doc.body) === elem ) {
+ return jQuery.offset.bodyOffset( elem );
+ }
+
+ docElem = doc.documentElement;
+
+ // Make sure it's not a disconnected DOM node
+ if ( !jQuery.contains( docElem, elem ) ) {
+ return box;
+ }
+
+ // If we don't have gBCR, just use 0,0 rather than error
+ // BlackBerry 5, iOS 3 (original iPhone)
+ if ( typeof elem.getBoundingClientRect !== "undefined" ) {
+ box = elem.getBoundingClientRect();
+ }
+ win = getWindow( doc );
+ clientTop = docElem.clientTop || body.clientTop || 0;
+ clientLeft = docElem.clientLeft || body.clientLeft || 0;
+ scrollTop = win.pageYOffset || docElem.scrollTop;
+ scrollLeft = win.pageXOffset || docElem.scrollLeft;
+ return {
+ top: box.top + scrollTop - clientTop,
+ left: box.left + scrollLeft - clientLeft
+ };
+};
+
+jQuery.offset = {
+
+ bodyOffset: function( body ) {
+ var top = body.offsetTop,
+ left = body.offsetLeft;
+
+ if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
+ top += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+ left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+ }
+
+ return { top: top, left: left };
+ },
+
+ setOffset: function( elem, options, i ) {
+ var position = jQuery.css( elem, "position" );
+
+ // set position first, in-case top/left are set even on static elem
+ if ( position === "static" ) {
+ elem.style.position = "relative";
+ }
+
+ var curElem = jQuery( elem ),
+ curOffset = curElem.offset(),
+ curCSSTop = jQuery.css( elem, "top" ),
+ curCSSLeft = jQuery.css( elem, "left" ),
+ calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+ props = {}, curPosition = {}, curTop, curLeft;
+
+ // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+ if ( calculatePosition ) {
+ curPosition = curElem.position();
+ curTop = curPosition.top;
+ curLeft = curPosition.left;
+ } else {
+ curTop = parseFloat( curCSSTop ) || 0;
+ curLeft = parseFloat( curCSSLeft ) || 0;
+ }
+
+ if ( jQuery.isFunction( options ) ) {
+ options = options.call( elem, i, curOffset );
+ }
+
+ if ( options.top != null ) {
+ props.top = ( options.top - curOffset.top ) + curTop;
+ }
+ if ( options.left != null ) {
+ props.left = ( options.left - curOffset.left ) + curLeft;
+ }
+
+ if ( "using" in options ) {
+ options.using.call( elem, props );
+ } else {
+ curElem.css( props );
+ }
+ }
+};
+
+
+jQuery.fn.extend({
+
+ position: function() {
+ if ( !this[0] ) {
+ return;
+ }
+
+ var elem = this[0],
+
+ // Get *real* offsetParent
+ offsetParent = this.offsetParent(),
+
+ // Get correct offsets
+ offset = this.offset(),
+ parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+ // Subtract element margins
+ // note: when an element has margin: auto the offsetLeft and marginLeft
+ // are the same in Safari causing offset.left to incorrectly be 0
+ offset.top -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+ offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+ // Add offsetParent borders
+ parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+ parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+ // Subtract the two offsets
+ return {
+ top: offset.top - parentOffset.top,
+ left: offset.left - parentOffset.left
+ };
+ },
+
+ offsetParent: function() {
+ return this.map(function() {
+ var offsetParent = this.offsetParent || document.body;
+ while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+ offsetParent = offsetParent.offsetParent;
+ }
+ return offsetParent || document.body;
+ });
+ }
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+ var top = /Y/.test( prop );
+
+ jQuery.fn[ method ] = function( val ) {
+ return jQuery.access( this, function( elem, method, val ) {
+ var win = getWindow( elem );
+
+ if ( val === undefined ) {
+ return win ? (prop in win) ? win[ prop ] :
+ win.document.documentElement[ method ] :
+ elem[ method ];
+ }
+
+ if ( win ) {
+ win.scrollTo(
+ !top ? val : jQuery( win ).scrollLeft(),
+ top ? val : jQuery( win ).scrollTop()
+ );
+
+ } else {
+ elem[ method ] = val;
+ }
+ }, method, val, arguments.length, null );
+ };
+});
+
+function getWindow( elem ) {
+ return jQuery.isWindow( elem ) ?
+ elem :
+ elem.nodeType === 9 ?
+ elem.defaultView || elem.parentWindow :
+ false;
+}
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+ jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+ // margin is only for outerHeight, outerWidth
+ jQuery.fn[ funcName ] = function( margin, value ) {
+ var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+ extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+ return jQuery.access( this, function( elem, type, value ) {
+ var doc;
+
+ if ( jQuery.isWindow( elem ) ) {
+ // As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+ // isn't a whole lot we can do. See pull request at this URL for discussion:
+ // https://github.com/jquery/jquery/pull/764
+ return elem.document.documentElement[ "client" + name ];
+ }
+
+ // Get document width or height
+ if ( elem.nodeType === 9 ) {
+ doc = elem.documentElement;
+
+ // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+ // unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+ return Math.max(
+ elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+ elem.body[ "offset" + name ], doc[ "offset" + name ],
+ doc[ "client" + name ]
+ );
+ }
+
+ return value === undefined ?
+ // Get width or height on the element, requesting but not forcing parseFloat
+ jQuery.css( elem, type, value, extra ) :
+
+ // Set width or height on the element
+ jQuery.style( elem, type, value, extra );
+ }, type, chainable ? margin : undefined, chainable, null );
+ };
+ });
+});
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+ define( "jquery", [], function () { return jQuery; } );
+}
+
+})( window );
diff --git a/Agent-Input/ssi/pipes/all-in-one/all-in-one.pipeline b/Agent-Input/ssi/pipes/all-in-one/all-in-one.pipeline
index 4b727b2..d3f1a18 100644
--- a/Agent-Input/ssi/pipes/all-in-one/all-in-one.pipeline
+++ b/Agent-Input/ssi/pipes/all-in-one/all-in-one.pipeline
@@ -14,6 +14,7 @@
+
@@ -119,7 +120,7 @@
+
+
-
+
-
+
+
+
+
- audio.wav
video.avi
- audio.wav
- voiceactivity.stream
- emax.stream
+ audio.wav
+ voiceactivity.stream
+ emax.stream
transcription.annotation
diff --git a/Agent-Input/ssi/pipes/asrkaldi/asrkaldi-multi.pipeline b/Agent-Input/ssi/pipes/asrkaldi/asrkaldi-multi.pipeline
index 2772fd0..041b4de 100644
--- a/Agent-Input/ssi/pipes/asrkaldi/asrkaldi-multi.pipeline
+++ b/Agent-Input/ssi/pipes/asrkaldi/asrkaldi-multi.pipeline
@@ -56,12 +56,17 @@
-
+
+
+
+
+
-
+
+
+
+
+
decode with NN model, 3-gram LM, and non-transformed features"
-echo
-steps/nnet2/decode_fast.sh --nj $num_jobs --cmd "$decode_cmd" \
- exp/tri6b/graph_tgsmall data/$test $dir/decode_tgsmall_$test || exit 1;
-
-
-date
-
-
-# This is a rescoring step with a 4-gram LM but it consumes
-# around 13 seconds, use it if you can afford the running time!
-
-#echo
-#echo "==> rescore lattices with large 4-gram LM"
-#echo
-#steps/lmrescore_const_arpa_fast.sh \
-# --cmd "$decode_cmd" data/lang_test_{tgsmall,fglarge} \
-# data/$test $dir/decode_{tgsmall,fglarge}_$test || exit 1;
-
-
-#date
-
diff --git a/Agent-Input/ssi/pipes/emax/emax.pipeline-config b/Agent-Input/ssi/pipes/emax/emax.pipeline-config
index 5885a96..c265c53 100644
--- a/Agent-Input/ssi/pipes/emax/emax.pipeline-config
+++ b/Agent-Input/ssi/pipes/emax/emax.pipeline-config
@@ -15,6 +15,6 @@ activemq:id = SSI # activemq id
activemq:topic= EMAX # activemq topic
# websocket
-websocket:use = true
+websocket:use = false
websocket:port = 80
websocket:site = website
\ No newline at end of file
diff --git a/Agent-Input/ssi/pipes/emax/media/camera.mp4 b/Agent-Input/ssi/pipes/emax/media/camera.mp4
new file mode 100644
index 0000000..c75d243
Binary files /dev/null and b/Agent-Input/ssi/pipes/emax/media/camera.mp4 differ
diff --git a/Agent-Input/ssi/pipes/logging/dialog.annotation b/Agent-Input/ssi/pipes/logging/dialog.annotation
index 54f7029..5ae9152 100644
--- a/Agent-Input/ssi/pipes/logging/dialog.annotation
+++ b/Agent-Input/ssi/pipes/logging/dialog.annotation
@@ -1,6 +1,6 @@
diff --git a/Agent-Output/.idea/workspace.xml b/Agent-Output/.idea/workspace.xml
deleted file mode 100644
index 3bcf575..0000000
--- a/Agent-Output/.idea/workspace.xml
+++ /dev/null
@@ -1,929 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1471443715766
- 1471443715766
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No facets are configured
-
-
-
-
-
-
-
-
-
-
- scala-sdk-2.11.7
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
-
-
- Agent-Output
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
-
-
- Player
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Agent-Output/bin/Agent-Output.ini b/Agent-Output/bin/Agent-Output.ini
index 7b62c67..f9b0491 100644
--- a/Agent-Output/bin/Agent-Output.ini
+++ b/Agent-Output/bin/Agent-Output.ini
@@ -24,21 +24,43 @@ Player.window.height = 596
Environment = ./environment-ARIADemo2.xml
# The animation engine to use: GRETA | LIVING-ACTOR
System.animEngine = GRETA
-# Connections (Thrift and ActiveMQ)
+# System.animEngine = LIVING-ACTOR
+##### Connections (Thrift and ActiveMQ) ####
ThriftBMLSender.host = localhost
ThriftBMLSender.port = 131
ActiveMQBroker.port = 61616
+## ActiveMQ Receivers ##
+FMLReceiver.topic = vib.input.FML
FMLReceiver.port = 61616
-FMLReceiver.topic = vib.FML
FMLReceiver.host = localhost
FMLReceiver.isQueue = false
-BMLFeedbackSender.port = 61616
-BMLFeedbackSender.topic = vib.feedback.BML
-BMLFeedbackSender.host = localhost
-BMLFeedbackSender.isQueue = false
-BMLSender.port = 61616
+#
+BMLReceiver.topic = vib.input.BML
+BMLReceiver.port = 61616
+BMLReceiver.host = localhost
+BMLReceiver.isQueue = false
+#
+BMLFeedbackReceiver.topic = vib.input.feedback.BML
+BMLFeedbackReceiver.port = 61616
+BMLFeedbackReceiver.host = localhost
+BMLFeedbackReceiver.isQueue = false
+#
+ARIAInfoStateReceiver.topic = vib.input.aria.InformationStates
+ARIAInfoStateReceiver.port = 61616
+ARIAInfoStateReceiver.host = localhost
+ARIAInfoStateReceiver.isQueue = false
+## ActiveMQ Senders ##
BMLSender.topic = vib.output.BML
+BMLSender.port = 61616
BMLSender.host = localhost
BMLSender.isQueue = false
+#
+BMLFeedbackSender.topic = vib.output.feedback.BML
+BMLFeedbackSender.port = 61616
+BMLFeedbackSender.host = localhost
+BMLFeedbackSender.isQueue = false
+#### Debug ###
# Show ActiveMQ windows
WhiteBoard.visible = false
+# Show the Information State Tester window to manually change ARIA Information States
+ARIAInformationStateTester.visible = true
\ No newline at end of file
diff --git a/Agent-Output/bin/Agent-Output.jar b/Agent-Output/bin/Agent-Output.jar
index 5642991..ce127db 100644
Binary files a/Agent-Output/bin/Agent-Output.jar and b/Agent-Output/bin/Agent-Output.jar differ
diff --git a/Agent-Output/bin/BehaviorPlanner/IntentionLexicon/lexicon_Alice.xml b/Agent-Output/bin/BehaviorPlanner/IntentionLexicon/lexicon_Alice.xml
index bd74ce2..ba0fc95 100644
--- a/Agent-Output/bin/BehaviorPlanner/IntentionLexicon/lexicon_Alice.xml
+++ b/Agent-Output/bin/BehaviorPlanner/IntentionLexicon/lexicon_Alice.xml
@@ -141,6 +141,20 @@
+
+
+
+
+
+
+
+
+
@@ -380,7 +394,18 @@
-
+
+
+
+
+
+
+
+
+
@@ -437,7 +462,7 @@
-
+
@@ -448,6 +473,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures.xml b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures.xml
index ea08635..c9a2c1d 100644
--- a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures.xml
+++ b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures.xml
@@ -1,10 +1,11 @@
+
+
@@ -55,34 +57,39 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
-
@@ -91,7 +98,6 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
@@ -100,7 +106,6 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
@@ -115,6 +120,16 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
-
-
+
-
+
-
-
+
-
-
+
-
@@ -308,18 +315,16 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
-
+
-
@@ -328,45 +333,43 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
-
-
-
-
+
+
-
-
-
-
+
-
-
-
-
+
+
-
+
-
@@ -387,12 +390,12 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
+
-
+
@@ -406,7 +409,6 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
@@ -461,7 +463,7 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
@@ -507,13 +509,13 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
@@ -543,7 +545,7 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
diff --git a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures_Alice.xml b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures_Alice.xml
index ea9e768..7843f05 100644
--- a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures_Alice.xml
+++ b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/HeadGestures_Alice.xml
@@ -1,10 +1,11 @@
+
+
@@ -54,35 +56,50 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
@@ -91,7 +108,6 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
@@ -100,7 +116,6 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
@@ -115,6 +130,16 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
-
-
+
-
+
-
-
+
-
-
+
-
@@ -308,18 +325,16 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
-
+
-
@@ -328,45 +343,43 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
-
-
-
-
+
+
-
-
-
-
+
-
-
-
-
+
+
-
+
-
@@ -387,12 +400,12 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
+
-
+
@@ -406,7 +419,6 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
@@ -461,7 +473,7 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
@@ -507,13 +519,13 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
-
@@ -543,7 +555,7 @@ LateralTilt is Left/Right rotation in the lateral plan (around z axis)
diff --git a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGestures.xml b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGestures.xml
index 38e42cb..a5afffd 100644
--- a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGestures.xml
+++ b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGestures.xml
@@ -1,14 +1,15 @@
+
- minSpeed=0.0 et maxSpeed=1.0 are (maybe) to be modified according to the implementation of the speed function
+
--->
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
+
-
-
+
-
-
-
+
-
+
-
-
+
-
+
-
+
-
-
-
+
+
-
-
-
-
-
-
+
-
-
-
+
-
-
-
-
+
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
-
+
+
-
-
+
-
-
+
-
-
+
-
-
+
-
+
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGesturesMathieu.xml b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGesturesMathieu.xml
index 38e42cb..03b1f1b 100644
--- a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGesturesMathieu.xml
+++ b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/TorsoGesturesMathieu.xml
@@ -1,14 +1,15 @@
+
- minSpeed=0.0 et maxSpeed=1.0 are (maybe) to be modified according to the implementation of the speed function
+
--->
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
+
-
-
+
-
-
-
+
-
+
-
-
+
-
+
-
+
-
-
-
+
+
-
-
-
-
-
-
+
-
-
-
+
-
-
-
-
+
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
-
+
+
-
-
+
-
-
+
-
-
+
-
-
+
-
+
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/facelibrary.xml b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/facelibrary.xml
index 22f0232..7dda193 100644
--- a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/facelibrary.xml
+++ b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/facelibrary.xml
@@ -711,4 +711,8 @@
+
diff --git a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/gestuary_alice.xml b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/gestuary_alice.xml
index 86d7718..288073a 100644
--- a/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/gestuary_alice.xml
+++ b/Agent-Output/bin/BehaviorRealizer/BehaviorLexicon/gestuary_alice.xml
@@ -5,9 +5,9 @@
@@ -16,14 +16,14 @@
@@ -517,8 +517,8 @@
@@ -529,8 +529,8 @@
@@ -543,8 +543,8 @@
@@ -555,8 +555,8 @@
@@ -715,8 +715,8 @@
@@ -729,8 +729,8 @@
@@ -805,8 +805,8 @@
@@ -819,8 +819,8 @@
@@ -865,8 +865,8 @@
@@ -877,8 +877,8 @@
@@ -1230,6 +1230,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4827,25 +4857,25 @@
-
-
diff --git a/Agent-Output/bin/Common/Data/ARIA-ValuspaFMLTranslator/fml-apml.dtd b/Agent-Output/bin/Common/Data/ARIA-ValuspaFMLTranslator/fml-apml.dtd
index 74f7c92..20f9dc0 100644
--- a/Agent-Output/bin/Common/Data/ARIA-ValuspaFMLTranslator/fml-apml.dtd
+++ b/Agent-Output/bin/Common/Data/ARIA-ValuspaFMLTranslator/fml-apml.dtd
@@ -65,15 +65,15 @@
-
+
-
+
-
+
diff --git a/Agent-Output/bin/Common/Data/characters/Alice.ini b/Agent-Output/bin/Common/Data/characters/Alice.ini
index 18b4dcb..3e2e90a 100644
--- a/Agent-Output/bin/Common/Data/characters/Alice.ini
+++ b/Agent-Output/bin/Common/Data/characters/Alice.ini
@@ -16,4 +16,6 @@ IK_SKELETON=./BehaviorRealizer/Skeleton/camille_skeleton.xml
GESTUARY=./BehaviorRealizer/BehaviorLexicon/gestuary_alice.xml
LEXICON=./BehaviorPlanner/IntentionLexicon/lexicon_Alice.xml
CEREPROC_LANG=en-GB
-CEREPROC_VOICE=arctic
+CEREPROC_VOICE=sarah
+INTERRUPTION_GESTURE_HOLD_DUR = 0
+INTERRUPTION_GESTURE_RETRACT_DUR = 0
diff --git a/Agent-Output/bin/Common/Data/characters/Camille.ini b/Agent-Output/bin/Common/Data/characters/Camille.ini
index 6f6019b..1916e12 100644
--- a/Agent-Output/bin/Common/Data/characters/Camille.ini
+++ b/Agent-Output/bin/Common/Data/characters/Camille.ini
@@ -13,4 +13,6 @@ IK_SKELETON=./BehaviorRealizer/Skeleton/camille_skeleton.xml
GESTUARY=./BehaviorRealizer/BehaviorLexicon/gestuary_camille.xml
LEXICON=./BehaviorPlanner/IntentionLexicon/lexicon_Camille.xml
CEREPROC_LANG=en-GB
-CEREPROC_VOICE=sarah
\ No newline at end of file
+CEREPROC_VOICE=sarah
+INTERRUPTION_GESTURE_HOLD_DUR = 1
+INTERRUPTION_GESTURE_RETRACT_DUR = 1
\ No newline at end of file
diff --git a/Agent-Output/bin/Common/Data/characters/default.ini b/Agent-Output/bin/Common/Data/characters/default.ini
index d2c9b8b..01681fb 100644
--- a/Agent-Output/bin/Common/Data/characters/default.ini
+++ b/Agent-Output/bin/Common/Data/characters/default.ini
@@ -66,8 +66,8 @@ CEREPROC_VOICE=suzanne
RESTPOSE_REPOSITORY=./BehaviorRealizer/AnimationLexicon/RestPose.xml
IK_SKELETON=./BehaviorRealizer/Skeleton/greta_skeleton.xml
SYMBOLIC_CONVERSION=./BehaviorRealizer/AnimationLexicon/SymbolicConversion.xml
-TORSO_REPOSITORY=./BehaviorRealizer/AnimationLexicon/TorsoAmount.xml
-HEAD_REPOSITORY=./BehaviorRealizer/AnimationLexicon/HeadAmount.xml
+HEAD_INTERVALS=./BehaviorRealizer/AnimationLexicon/HeadIntervals.xml
+TORSO_INTERVALS=./BehaviorRealizer/AnimationLexicon/TorsoIntervals.xml
HANDSHAPE_REPOSITORY=./BehaviorRealizer/AnimationLexicon/HandShape.xml
diff --git a/Agent-Output/bin/Common/Lib/Internal/ActiveMQ.jar b/Agent-Output/bin/Common/Lib/Internal/ActiveMQ.jar
index af44212..1928582 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/ActiveMQ.jar and b/Agent-Output/bin/Common/Lib/Internal/ActiveMQ.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/AnimationDynamics.jar b/Agent-Output/bin/Common/Lib/Internal/AnimationDynamics.jar
index 948082d..05eff85 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/AnimationDynamics.jar and b/Agent-Output/bin/Common/Lib/Internal/AnimationDynamics.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/BehaviorRealizer.jar b/Agent-Output/bin/Common/Lib/Internal/BehaviorRealizer.jar
index 22d70da..2f2d597 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/BehaviorRealizer.jar and b/Agent-Output/bin/Common/Lib/Internal/BehaviorRealizer.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/BodyAnimationPerformer.jar b/Agent-Output/bin/Common/Lib/Internal/BodyAnimationPerformer.jar
index 479e515..c62d098 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/BodyAnimationPerformer.jar and b/Agent-Output/bin/Common/Lib/Internal/BodyAnimationPerformer.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/BvhMocap.jar b/Agent-Output/bin/Common/Lib/Internal/BvhMocap.jar
index 4ccd23e..89bf96f 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/BvhMocap.jar and b/Agent-Output/bin/Common/Lib/Internal/BvhMocap.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/Cereproc.jar b/Agent-Output/bin/Common/Lib/Internal/Cereproc.jar
index 50ff230..2b9640e 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/Cereproc.jar and b/Agent-Output/bin/Common/Lib/Internal/Cereproc.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/Feedbacks.jar b/Agent-Output/bin/Common/Lib/Internal/Feedbacks.jar
index 06100db..1df5ff1 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/Feedbacks.jar and b/Agent-Output/bin/Common/Lib/Internal/Feedbacks.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/GestureAnimation.jar b/Agent-Output/bin/Common/Lib/Internal/GestureAnimation.jar
index 7914edf..9504c40 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/GestureAnimation.jar and b/Agent-Output/bin/Common/Lib/Internal/GestureAnimation.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/Intentions.jar b/Agent-Output/bin/Common/Lib/Internal/Intentions.jar
index 30905af..cafd875 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/Intentions.jar and b/Agent-Output/bin/Common/Lib/Internal/Intentions.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/LipModel.jar b/Agent-Output/bin/Common/Lib/Internal/LipModel.jar
index cdabfec..ddd79ac 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/LipModel.jar and b/Agent-Output/bin/Common/Lib/Internal/LipModel.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/MPEG4.jar b/Agent-Output/bin/Common/Lib/Internal/MPEG4.jar
index 88ab257..80c527b 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/MPEG4.jar and b/Agent-Output/bin/Common/Lib/Internal/MPEG4.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/Signals.jar b/Agent-Output/bin/Common/Lib/Internal/Signals.jar
index 8f7a243..fd99f77 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/Signals.jar and b/Agent-Output/bin/Common/Lib/Internal/Signals.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/SpeechRecognition.jar b/Agent-Output/bin/Common/Lib/Internal/SpeechRecognition.jar
index 7b28a79..d879e35 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/SpeechRecognition.jar and b/Agent-Output/bin/Common/Lib/Internal/SpeechRecognition.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/Util.jar b/Agent-Output/bin/Common/Lib/Internal/Util.jar
index a58547b..2282f64 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/Util.jar and b/Agent-Output/bin/Common/Lib/Internal/Util.jar differ
diff --git a/Agent-Output/bin/Common/Lib/Internal/Utilx.jar b/Agent-Output/bin/Common/Lib/Internal/Utilx.jar
index a84bd5c..f7b049a 100644
Binary files a/Agent-Output/bin/Common/Lib/Internal/Utilx.jar and b/Agent-Output/bin/Common/Lib/Internal/Utilx.jar differ
diff --git a/Agent-Output/bin/Player/Lib/External/Win64/Plugins_OpenGL.cfg b/Agent-Output/bin/Player/Lib/External/Win64/Plugins_OpenGL.cfg
index 0434097..15e207b 100644
--- a/Agent-Output/bin/Player/Lib/External/Win64/Plugins_OpenGL.cfg
+++ b/Agent-Output/bin/Player/Lib/External/Win64/Plugins_OpenGL.cfg
@@ -1,7 +1,7 @@
# Defines plugins to load
# Define plugin folder
-PluginFolder=C:\Users\adg\Documents\GitHub\ARIA-System\Agent-Output\bin\Player\Lib\External\Win64\DLL
+PluginFolder=D:\projects\ARIA\System\Agent-Output\bin\Player\Lib\External\Win64\DLL
# Define plugins
#Plugin=RenderSystem_Direct3D9
diff --git a/Agent-Output/bin/lib/ActiveMQ.jar b/Agent-Output/bin/lib/ActiveMQ.jar
index af44212..1928582 100644
Binary files a/Agent-Output/bin/lib/ActiveMQ.jar and b/Agent-Output/bin/lib/ActiveMQ.jar differ
diff --git a/Agent-Output/bin/lib/AnimationDynamics.jar b/Agent-Output/bin/lib/AnimationDynamics.jar
index 948082d..05eff85 100644
Binary files a/Agent-Output/bin/lib/AnimationDynamics.jar and b/Agent-Output/bin/lib/AnimationDynamics.jar differ
diff --git a/Agent-Output/bin/lib/BehaviorRealizer.jar b/Agent-Output/bin/lib/BehaviorRealizer.jar
index 22d70da..2f2d597 100644
Binary files a/Agent-Output/bin/lib/BehaviorRealizer.jar and b/Agent-Output/bin/lib/BehaviorRealizer.jar differ
diff --git a/Agent-Output/bin/lib/BodyAnimationPerformer.jar b/Agent-Output/bin/lib/BodyAnimationPerformer.jar
index 479e515..c62d098 100644
Binary files a/Agent-Output/bin/lib/BodyAnimationPerformer.jar and b/Agent-Output/bin/lib/BodyAnimationPerformer.jar differ
diff --git a/Agent-Output/bin/lib/BvhMocap.jar b/Agent-Output/bin/lib/BvhMocap.jar
index a77a142..fd2f2ee 100644
Binary files a/Agent-Output/bin/lib/BvhMocap.jar and b/Agent-Output/bin/lib/BvhMocap.jar differ
diff --git a/Agent-Output/bin/lib/Cereproc.jar b/Agent-Output/bin/lib/Cereproc.jar
index 50ff230..2b9640e 100644
Binary files a/Agent-Output/bin/lib/Cereproc.jar and b/Agent-Output/bin/lib/Cereproc.jar differ
diff --git a/Agent-Output/bin/lib/Feedbacks.jar b/Agent-Output/bin/lib/Feedbacks.jar
index 06100db..1df5ff1 100644
Binary files a/Agent-Output/bin/lib/Feedbacks.jar and b/Agent-Output/bin/lib/Feedbacks.jar differ
diff --git a/Agent-Output/bin/lib/GestureAnimation.jar b/Agent-Output/bin/lib/GestureAnimation.jar
index efd4bd7..194c7b8 100644
Binary files a/Agent-Output/bin/lib/GestureAnimation.jar and b/Agent-Output/bin/lib/GestureAnimation.jar differ
diff --git a/Agent-Output/bin/lib/Intentions.jar b/Agent-Output/bin/lib/Intentions.jar
index 30905af..cafd875 100644
Binary files a/Agent-Output/bin/lib/Intentions.jar and b/Agent-Output/bin/lib/Intentions.jar differ
diff --git a/Agent-Output/bin/lib/LipModel.jar b/Agent-Output/bin/lib/LipModel.jar
index cdabfec..ddd79ac 100644
Binary files a/Agent-Output/bin/lib/LipModel.jar and b/Agent-Output/bin/lib/LipModel.jar differ
diff --git a/Agent-Output/bin/lib/MPEG4.jar b/Agent-Output/bin/lib/MPEG4.jar
index 88ab257..80c527b 100644
Binary files a/Agent-Output/bin/lib/MPEG4.jar and b/Agent-Output/bin/lib/MPEG4.jar differ
diff --git a/Agent-Output/bin/lib/Signals.jar b/Agent-Output/bin/lib/Signals.jar
index 8f7a243..fd99f77 100644
Binary files a/Agent-Output/bin/lib/Signals.jar and b/Agent-Output/bin/lib/Signals.jar differ
diff --git a/Agent-Output/bin/lib/SpeechRecognition.jar b/Agent-Output/bin/lib/SpeechRecognition.jar
index 4d39ef2..371fbe1 100644
Binary files a/Agent-Output/bin/lib/SpeechRecognition.jar and b/Agent-Output/bin/lib/SpeechRecognition.jar differ
diff --git a/Agent-Output/bin/lib/Util.jar b/Agent-Output/bin/lib/Util.jar
index a58547b..2282f64 100644
Binary files a/Agent-Output/bin/lib/Util.jar and b/Agent-Output/bin/lib/Util.jar differ
diff --git a/Agent-Output/bin/lib/Utilx.jar b/Agent-Output/bin/lib/Utilx.jar
index a84bd5c..f7b049a 100644
Binary files a/Agent-Output/bin/lib/Utilx.jar and b/Agent-Output/bin/lib/Utilx.jar differ
diff --git a/Agent-Output/bin/vib.ini b/Agent-Output/bin/vib.ini
index f2599ad..5167092 100644
--- a/Agent-Output/bin/vib.ini
+++ b/Agent-Output/bin/vib.ini
@@ -67,7 +67,9 @@ OGRE_BASE_SHADER = Basic
# environment file :
# ENVIRONMENT = ./empty.xml
-ENVIRONMENT = ./environment-ARIADemo.xml
+#ENVIRONMENT = ./office.xml
+ENVIRONMENT = ./environment-ARIADemo1.xml
+#ENVIRONMENT = ./environment-ARIADemo2.xml
# 4 possible values mono, stereo, stereo+, no. Unknown value will be concidered as no
AUDIO_3D = stereo+
@@ -89,4 +91,4 @@ CEREPROC_VOICES_PATH=/Common/Data/Cereproc/
FML_END_TAG_AS_DURATION = false
BML_END_TAG_AS_DURATION = false
-DISCO_FML_PATH = ./Projects/ARIA-VALUSPA
+DISCO_FML_PATH = ./
diff --git a/Agent-Output/nbproject/project.properties b/Agent-Output/nbproject/project.properties
index 416ba8f..cd60fdf 100644
--- a/Agent-Output/nbproject/project.properties
+++ b/Agent-Output/nbproject/project.properties
@@ -37,7 +37,7 @@ file.reference.AnimationCore.jar=bin/Common/Lib/Internal/AnimationCore.jar
file.reference.AnimationDynamics.jar=bin/Common/Lib/Internal/AnimationDynamics.jar
file.reference.annotations-2.0.jar=bin/Common/Lib/External/annotations-2.0.jar
file.reference.aria-fml-translator.jar=bin/Common/Lib/External/aria-fml-translator.jar
-file.reference.AriaValuspaFMLTranslator.jar=bin/Common/Lib/Internal/AriaValuspaFMLTranslator.jar
+file.reference.AriaValuspa.jar=bin/Common/Lib/Internal/AriaValuspa.jar
file.reference.BAP2BVHConverter.jar=bin/Common/Lib/Internal/BAP2BVHConverter.jar
file.reference.beansbinding-1.2.1.jar=bin/Common/Lib/External/beansbinding-1.2.1.jar
file.reference.BehaviorPlanner.jar=bin/Common/Lib/Internal/BehaviorPlanner.jar
@@ -65,6 +65,7 @@ file.reference.httpclient-4.3.4.jar=bin/Common/Lib/External/Thrift/httpclient-4.
file.reference.httpcore-4.3.2.jar=bin/Common/Lib/External/Thrift/httpcore-4.3.2.jar
file.reference.IntentionPlanner.jar=bin/Common/Lib/Internal/IntentionPlanner.jar
file.reference.Intentions.jar=bin/Common/Lib/Internal/Intentions.jar
+file.reference.Interruptions.jar=bin/Common/Lib/Internal/Interruptions.jar
file.reference.javaFlacEncoder-0.3.1.jar=bin/Common/Lib/External/javaFlacEncoder-0.3.1.jar
file.reference.jcip-annotations-1.0.jar=bin/Common/Lib/External/jcip-annotations-1.0.jar
file.reference.jcommon-1.0.23.jar=bin/Common/Lib/External/jcommon-1.0.23.jar
@@ -119,8 +120,8 @@ javac.classpath=\
${file.reference.ActiveMQ.jar}:\
${file.reference.AnimationCore.jar}:\
${file.reference.AnimationDynamics.jar}:\
- ${file.reference.AriaValuspaFMLTranslator.jar}:\
${file.reference.BAP2BVHConverter.jar}:\
+ ${file.reference.AriaValuspa.jar}:\
${file.reference.BehaviorPlanner.jar}:\
${file.reference.BehaviorRealizer.jar}:\
${file.reference.BodyAnimationPerformer.jar}:\
@@ -196,7 +197,8 @@ javac.classpath=\
${file.reference.Thrift.jar}:\
${file.reference.Util.jar}:\
${file.reference.Utilx.jar}:\
- ${file.reference.openMary.jar}
+ ${file.reference.openMary.jar}:\
+ ${file.reference.Interruptions.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
diff --git a/Agent-Output/src/eu/aria/output/Greta.java b/Agent-Output/src/eu/aria/output/Greta.java
index 47d3b45..3c5ac10 100644
--- a/Agent-Output/src/eu/aria/output/Greta.java
+++ b/Agent-Output/src/eu/aria/output/Greta.java
@@ -1,5 +1,18 @@
package eu.aria.output;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import javax.swing.WindowConstants;
+import vib.application.ariavaluspa.core.ARIAInformationStatesManager;
+import vib.application.ariavaluspa.tools.ARIAInformationStatesSelectorForm;
import vib.auxiliary.activemq.gui.WhitboardFrame;
import vib.auxiliary.activemq.semaine.BMLCallbacksSender;
import vib.auxiliary.activemq.semaine.FMLReceiver;
@@ -12,23 +25,20 @@
import vib.core.animation.performer.BodyAnimationNoiseGenerator;
import vib.core.behaviorplanner.Planner;
import vib.core.behaviorrealizer.Realizer;
+import vib.core.interruptions.InterruptionManager;
import vib.core.keyframes.AudioKeyFramePerformer;
import vib.core.keyframes.face.FaceKeyframePerformer;
import vib.core.keyframes.face.SimpleAUPerformer;
import vib.core.util.IniManager;
import vib.core.util.environment.Environment;
+import vib.core.util.math.Quaternion;
import vib.core.utilx.gui.TTSController;
-import javax.swing.*;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import vib.core.util.math.Quaternion;
+
/**
* Created by adg on 17/08/2016.
+ * Modified by Angelo Cafaro on 19/06/2017
*
*/
public class Greta {
@@ -41,7 +51,86 @@ public void init(IniManager initManager) {
} catch (IOException e) {
System.out.println("WARNING: Failed to modify Plugins_OpenGL.cfg");
}
+
+ if ("living-actor".equalsIgnoreCase(initManager.getValueString("System.animEngine"))) {
+ initLivingActor(initManager);
+ } else {
+ initGreta(initManager);
+ }
+ }
+
+ private void initLivingActor(IniManager initManager) {
+ // Init the Intention Planner
+ Planner behaviorPlanner = new Planner();
+
+ // Init the TTS
+ TTSController tTS = new TTSController();
+ tTS.setDoTemporize(true);
+ tTS.setDoAudio(true);
+ tTS.setDoPhonemes(true);
+ tTS.dispose();
+
+ // Instantiate the specific TTS (Cereproc)
+ CereprocTTS cereproc_TTS = new CereprocTTS();
+
+ // Creates the Interruption Manager
+ //InterruptionManager interruptionManager = new InterruptionManager();
+
+ // Create the ActiveMQ FML Receiver
+ FMLReceiver amqFMLReceiver = new FMLReceiver();
+ amqFMLReceiver.setHost(initManager.getValueString("FMLReceiver.host"));
+ amqFMLReceiver.setPort(initManager.getValueString("FMLReceiver.port"));
+ amqFMLReceiver.setTopic(initManager.getValueString("FMLReceiver.topic"));
+ amqFMLReceiver.setIsQueue(initManager.getValueBoolean("FMLReceiver.isQueue"));
+ WhitboardFrame amqFMLReceiverModuleFrame = new WhitboardFrame();
+ amqFMLReceiverModuleFrame.setWhitboard(amqFMLReceiver);
+ if(icon!=null){amqFMLReceiverModuleFrame.setIconImage(icon);}
+ amqFMLReceiverModuleFrame.setTitle("FML Receiver");
+ amqFMLReceiverModuleFrame.setLocation(1082, 10);
+ amqFMLReceiverModuleFrame.setSize(260, 240);
+ amqFMLReceiverModuleFrame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+ amqFMLReceiverModuleFrame.setVisible(true);
+
+ // Create the ActiveMQ BML Sender
+ vib.auxiliary.activemq.semaine.BMLSender amqBMLSender = new vib.auxiliary.activemq.semaine.BMLSender();
+ amqBMLSender.setHost(initManager.getValueString("BMLSender.host"));
+ amqBMLSender.setPort(initManager.getValueString("BMLSender.port"));
+ amqBMLSender.setTopic(initManager.getValueString("BMLSender.topic"));
+ amqBMLSender.setIsQueue(initManager.getValueBoolean("BMLSender.isQueue"));
+ WhitboardFrame amqBMLSenderModuleFrame = new WhitboardFrame();
+ amqBMLSenderModuleFrame.setWhitboard(amqBMLSender);
+ if(icon!=null){amqBMLSenderModuleFrame.setIconImage(icon);}
+ amqBMLSenderModuleFrame.setTitle("BML Sender");
+ amqBMLSenderModuleFrame.setLocation(1382, 40);
+ amqBMLSenderModuleFrame.setSize(260, 240);
+ amqBMLSenderModuleFrame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+ amqBMLSenderModuleFrame.setVisible(true);
+
+ // Create the ActiveMQ BML Feedback Receiver
+ vib.auxiliary.activemq.semaine.BMLCallbacksReceiver amqBMLCallbacksReceiver = new vib.auxiliary.activemq.semaine.BMLCallbacksReceiver();
+ amqBMLCallbacksReceiver.setHost(initManager.getValueString("BMLFeedbackReceiver.host"));
+ amqBMLCallbacksReceiver.setPort(initManager.getValueString("BMLFeedbackReceiver.port"));
+ amqBMLCallbacksReceiver.setTopic(initManager.getValueString("BMLFeedbackReceiver.topic"));
+ amqBMLCallbacksReceiver.setIsQueue(initManager.getValueBoolean("BMLFeedbackReceiver.isQueue"));
+ WhitboardFrame amqBMLCallbacksReceiverModuleFrame = new WhitboardFrame();
+ amqBMLCallbacksReceiverModuleFrame.setWhitboard(amqBMLCallbacksReceiver);
+ if(icon!=null){amqBMLCallbacksReceiverModuleFrame.setIconImage(icon);}
+ amqBMLCallbacksReceiverModuleFrame.setTitle("BML Feedback Receiver");
+ amqBMLCallbacksReceiverModuleFrame.setLocation(1382, 40);
+ amqBMLCallbacksReceiverModuleFrame.setSize(260, 240);
+ amqBMLCallbacksReceiverModuleFrame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+ amqBMLCallbacksReceiverModuleFrame.setVisible(true);
+
+ // Connect the modules
+ tTS.setTTS(cereproc_TTS);
+ //behaviorPlanner.addSignalPerformer(bmlSenderThrift);
+ behaviorPlanner.addSignalPerformer(amqBMLSender);
+ //interruptionManager.addIntentionPerformer(behaviorPlanner);
+ //amqFMLReceiver.addIntentionPerformer(interruptionManager);
+ //amqBMLCallbacksReceiver.addCallbackPerformer(interruptionManager);
+ }
+ private void initGreta(IniManager iniManager) {
// Init the Intention Planner
Planner behaviorPlanner = new Planner();
@@ -65,20 +154,20 @@ public void init(IniManager initManager) {
AudioKeyFramePerformer audioKeyframePerformer = new AudioKeyFramePerformer();
// Init the Environment Manager
- Environment environment = new Environment(initManager.getValueString("Environment"));
+ Environment environment = new Environment(iniManager.getValueString("Environment"));
// Init the Ogre3D Player
OgreFrame playerOgre = new OgreFrame();
- playerOgre.setCameraPositionX(initManager.getValueDouble("Camera.posX"));
- playerOgre.setCameraPositionY(initManager.getValueDouble("Camera.posY"));
- playerOgre.setCameraPositionZ(initManager.getValueDouble("Camera.posZ"));
- playerOgre.setCameraPitch(Math.toRadians(initManager.getValueDouble("Camera.pitch")));
- playerOgre.setCameraYaw(Math.toRadians(initManager.getValueDouble("Camera.yaw")));
- playerOgre.setCameraRoll(Math.toRadians(initManager.getValueDouble("Camera.roll")));
+ playerOgre.setCameraPositionX(iniManager.getValueDouble("Camera.posX"));
+ playerOgre.setCameraPositionY(iniManager.getValueDouble("Camera.posY"));
+ playerOgre.setCameraPositionZ(iniManager.getValueDouble("Camera.posZ"));
+ playerOgre.setCameraPitch(Math.toRadians(iniManager.getValueDouble("Camera.pitch")));
+ playerOgre.setCameraYaw(Math.toRadians(iniManager.getValueDouble("Camera.yaw")));
+ playerOgre.setCameraRoll(Math.toRadians(iniManager.getValueDouble("Camera.roll")));
if(icon!=null){playerOgre.setIconImage(icon);}
playerOgre.setTitle("PlayerOgre");
- playerOgre.setLocation(initManager.getValueInt("Player.window.x"), initManager.getValueInt("Player.window.y"));
- playerOgre.setSize(initManager.getValueInt("Player.window.width"), initManager.getValueInt("Player.window.height"));
+ playerOgre.setLocation(iniManager.getValueInt("Player.window.x"), iniManager.getValueInt("Player.window.y"));
+ playerOgre.setSize(iniManager.getValueInt("Player.window.width"), iniManager.getValueInt("Player.window.height"));
playerOgre.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
playerOgre.setVisible(true);
@@ -94,30 +183,45 @@ public void init(IniManager initManager) {
// Init the Mpeg4 Animation Table
MPEG4Animatable mPEG4Animatable = new MPEG4Animatable();
- mPEG4Animatable.setCoordinateX(initManager.getValueDouble("Agent.posX"));
- mPEG4Animatable.setCoordinateY(initManager.getValueDouble("Agent.posY"));
- mPEG4Animatable.setCoordinateZ(initManager.getValueDouble("Agent.posZ"));
+ mPEG4Animatable.setCoordinateX(iniManager.getValueDouble("Agent.posX"));
+ mPEG4Animatable.setCoordinateY(iniManager.getValueDouble("Agent.posY"));
+ mPEG4Animatable.setCoordinateZ(iniManager.getValueDouble("Agent.posZ"));
- Quaternion agentOri = Quaternion.fromXYZInDegrees(initManager.getValueDouble("Agent.rotX"),
- initManager.getValueDouble("Agent.rotY"),
- initManager.getValueDouble("Agent.rotZ"));
+ Quaternion agentOri = Quaternion.fromXYZInDegrees(iniManager.getValueDouble("Agent.rotX"),
+ iniManager.getValueDouble("Agent.rotY"),
+ iniManager.getValueDouble("Agent.rotZ"));
mPEG4Animatable.setOrientation(agentOri);
- mPEG4Animatable.setScaleX(initManager.getValueDouble("Agent.scaleX"));
- mPEG4Animatable.setScaleY(initManager.getValueDouble("Agent.scaleY"));
- mPEG4Animatable.setScaleZ(initManager.getValueDouble("Agent.scaleZ"));
+ mPEG4Animatable.setScaleX(iniManager.getValueDouble("Agent.scaleX"));
+ mPEG4Animatable.setScaleY(iniManager.getValueDouble("Agent.scaleY"));
+ mPEG4Animatable.setScaleZ(iniManager.getValueDouble("Agent.scaleZ"));
// Init the Animation Key Frame Perfomer
AnimationKeyframePerformer animationKeyframePerformer = new AnimationKeyframePerformer();
animationKeyframePerformer.setUsePropagation(true);
animationKeyframePerformer.setWeightPropagation(0.2);
+ // Creates the Interruption Manager
+ InterruptionManager interruptionManager = new InterruptionManager();
+
+ // Creates the ARIA Information States Manager
+ ARIAInformationStatesManager ariaInfoStateManager = new ARIAInformationStatesManager();
+
+ // Creates the ARIA Information States Tester
+ ARIAInformationStatesSelectorForm ariaInfoStateManagerForm = new ARIAInformationStatesSelectorForm();
+ if(icon!=null){ariaInfoStateManagerForm.setIconImage(icon);}
+ ariaInfoStateManagerForm.setTitle("ARIA Information State Changer");
+ ariaInfoStateManagerForm.setLocation(400, 600);
+ ariaInfoStateManagerForm.setSize(400, 150);
+ ariaInfoStateManagerForm.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+ ariaInfoStateManagerForm.setVisible(iniManager.getValueBoolean("ARIAInformationStateTester.visible"));
+
// Create the ActiveMQ FML Receiver
FMLReceiver amqFMLReceiver = new FMLReceiver();
- amqFMLReceiver.setHost(initManager.getValueString("FMLReceiver.host"));
- amqFMLReceiver.setPort(initManager.getValueString("FMLReceiver.port"));
- amqFMLReceiver.setTopic(initManager.getValueString("FMLReceiver.topic"));
- amqFMLReceiver.setIsQueue(initManager.getValueBoolean("FMLReceiver.isQueue"));
+ amqFMLReceiver.setHost(iniManager.getValueString("FMLReceiver.host"));
+ amqFMLReceiver.setPort(iniManager.getValueString("FMLReceiver.port"));
+ amqFMLReceiver.setTopic(iniManager.getValueString("FMLReceiver.topic"));
+ amqFMLReceiver.setIsQueue(iniManager.getValueBoolean("FMLReceiver.isQueue"));
WhitboardFrame amqFMLReceiverModuleFrame = new WhitboardFrame();
amqFMLReceiverModuleFrame.setWhitboard(amqFMLReceiver);
if(icon!=null){amqFMLReceiverModuleFrame.setIconImage(icon);}
@@ -125,14 +229,14 @@ public void init(IniManager initManager) {
amqFMLReceiverModuleFrame.setLocation(1082, 10);
amqFMLReceiverModuleFrame.setSize(260, 240);
amqFMLReceiverModuleFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- amqFMLReceiverModuleFrame.setVisible(initManager.getValueBoolean("WhiteBoard.visible"));
+ amqFMLReceiverModuleFrame.setVisible(iniManager.getValueBoolean("WhiteBoard.visible"));
// Create the ActiveMQ BML Feedback Sender
BMLCallbacksSender amqBMLCallbacksSender = new BMLCallbacksSender();
- amqBMLCallbacksSender.setHost(initManager.getValueString("BMLFeedbackSender.host"));
- amqBMLCallbacksSender.setPort(initManager.getValueString("BMLFeedbackSender.port"));
- amqBMLCallbacksSender.setTopic(initManager.getValueString("BMLFeedbackSender.topic"));
- amqBMLCallbacksSender.setIsQueue(initManager.getValueBoolean("BMLFeedbackSender.isQueue"));
+ amqBMLCallbacksSender.setHost(iniManager.getValueString("BMLFeedbackSender.host"));
+ amqBMLCallbacksSender.setPort(iniManager.getValueString("BMLFeedbackSender.port"));
+ amqBMLCallbacksSender.setTopic(iniManager.getValueString("BMLFeedbackSender.topic"));
+ amqBMLCallbacksSender.setIsQueue(iniManager.getValueBoolean("BMLFeedbackSender.isQueue"));
WhitboardFrame amqBMLCallbacksSenderModuleFrame = new WhitboardFrame();
amqBMLCallbacksSenderModuleFrame.setWhitboard(amqBMLCallbacksSender);
if(icon!=null){amqBMLCallbacksSenderModuleFrame.setIconImage(icon);}
@@ -140,14 +244,14 @@ public void init(IniManager initManager) {
amqBMLCallbacksSenderModuleFrame.setLocation(1382, 10);
amqBMLCallbacksSenderModuleFrame.setSize(260, 240);
amqBMLCallbacksSenderModuleFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- amqBMLCallbacksSenderModuleFrame.setVisible(initManager.getValueBoolean("WhiteBoard.visible"));
+ amqBMLCallbacksSenderModuleFrame.setVisible(iniManager.getValueBoolean("WhiteBoard.visible"));
// Create the ActiveMQ BML Sender
vib.auxiliary.activemq.semaine.BMLSender amqBMLSender = new vib.auxiliary.activemq.semaine.BMLSender();
- amqBMLSender.setHost(initManager.getValueString("BMLSender.host"));
- amqBMLSender.setPort(initManager.getValueString("BMLSender.port"));
- amqBMLSender.setTopic(initManager.getValueString("BMLSender.topic"));
- amqBMLSender.setIsQueue(initManager.getValueBoolean("BMLSender.isQueue"));
+ amqBMLSender.setHost(iniManager.getValueString("BMLSender.host"));
+ amqBMLSender.setPort(iniManager.getValueString("BMLSender.port"));
+ amqBMLSender.setTopic(iniManager.getValueString("BMLSender.topic"));
+ amqBMLSender.setIsQueue(iniManager.getValueBoolean("BMLSender.isQueue"));
WhitboardFrame amqBMLSenderModuleFrame = new WhitboardFrame();
amqBMLSenderModuleFrame.setWhitboard(amqBMLSender);
if(icon!=null){amqBMLSenderModuleFrame.setIconImage(icon);}
@@ -155,7 +259,37 @@ public void init(IniManager initManager) {
amqBMLSenderModuleFrame.setLocation(1382, 40);
amqBMLSenderModuleFrame.setSize(260, 240);
amqBMLSenderModuleFrame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
- amqBMLSenderModuleFrame.setVisible(initManager.getValueBoolean("WhiteBoard.visible"));
+ amqBMLSenderModuleFrame.setVisible(iniManager.getValueBoolean("WhiteBoard.visible"));
+
+ // Create the ActiveMQ BML Receiver
+ vib.auxiliary.activemq.semaine.BMLReceiver amqBMLReceiver = new vib.auxiliary.activemq.semaine.BMLReceiver();
+ amqBMLReceiver.setHost(iniManager.getValueString("BMLReceiver.host"));
+ amqBMLReceiver.setPort(iniManager.getValueString("BMLReceiver.port"));
+ amqBMLReceiver.setTopic(iniManager.getValueString("BMLReceiver.topic"));
+ amqBMLReceiver.setIsQueue(iniManager.getValueBoolean("BMLReceiver.isQueue"));
+ WhitboardFrame amqBMLReceiverModuleFrame = new WhitboardFrame();
+ amqBMLReceiverModuleFrame.setWhitboard(amqBMLReceiver);
+ if(icon!=null){amqBMLReceiverModuleFrame.setIconImage(icon);}
+ amqBMLReceiverModuleFrame.setTitle("BML Receiver");
+ amqBMLReceiverModuleFrame.setLocation(1382, 80);
+ amqBMLReceiverModuleFrame.setSize(260, 240);
+ amqBMLReceiverModuleFrame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+ amqBMLReceiverModuleFrame.setVisible(iniManager.getValueBoolean("WhiteBoard.visible"));
+
+ // Create the ActiveMQ Information States Receiver
+ vib.auxiliary.activemq.aria.ARIAInformationStateReceiver amqARIAInfoStateReceiver = new vib.auxiliary.activemq.aria.ARIAInformationStateReceiver();
+ amqARIAInfoStateReceiver.setHost(iniManager.getValueString("ARIAInfoStateReceiver.host"));
+ amqARIAInfoStateReceiver.setPort(iniManager.getValueString("ARIAInfoStateReceiver.port"));
+ amqARIAInfoStateReceiver.setTopic(iniManager.getValueString("ARIAInfoStateReceiver.topic"));
+ amqARIAInfoStateReceiver.setIsQueue(iniManager.getValueBoolean("ARIAInfoStateReceiver.isQueue"));
+ WhitboardFrame amqARIAInfoStateReceiverModuleFrame = new WhitboardFrame();
+ amqARIAInfoStateReceiverModuleFrame.setWhitboard(amqARIAInfoStateReceiver);
+ if(icon!=null){amqBMLReceiverModuleFrame.setIconImage(icon);}
+ amqARIAInfoStateReceiverModuleFrame.setTitle("ARIA Information State Receiver");
+ amqARIAInfoStateReceiverModuleFrame.setLocation(900, 100);
+ amqARIAInfoStateReceiverModuleFrame.setSize(260, 240);
+ amqARIAInfoStateReceiverModuleFrame.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+ amqARIAInfoStateReceiverModuleFrame.setVisible(false);
// Create a body animation noise generator
BodyAnimationNoiseGenerator bodyNoiseGenerator = new BodyAnimationNoiseGenerator();
@@ -182,10 +316,18 @@ public void init(IniManager initManager) {
behaviorPlanner.addSignalPerformer(behaviorRealizer);
behaviorPlanner.addSignalPerformer(amqBMLSender);
bodyNoiseGenerator.addBAPFramesPerformer(mPEG4Animatable);
- amqFMLReceiver.addIntentionPerformer(behaviorPlanner);
+ amqFMLReceiver.addIntentionPerformer(interruptionManager);
behaviorRealizer.addCallbackPerformer(amqBMLCallbacksSender);
+ behaviorRealizer.addCallbackPerformer(interruptionManager);
+ interruptionManager.addIntentionPerformer(behaviorPlanner);
+ behaviorRealizer.setEnvironment(environment);
+ interruptionManager.addSignalPerformer(behaviorRealizer);
+ ariaInfoStateManager.setEnvironment(environment);
+ ariaInfoStateManager.addSignalPerformer(behaviorRealizer);
+ ariaInfoStateManagerForm.setARIAInformationStateManager(ariaInfoStateManager);
+ amqARIAInfoStateReceiver.addARIAInformationStatePerformer(ariaInfoStateManager);
}
-
+
private static boolean updatePluginsCfg() throws IOException {
final String HEADER = "PluginFolder=";
final String FILE = "Player\\Lib\\External\\Win64\\Plugins_OpenGL.cfg";
diff --git a/External/apache-activemq-5.12.1/conf/activemq.xml b/External/apache-activemq-5.12.1/conf/activemq.xml
index d027dc8..301f10e 100644
--- a/External/apache-activemq-5.12.1/conf/activemq.xml
+++ b/External/apache-activemq-5.12.1/conf/activemq.xml
@@ -110,11 +110,11 @@
-->
-
diff --git a/External/apache-activemq-5.12.1/data/kahadb/db.data b/External/apache-activemq-5.12.1/data/kahadb/db.data
index a159c38..08b52c1 100644
Binary files a/External/apache-activemq-5.12.1/data/kahadb/db.data and b/External/apache-activemq-5.12.1/data/kahadb/db.data differ
diff --git a/External/apache-activemq-5.12.1/data/kahadb/db.redo b/External/apache-activemq-5.12.1/data/kahadb/db.redo
index a2579f6..09900f7 100644
Binary files a/External/apache-activemq-5.12.1/data/kahadb/db.redo and b/External/apache-activemq-5.12.1/data/kahadb/db.redo differ
diff --git a/External/apache-activemq-5.12.1/data/kahadb/lock b/External/apache-activemq-5.12.1/data/kahadb/lock
index f484f6c..17a5193 100644
Binary files a/External/apache-activemq-5.12.1/data/kahadb/lock and b/External/apache-activemq-5.12.1/data/kahadb/lock differ
diff --git a/Launcher/bin/_hashlib.pyd b/Launcher/bin/_hashlib.pyd
index 94a7f01..aaa34bd 100644
Binary files a/Launcher/bin/_hashlib.pyd and b/Launcher/bin/_hashlib.pyd differ
diff --git a/Launcher/bin/_socket.pyd b/Launcher/bin/_socket.pyd
index 91b2aba..8c83530 100644
Binary files a/Launcher/bin/_socket.pyd and b/Launcher/bin/_socket.pyd differ
diff --git a/Launcher/bin/_ssl.pyd b/Launcher/bin/_ssl.pyd
index 7f05606..3aff584 100644
Binary files a/Launcher/bin/_ssl.pyd and b/Launcher/bin/_ssl.pyd differ
diff --git a/Launcher/bin/launcher.exe b/Launcher/bin/launcher.exe
index 096220f..2d69daa 100644
Binary files a/Launcher/bin/launcher.exe and b/Launcher/bin/launcher.exe differ
diff --git a/Launcher/bin/pyexpat.pyd b/Launcher/bin/pyexpat.pyd
index 2c1aba0..226e0de 100644
Binary files a/Launcher/bin/pyexpat.pyd and b/Launcher/bin/pyexpat.pyd differ
diff --git a/Launcher/bin/select.pyd b/Launcher/bin/select.pyd
index f24f499..87edf0b 100644
Binary files a/Launcher/bin/select.pyd and b/Launcher/bin/select.pyd differ
diff --git a/Launcher/bin/unicodedata.pyd b/Launcher/bin/unicodedata.pyd
index 96022ba..6dbe1e4 100644
Binary files a/Launcher/bin/unicodedata.pyd and b/Launcher/bin/unicodedata.pyd differ
diff --git a/Launcher/bin/wx._core.pyd b/Launcher/bin/wx._core.pyd
index db45626..6cfb26f 100644
Binary files a/Launcher/bin/wx._core.pyd and b/Launcher/bin/wx._core.pyd differ
diff --git a/Launcher/bin/wx.siplib.pyd b/Launcher/bin/wx.siplib.pyd
index f430b37..f9b2c4f 100644
Binary files a/Launcher/bin/wx.siplib.pyd and b/Launcher/bin/wx.siplib.pyd differ
diff --git a/Launcher/config/config-Greta.xml b/Launcher/config/config-Greta.xml
index 24cda1e..517c8e9 100644
--- a/Launcher/config/config-Greta.xml
+++ b/Launcher/config/config-Greta.xml
@@ -9,5 +9,9 @@
true
false
+
+ GRETA
+ LIVING-ACTOR
+
\ No newline at end of file
diff --git a/Launcher/config/config-SSI-Greta.xml b/Launcher/config/config-SSI-Greta.xml
index 351d37b..72cd8cc 100644
--- a/Launcher/config/config-SSI-Greta.xml
+++ b/Launcher/config/config-SSI-Greta.xml
@@ -24,5 +24,9 @@
true
false
+
+ GRETA
+ LIVING-ACTOR
+
\ No newline at end of file
diff --git a/Launcher/config/config-all-new.xml b/Launcher/config/config-all-new.xml
index 03b02f7..d10967c 100644
--- a/Launcher/config/config-all-new.xml
+++ b/Launcher/config/config-all-new.xml
@@ -5,13 +5,26 @@
-debug
ssi.log
all-in-one
-
+
+
+ true
+ false
+
+
+
GPU
CPU
+
+ true
+ false
+
+
@@ -29,5 +42,9 @@
true
false
+
+ GRETA
+ LIVING-ACTOR
+
\ No newline at end of file
diff --git a/Launcher/config/config-all.xml b/Launcher/config/config-all.xml
index 9b2f00d..ef1c978 100644
--- a/Launcher/config/config-all.xml
+++ b/Launcher/config/config-all.xml
@@ -29,5 +29,9 @@
true
false
+
+ GRETA
+ LIVING-ACTOR
+
\ No newline at end of file
diff --git a/RunMeFirst/README b/RunMeFirst/README
new file mode 100644
index 0000000..6914d36
--- /dev/null
+++ b/RunMeFirst/README
@@ -0,0 +1,14 @@
+Run the get_models script in this directory to get external files:
+ - TTS voices
+ - SSI models
+
+To get the ASR server, you have the choice of downloading a pre-built setup for VMware at https://hcm-lab.de/cloud/index.php/s/r6x9ha8XD3YJNzn (password: Wonderland2016), or you can use Vagrant to build it for you:
+ - Install vagrant (https://www.vagrantup.com/downloads.html)
+ - Install virtualBox (https://www.virtualbox.org/wiki/Downloads) - or VMware Fusion if you really like it
+ - Run "vagrant up" in this directory
+ - To login use: vagrant / vagrant
+ - The ip address is: 192.168.33.10
+ - English ASR runs on port 8888
+ - German ASR runs on port 9999
+
+The second option requires much less download, is much easier to maintain, occupies less space, only uses free and open source products, but it will take more time to setup (about 1/2 hour on a fast machine).
diff --git a/RunMeFirst/Vagrantfile b/RunMeFirst/Vagrantfile
new file mode 100644
index 0000000..107c9bb
--- /dev/null
+++ b/RunMeFirst/Vagrantfile
@@ -0,0 +1,131 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+ # The most common configuration options are documented and commented below.
+ # For a complete reference, please see the online documentation at
+ # https://docs.vagrantup.com.
+
+ # Every Vagrant development environment requires a box. You can search for
+ # boxes at https://atlas.hashicorp.com/search.
+ config.vm.box = "ubuntu/trusty64"
+ # config.vm.box = "ubuntu/trusty32"
+
+ # Disable automatic box update checking. If you disable this, then
+ # boxes will only be checked for updates when the user runs
+ # `vagrant box outdated`. This is not recommended.
+ # config.vm.box_check_update = false
+
+ # Create a forwarded port mapping which allows access to a specific port
+ # within the machine from a port on the host machine. In the example below,
+ # accessing "localhost:8080" will access port 80 on the guest machine.
+ # Forward port 8888 to English ASR
+ config.vm.network "forwarded_port", guest: 8888, host: 8888, host_ip: "127.0.0.1"
+ # Forward port 9999 to German ASR
+ config.vm.network "forwarded_port", guest: 9999, host: 9999, host_ip: "127.0.0.1"
+
+ # Create a private network, which allows host-only access to the machine
+ # using a specific IP.
+ config.vm.network "private_network", ip: "192.168.33.10"
+
+ # Create a public network, which generally matched to bridged network.
+ # Bridged networks make the machine appear as another physical device on
+ # your network.
+ # config.vm.network "public_network"
+
+ # Share an additional folder to the guest VM. The first argument is
+ # the path on the host to the actual folder. The second argument is
+ # the path on the guest to mount the folder. And the optional third
+ # argument is a set of non-required options.
+ # config.vm.synced_folder "../data", "/vagrant_data"
+
+ # Provider-specific configuration so you can fine-tune various
+ # backing providers for Vagrant. These expose provider-specific options.
+ # Example for VirtualBox:
+ #
+ config.vm.provider "virtualbox" do |vb|
+ # # Display the VirtualBox GUI when booting the machine
+ # vb.gui = true
+ vb.name = "aria-asr"
+ vb.memory = "4096"
+ vb.cpus = 2
+ end
+
+ config.vm.provider "vmware_fusion" do |v|
+ v.vmx["name"] = "aria-asr"
+ v.vmx["memsize"] = "4096"
+ v.vmx["numvcpus"] = "2"
+ end
+ #
+ # View the documentation for the provider you are using for more
+ # information on available options.
+
+ # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+ # such as FTP and Heroku are also available. See the documentation at
+ # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+ # config.push.define "atlas" do |push|
+ # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+ # end
+
+ # Rather bad: private key for accessing github
+ config.vm.provision "file", preserve_order: true, source: "id_rsa_aria_git", destination: "~/.ssh/id_rsa"
+
+ # Rather ugly: fully automated script downloading / building / configuring the latest ASR server.
+ # CUDA support is built in, but require to manually install the guest additions for 3D acceleration from virtual box or
+ # vmware to actually make any difference.
+ config.vm.provision "shell", preserve_order: true, name: "setup", privileged: false, inline: <<-SHELL
+ su vagrant
+ sudo apt-get update
+ # dependencies
+ echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+ #echo "|1|mN3AReUW5Lds2lHNc8TIccQ0RqA=|Yw4USIiwPvQjZJhTcbGd/fyu3K4= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts
+ sudo apt-get install -y g++ zlib1g-dev unzip make gcc automake autoconf libtool git bzip2 wget curl subversion gawk python2.7 libatlas3-base nvidia-cuda-toolkit
+ #wget -q https://s3-eu-west-1.amazonaws.com/aria-agent/kaldi.tgz -O - | tar xz
+ # the latest version of kaldi is now supported
+ git clone https://github.com/kaldi-asr/kaldi.git
+ # download latest ASR server code
+ git clone git@github.com:ARIA-VALUSPA/ARIA-ICL.git
+ mv ARIA-ICL/Module-ASR/ .
+ rm -rf ARIA-ICL
+ cp Module-ASR/src/online-tcp-* kaldi/src/online2
+ cp Module-ASR/src/online2-* kaldi/src/online2bin
+ # Apply patch
+ (cd kaldi; patch -p1 < ../Module-ASR/src/kaldi.patch)
+ # download ASR models in background
+ wget -q -O ARIA-ICL.Module-ASR.models.de.zip "https://aria-tmp.s3.amazonaws.com/ARIA-ICL.Module-ASR.models.de_2017-06-06.zip?Signature=Hv%2F9eXyhkPKxUu10xxNT%2Fj1SZL0%3D&Expires=1511999844&AWSAccessKeyId=AKIAI5SVOVTJBC4CU6AQ"; unzip ARIA-ICL.Module-ASR.models.de.zip; rm -f ARIA-ICL.Module-ASR.models.de.zip
+ wget -q -O ARIA-ICL.Module-ASR.models.en.zip "https://aria-tmp.s3.amazonaws.com/ARIA-ICL.Module-ASR.models.en_2017-03-01.zip?Signature=7ms9GMXj9saNp3alvQh9fIDk63w%3D&Expires=1512000008&AWSAccessKeyId=AKIAI5SVOVTJBC4CU6AQ"; unzip ARIA-ICL.Module-ASR.models.en.zip; rm -f ARIA-ICL.Module-ASR.models.en.zip
+ #tar xzf kaldi.tgz
+ cd kaldi/tools/
+ echo "Building kaldi tools"
+ make -j4 > /dev/null 2>&1
+ cd ../src/
+ echo "Building kaldi..."
+ ./configure --shared > /dev/null
+ # Manually patch compilation options
+ echo "CXXFLAGS += -O4 -mtune=native -DKALDI_NO_PORTAUDIO" >> kaldi.mk
+ make depend > /dev/null
+ make -j2 online2bin > /dev/null
+ # Wait until we have fully downloaded the models
+ wait
+ # link models
+ cd ~/
+ rm -rf Module-ASR/models/{en,de}
+ ln -sf ../../aria-models+mpe Module-ASR/models/de
+ ln -sf ../../ARIA-ICL.Module-ASR.models.en_01-03-2017 Module-ASR/models/en
+ SHELL
+ # This script is always run, unlike the previous one which is only run during the first up
+ # This only starts the ASR servers
+ config.vm.provision "shell", name: "launch ASR", run: "always", privileged: false, inline: <<-SHELL
+ # Start English and German ASR
+ echo "Starting English ASR..."
+ cd Module-ASR/run
+ until ./launch-asr.sh --bin_root ../../kaldi/src/online2bin/ --lang en --socket 8888; do
+ echo "Respawning crashed server..."; sleep 3;
+ done
+ echo 'All done!'
+ SHELL
+end
diff --git a/RunMeFirst/get_models.sh b/RunMeFirst/get_models.sh
new file mode 100644
index 0000000..f75b506
--- /dev/null
+++ b/RunMeFirst/get_models.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cat $DIR/model_all.lst | while read file url; do
+ echo -e "\n *** Getting `basename $file`...\n"
+ wget "$url" -O $DIR/.."${file}";
+done
+
+
diff --git a/RunMeFirst/model_all.lst b/RunMeFirst/model_all.lst
index 7fcaa9d..476b826 100644
--- a/RunMeFirst/model_all.lst
+++ b/RunMeFirst/model_all.lst
@@ -1,6 +1,7 @@
-Agent-Input/ssi/models/speech/age[IS13-scale-linear-c1e-1].trainer.LibSVM.model https://noxi.aria-agent.eu/models/age.model
-Agent-Input/ssi/models/speech/agreeableness[IS13-scale-linear-c1e-1].trainer.LibSVM.model https://noxi.aria-agent.eu/models/agreeableness.model
-Agent-Input/ssi/models/speech/conscientiousness[IS13-scale-linear-c1e-3].trainer.LibSVM.model https://noxi.aria-agent.eu/models/conscientiousness.model
-Agent-Input/ssi/models/speech/interest[IS13-scale-linear-c1e-5].trainer.LibSVM.model https://noxi.aria-agent.eu/models/interest.model
-Agent-Input/ssi/models/speech/language[IS13-scale-linear-c1e-5].trainer.LibSVM.model https://noxi.aria-agent.eu/models/language.model
-Agent-Input/ssi/models/speech/valence[IS13-scale-linear-c1e-3].trainer.LibSVM.model https://noxi.aria-agent.eu/models/valence.model
\ No newline at end of file
+/System/Agent-Input/ssi/models/speech/age[IS13-scale-linear-c1e-1].trainer.LibSVM.model https://noxi.aria-agent.eu/models/age.model
+/System/Agent-Input/ssi/models/speech/agreeableness[IS13-scale-linear-c1e-1].trainer.LibSVM.model https://noxi.aria-agent.eu/models/agreeableness.model
+/System/Agent-Input/ssi/models/speech/conscientiousness[IS13-scale-linear-c1e-3].trainer.LibSVM.model https://noxi.aria-agent.eu/models/conscientiousness.model
+/System/Agent-Input/ssi/models/speech/interest[IS13-scale-linear-c1e-5].trainer.LibSVM.model https://noxi.aria-agent.eu/models/interest.model
+/System/Agent-Input/ssi/models/speech/language[IS13-scale-linear-c1e-5].trainer.LibSVM.model https://noxi.aria-agent.eu/models/language.model
+/System/Agent-Input/ssi/models/speech/valence[IS13-scale-linear-c1e-3].trainer.LibSVM.model https://noxi.aria-agent.eu/models/valence.model
+/System/Agent-Output/bin/Common/Data/Cereproc/en-gb-sarah/cerevoice_sarah_3.2.0_48k.voice https://aria-agent.s3.amazonaws.com/cerevoice_sarah_3.2.0_48k.voice?Signature=e95XZ7TbOwJHREIMvkihj3cxEZo%3D&Expires=1535085964&AWSAccessKeyId=AKIAI3ZAQHKEMUJ73IVQ