diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf046f469..01d16a2415 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,41 @@ Open XDMoD Change Log ===================== -## 2018-??-?? v8.0.0 +## 2018-10-30 v8.0.0 +- Features + - General + - Added a **beta** version of the Cloud realm to provide metrics relevant to cloud computing resources. + - Added a **beta** version of the Storage realm to provide metrics relevant to storage systems installed at a center. + - Federated XDMoD has been released for production. Federated XDMoD allows individual, locally managed, XDMoD instances to report all or a subset of their accounting data to a central Hub which provides a global view of the federation. + - All XDMoD user profiles are now associated with an organization. Previously, this was only required for Campus Champions. + - Added support for automatically detecting / assigning a new SSO User's organization. + - Added support for automatically detecting if a user's organization has changed and updating their accounts accordingly. This may include, but is not limited to, the removal of elevated privileges. + - Hardened the login and password reset process as a result of a security audit by University of Cambridge. + - Improved support for resource manager job arrays. + - Many improvements to the documentation. + - ETL + - Reorganized several ETL pipelines. + - Improved data sanitization for tighter checks present in MySQL 5.7. + - Refactored Jobs realm ingestion to utilize ETLv2. + - Standardize action names to follow the format module.pipeline.action. For example, xdmod.acls.manage-tables. + - Added character set and coalition to table definitions. + - Added support for foreign key constraints. + - Added support for the definition of ETL variables on the command line using -d variable=value. + - Add ingestion of node hostname data from SGE logs. + - Various ETL performance improvements. +- Bug Fixes + - User Interface + - Deep linking when logged in using SSO has been restored. + - Update the logrotate configuration to use the su and create options. + - ETL + - Add primary keys to select ETL source queries. + - When modifying an existing table, preserve the order of the columns in the definition file. + - Ensure that file handles are flushed before inserting the final chunk of data. + - Misc + - Fixed several exceptions that were outside of a namespace. + - Fixed an issue where ACLs were not properly created on upgrade. + - Several minor bugfixes + ## 2018-05-23 v7.5.1 - Bug Fixes diff --git a/Dockerfile b/Dockerfile index 78f094d386..fed607d5f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM tas-tools-ext-01.ccr.xdmod.org/xdmod-centos7:open7.5.1-v5 +FROM tas-tools-ext-01.ccr.xdmod.org/xdmod-centos7:open8.0.0-v1 diff --git a/bin/xdmod-upgrade b/bin/xdmod-upgrade index a854b54416..1a7f51e1dd 100755 --- a/bin/xdmod-upgrade +++ b/bin/xdmod-upgrade @@ -26,8 +26,7 @@ ini_set('memory_limit', -1); * @var array */ $supportedUpgrades = array( - '7.5.0' => '7.5.1', - '7.5.1' => '8.0.0', + '8.0.0' => '8.1.0', ); /** diff --git a/classes/Authentication/SAML/XDSamlAuthentication.php b/classes/Authentication/SAML/XDSamlAuthentication.php index 057a559616..ba648118fd 100644 --- a/classes/Authentication/SAML/XDSamlAuthentication.php +++ b/classes/Authentication/SAML/XDSamlAuthentication.php @@ -31,21 +31,12 @@ class XDSamlAuthentication */ protected $_isConfigured = false; - /** - * Whether or not we allow Single Sign On users local access. Defaults to true. - * - * @var boolean - */ - protected $_allowLocalAccessViaSSO = true; - const BASE_ADMIN_EMAIL = <<_sources = \SimpleSAML_Auth_Source::getSources(); - try { - $this->_allowLocalAccessViaSSO = strtolower(\xd_utilities\getConfiguration('authentication', 'allowLocalAccessViaFederation')) === "false" ? false : true; - } catch (Exception $e) { - } if ($this->isSamlConfigured()) { try { $authSource = \xd_utilities\getConfiguration('authentication', 'source'); @@ -110,98 +97,79 @@ public function isSamlConfigured() public function getXdmodAccount() { $samlAttrs = $this->_as->getAttributes(); - if (!isset($samlAttrs["username"])) { - $thisUserName = null; - } else { - $thisUserName = !empty($samlAttrs['username'][0]) ? $samlAttrs['username'][0] : null; - } - if (!isset($samlAttrs["system_username"])) { - $thisSystemUserName = $thisUserName; - } else { - $thisSystemUserName = !empty($samlAttrs['system_username'][0]) ? $samlAttrs['system_username'][0] : null; - } - if ($this->_as->isAuthenticated() && !empty($thisUserName)) { - $xdmodUserId = \XDUser::userExistsWithUsername($thisUserName); + + if ($this->_as->isAuthenticated()) { + $userName = $samlAttrs['username'][0]; + + $xdmodUserId = \XDUser::userExistsWithUsername($userName); + if ($xdmodUserId !== INVALID) { - return \XDUser::getUserByID($xdmodUserId); - } elseif ($this->_allowLocalAccessViaSSO && isset($samlAttrs['email_address'])) { - $xdmodUserId = \XDUser::userExistsWithEmailAddress($samlAttrs['email_address'][0]); - if ($xdmodUserId === AMBIGUOUS) { - return "AMBIGUOUS"; - } - if ($xdmodUserId !== INVALID) { - return \XDUser::getUserByID($xdmodUserId); - } + $user = \XDUser::getUserByID($xdmodUserId); + $user->setSSOAttrs($samlAttrs); + return $user; } - $emailAddress = !empty($samlAttrs['email_address'][0]) ? $samlAttrs['email_address'][0] : NO_EMAIL_ADDRESS_SET; - $personId = \DataWarehouse::getPersonIdByUsername($thisSystemUserName); + // If we've gotten this far then we're creating a new user. Proceed with gathering the + // information we'll need to do so. + $emailAddress = isset($samlAttrs['email_address']) ? $samlAttrs['email_address'][0] : NO_EMAIL_ADDRESS_SET; + $systemUserName = isset($samlAttrs['system_username']) ? $samlAttrs['system_username'][0] : $userName; + $firstName = isset($samlAttrs['first_name']) ? $samlAttrs['first_name'][0] : 'UNKNOWN'; + $middleName = isset($samlAttrs['middle_name']) ? $samlAttrs['middle_name'][0] : null; + $lastName = isset($samlAttrs['last_name']) ? $samlAttrs['last_name'][0] : null; + $personId = \DataWarehouse::getPersonIdFromPII($systemUserName, $samlAttrs['organization'][0]); + + // Attempt to identify which organization this user should be associated with. Prefer + // using the personId if not unknown, then fall back to the saml attributes if the + // 'organization' property is present, and finally defaulting to the Unknown organization + // if none of the preceding conditions are met. $userOrganization = $this->getOrganizationId($samlAttrs, $personId); - if (!isset($samlAttrs["first_name"])) { - $samlAttrs["first_name"] = array("UNKNOWN"); - } - if (!isset($samlAttrs["middle_name"])) { - $samlAttrs["middle_name"] = array(null); - } - if (!isset($samlAttrs["last_name"])) { - $samlAttrs["last_name"] = array("UNKNOWN"); - } try { $newUser = new \XDUser( - $thisUserName, + $userName, null, $emailAddress, - $samlAttrs["first_name"][0], - $samlAttrs["middle_name"][0], - $samlAttrs["last_name"][0], + $firstName, + $middleName, + $lastName, array(ROLE_ID_USER), ROLE_ID_USER, $userOrganization, - $personId + $personId, + $samlAttrs ); } catch (Exception $e) { - return "EXISTS"; + throw new Exception('An account is currently configured with this information, please contact an administrator.'); } + $newUser->setUserType(SSO_USER_TYPE); + try { $newUser->saveUser(); } catch (Exception $e) { $this->logger->err('User creation failed: ' . $e->getMessage()); - return false; + throw $e; } $this->handleNotifications($newUser, $samlAttrs, ($personId != UNKNOWN_USER_TYPE)); return $newUser; } - return false; + throw new \DataWarehouse\Query\Exceptions\AccessDeniedException('Authentication failure.'); } /** - * Retrieves the organization_id that this User should be associated with. There is one - * configuration property that affects the return value of this function, - * `force_default_organization`. It does so in the following ways: + * Retrieves the organization_id that this User should be associated with. * - * - If the `force_default_organization` property in `portal_settings.ini` === 'on' - * - Then the users organization is determined by the run time constant - * `ORGANIZATION_NAME` ( which is derived from the `organization.json` configuration - * file. ) This value will be used to find a corresponding record in the - * `modw.organization` table via the `name` column. + * - If we were able to identify which `person` this user should be associated with + * - then look up which organization they are associated via the `modw.person.id` column. * - If SAML has been provided with an `organization` property. * - Then the users organization will be determined by attempting to find a record in * the `modw.organization` table that has a `name` column that matches the provided - * value. - * - If unable to identify an organization in the previous step and a personId has been - * supplied, attempt to retrieve the organization_id for this person via the - * `modw.person.id` column. - * - If we were able to identify which `person` this user should be associated with - * - then look up which organization they are associated via the `modw.person.id` column. + * value. If no records are found then the 'Unknown' organization ( -1 ) is returned. * - and finally, if none of the other conditions are satisfied, return the Unknown organization * ( i.e. -1 ) * - * The default setting for an OpenXDMoD installation is: - * - `force_default_organization="on"` * @param array $samlAttrs the saml attributes returned for this user * @param int $personId the id property for the Person this user has been associated with. * @return int the id of the organization that a new SSO user should be associated with. @@ -209,25 +177,7 @@ public function getXdmodAccount() */ public function getOrganizationId($samlAttrs, $personId) { - $techSupportRecipient = \xd_utilities\getConfiguration('general', 'tech_support_recipient'); - - $forceDefaultOrganization = null; - try { - $forceDefaultOrganization = \xd_utilities\getConfiguration('sso', 'force_default_organization') === 'on'; - } catch (Exception $e) { - $this->notify( - $techSupportRecipient, - $techSupportRecipient, - '', - $techSupportRecipient, - 'Error retrieving XDMoD configuration property "force_default_organization" form portal_settings.ini', - $e->getMessage() - ); - } - - if ($forceDefaultOrganization) { - return Organizations::getIdByName(ORGANIZATION_NAME); - } elseif ($personId !== -1 ) { + if ($personId !== -1 ) { return Organizations::getOrganizationIdForPerson($personId); } elseif(!empty($samlAttrs['organization'])) { return Organizations::getIdByName($samlAttrs['organization'][0]); @@ -292,71 +242,33 @@ public function getLoginLink() * @param array $samlAttributes the attributes that we received via SAML for this user. * @param boolean $linked whether or not we were able to link the SSO User with an XDMoD Person. * @throws Exception if there is a problem with notifying the user. - * @throws Exception if there is a problem retrieving the name for the users organization. */ private function handleNotifications(XDUser $user, $samlAttributes, $linked) { - // We only notify admins iff we were unable to identify which organization the user should - // be associated with ( i.e. we had to assign them to the 'Unknown' organization ). - if ($user->getOrganizationID() === -1) { - $techSupportRecipient = \xd_utilities\getConfiguration('general', 'tech_support_recipient'); - $senderEmail = \xd_utilities\getConfiguration('mailer', 'sender_email'); - - $userEmail = $user->getEmailAddress() - ? $user->getEmailAddress() - : $samlAttributes['email_address'][0]; - - $userOrganization = $user->getOrganizationID(); - - $emailBody = sprintf( - self::BASE_ADMIN_EMAIL, - $user->getFormalName(true), - $user->getUsername(), - $userEmail, - $userOrganization, - Organizations::getNameById($userOrganization), - json_encode($samlAttributes, JSON_PRETTY_PRINT) - ); + if ($user->getOrganizationID() !== -1) { + // Only send email if we were unable to identify an organization for the user. + return; + } - $subject = sprintf( - 'New %s Single Sign On User Created', - ($linked ? 'Linked' : 'Unlinked') - ); + $subject = sprintf( + 'New %s Single Sign On User Created', + ($linked ? 'Linked' : 'Unlinked') + ); - $this->notify( - $techSupportRecipient, - $techSupportRecipient, - '', - $senderEmail, - $subject, - $emailBody - ); - } - } + $body = sprintf( + self::BASE_ADMIN_EMAIL, + $user->getFormalName(true), + $user->getUsername(), + $user->getEmailAddress(), + json_encode($samlAttributes, JSON_PRETTY_PRINT) + ); - /** - * Attempt to generate / send a notification email with the specified parameters. - * - * @param string $toAddress the address that the notification will be sent to. - * @param string $fromAddress the address that the notification will be sent from. - * @param string $fromName A name to be used when identifying the `$fromAddress` - * @param string $replyAddress the address to be used when a user replies to the notification. - * @param string $subject the subject of the notification. - * @param string $body the body of the notification. - * - * @throws Exception if there is a problem sending the notification email. - */ - public function notify($toAddress, $fromAddress, $fromName, $replyAddress, $subject, $body) - { try { MailWrapper::sendMail( array( 'subject' => $subject, 'body' => $body, - 'toAddress' => $toAddress, - 'fromAddress' => $fromAddress, - 'fromName' => $fromName, - 'replyAddress' => $replyAddress + 'toAddress' => \xd_utilities\getConfiguration('general', 'tech_support_recipient') ) ); } catch (Exception $e) { diff --git a/classes/CCR/DB/MySQLHelper.php b/classes/CCR/DB/MySQLHelper.php index 939e82fd33..a7d5e59448 100644 --- a/classes/CCR/DB/MySQLHelper.php +++ b/classes/CCR/DB/MySQLHelper.php @@ -416,9 +416,15 @@ public static function grantAllPrivileges( $dbUsername, $dbPassword ) { + /** + * The privileges are listed out instead of ALL so that the user + * created cannot administrate users or database tasks. + */ $stmt = "GRANT TRIGGER, DROP, INDEX, CREATE, INSERT," . " SELECT, DELETE, UPDATE, CREATE VIEW, SHOW VIEW," . " ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES," + . " CREATE ROUTINE, ALTER ROUTINE, EVENT, RELOAD, FILE," + . " CREATE TABLESPACE, PROCESS, REFERENCES," . " LOCK TABLES" . " ON *.* TO '$dbUsername'@'$localHost'" . " IDENTIFIED BY '$dbPassword';FLUSH PRIVILEGES;"; diff --git a/classes/DataWarehouse.php b/classes/DataWarehouse.php index f309082325..c14786b5d2 100644 --- a/classes/DataWarehouse.php +++ b/classes/DataWarehouse.php @@ -61,32 +61,35 @@ public function __destruct() destroy(); } - /************************************************************ - * @function getPersonIdByUsername - * @access public - * - * @param string username - * - * @return person_id or UNKNOWN_USER_TYPE (-1) - ************************************************************/ - public function getPersonIdByUsername($username = null){ - if(!empty($username)){ - $dbh = self::connect(); - $personId = $dbh->query( - " SELECT person_id - FROM modw.systemaccount - WHERE username = :username - LIMIT 1", - array( - ':username' => $username, - ) - ); - if(count($personId) > 0){ - return $personId[0]['person_id']; - } + /** + * @function getPersonIdFromPII + * + * Return the person_id of a user based on username and organization. + * + * @param string username + * @return person_id or -1 if the person_id could not be determined + */ + public static function getPersonIdFromPII($username, $organization) { + + $config = Config::factory(); + $query = $config['user_management']['person_mapping']; + + $dbh = self::connect(); + $stmt = $dbh->handle()->prepare($query); + $stmt->bindParam(':username', $username); + + if (preg_match('/\W:organization\b/', $query) === 1) { + $stmt->bindParam(':organization', $organization); + } + $stmt->execute(); + + $personId = $stmt->fetchAll(PDO::FETCH_ASSOC); + if(count($personId) === 1){ + return $personId[0]['person_id']; } - return UNKNOWN_USER_TYPE; + return -1; } + /************************************************************ * @function getAllocations() * @access public diff --git a/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByNSFDirectorate.php b/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByNSFDirectorate.php index 7fc6a75ca2..0af20be7dc 100644 --- a/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByNSFDirectorate.php +++ b/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByNSFDirectorate.php @@ -111,7 +111,7 @@ public function addWhereJoin(\DataWarehouse\Query\Query &$query, \DataWarehouse\ { $query->addTable($this->fos_table); - $fostable_id_field = new \DataWarehouse\Query\Model\TableField($this->fos_table,'directorate_id'); + $fostable_id_field = new \DataWarehouse\Query\Model\TableField($this->fos_table,'id'); $datatable_fos_id_field = new \DataWarehouse\Query\Model\TableField($data_table, 'fos_id'); $query->addWhereCondition( diff --git a/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByParentScience.php b/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByParentScience.php index 88fae92956..24d3431f51 100644 --- a/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByParentScience.php +++ b/classes/DataWarehouse/Query/Jobs/GroupBys/GroupByParentScience.php @@ -81,7 +81,7 @@ public function addWhereJoin(\DataWarehouse\Query\Query &$query, // construct the join between the main data_table and this group by table $query->addTable($this->fos_table); - $fostable_id_field = new \DataWarehouse\Query\Model\TableField($this->fos_table,'parent_id'); + $fostable_id_field = new \DataWarehouse\Query\Model\TableField($this->fos_table,'id'); $datatable_fos_id_field = new \DataWarehouse\Query\Model\TableField($data_table, 'fos_id'); // the where condition that specifies the join of the tables diff --git a/classes/DataWarehouse/Query/Storage/GroupBys/GroupByNSFDirectorate.php b/classes/DataWarehouse/Query/Storage/GroupBys/GroupByNSFDirectorate.php index 30ba5744f4..a133d0a6d0 100644 --- a/classes/DataWarehouse/Query/Storage/GroupBys/GroupByNSFDirectorate.php +++ b/classes/DataWarehouse/Query/Storage/GroupBys/GroupByNSFDirectorate.php @@ -77,39 +77,6 @@ public function applyTo( $this->addOrder($query, $multi_group); } - public function addWhereJoin( - Query &$query, - Table $data_table, - $multi_group = false, - $operation = '=', - $whereConstraint = 'NULL' - ) { - $query->addTable($this->table); - - $fostable_id_field = new TableField($this->table, 'directorate_id'); - $datatable_fos_id_field = new TableField($data_table, 'fos_id'); - - $query->addWhereCondition( - new WhereCondition( - $fostable_id_field, - '=', - $datatable_fos_id_field - ) - ); - - if (is_array($whereConstraint)) { - $whereConstraint = '(' . implode(',', $whereConstraint) . ')'; - } - - $query->addWhereCondition( - new WhereCondition( - $fostable_id_field, - $operation, - $whereConstraint - ) - ); - } - public function pullQueryParameters(&$request) { return parent::pullQueryParameters2( diff --git a/classes/DataWarehouse/Query/Storage/GroupBys/GroupByParentScience.php b/classes/DataWarehouse/Query/Storage/GroupBys/GroupByParentScience.php index 1419c1cd75..d5b8bc101a 100644 --- a/classes/DataWarehouse/Query/Storage/GroupBys/GroupByParentScience.php +++ b/classes/DataWarehouse/Query/Storage/GroupBys/GroupByParentScience.php @@ -77,42 +77,6 @@ public function applyTo( $this->addOrder($query, $multi_group); } - public function addWhereJoin( - Query &$query, - Table $data_table, - $multi_group = false, - $operation = '=', - $whereConstraint = 'NULL' - ) { - // construct the join between the main data_table and this group by table - $query->addTable($this->table); - - $fostable_id_field = new TableField($this->table, 'parent_id'); - $datatable_fos_id_field = new TableField($data_table, 'fos_id'); - - // the where condition that specifies the join of the tables - $query->addWhereCondition( - new WhereCondition( - $fostable_id_field, - '=', - $datatable_fos_id_field - ) - ); - - // the where condition that specifies the constraint on the joined table - if (is_array($whereConstraint)) { - $whereConstraint = '(' . implode(',', $whereConstraint) . ')'; - } - - $query->addWhereCondition( - new WhereCondition( - $fostable_id_field, - $operation, - $whereConstraint - ) - ); - } - public function pullQueryParameters(&$request) { return parent::pullQueryParameters2( diff --git a/classes/ETL/DbModel/ForeignKeyConstraint.php b/classes/ETL/DbModel/ForeignKeyConstraint.php index 5e3c901c00..861a2e9cbb 100644 --- a/classes/ETL/DbModel/ForeignKeyConstraint.php +++ b/classes/ETL/DbModel/ForeignKeyConstraint.php @@ -169,7 +169,9 @@ private function generateForeignKeyConstraintName(array $columns) } /** - * Foreign key constraints are considered equal if all properties are the same. + * Foreign key constraints are considered equal if all properties are the + * same. For "ON DELETE" and "ON UPDATE" the operations "NO ACTION" and + * "RESTRICT" are the same as omitting an operation. */ public function compare(iEntity $cmp) { @@ -181,12 +183,24 @@ public function compare(iEntity $cmp) || $this->columns != $cmp->columns || $this->referenced_table != $cmp->referenced_table || $this->referenced_columns != $cmp->referenced_columns - || $this->on_delete != $cmp->on_delete - || $this->on_update != $cmp->on_update ) { return -1; } + if ($this->on_delete != $cmp->on_delete + && !in_array($this->on_delete, array(null, 'RESTRICT', 'NO ACTION')) + && !in_array($cmp->on_delete, array(null, 'RESTRICT', 'NO ACTION')) + ) { + return -2; + } + + if ($this->on_update != $cmp->on_update + && !in_array($this->on_update, array(null, 'RESTRICT', 'NO ACTION')) + && !in_array($cmp->on_update, array(null, 'RESTRICT', 'NO ACTION')) + ) { + return -3; + } + return 0; } diff --git a/classes/ETL/DbModel/Table.php b/classes/ETL/DbModel/Table.php index 5c4bb59b15..24cc3120dd 100644 --- a/classes/ETL/DbModel/Table.php +++ b/classes/ETL/DbModel/Table.php @@ -166,7 +166,8 @@ public function verify() } } // foreach ( $this->indexes as $index ) - // Verify foreign key constraint columns match table columns + // Verify foreign key constraint columns match table columns and are + // contained in the beginning of an index. foreach ( $this->foreign_key_constraints as $constraint ) { $missingColumnNames = array_diff($constraint->columns, $columnNames); @@ -175,6 +176,28 @@ public function verify() sprintf("Columns in foreign key constraint '%s' not found in table definition: %s", $constraint->name, implode(", ", $missingColumnNames)) ); } + + $foundCorrespondingIndex = false; + foreach ( $this->indexes as $index ) { + // Skip any index with fewer columns than the constraint. + if ( count($constraint->columns) > count($index->columns) ) { + continue; + } + // Compare columns starting at the beginning of the index. + foreach ( $constraint->columns as $i => $column ) { + if ( $column != $index->columns[$i] ) { + // Index doesn't match, check next index. + continue 2; + } + } + $foundCorrespondingIndex = true; + break; + } + if ( ! $foundCorrespondingIndex ) { + $this->logAndThrowException( + sprintf("Columns in foreign key constraint '%s' must be contained at the beginning of an index", $constraint->name) + ); + } } // foreach ( $this->foreign_key_constraints as $constraint ) return true; @@ -333,13 +356,18 @@ public function discover($source) tc.constraint_name AS name, GROUP_CONCAT(kcu.column_name ORDER BY position_in_unique_constraint ASC) AS columns, kcu.referenced_table_name AS referenced_table, - GROUP_CONCAT(kcu.referenced_column_name ORDER BY position_in_unique_constraint ASC) AS referenced_columns + GROUP_CONCAT(kcu.referenced_column_name ORDER BY position_in_unique_constraint ASC) AS referenced_columns, + rc.update_rule AS on_update, + rc.delete_rule AS on_delete FROM information_schema.table_constraints tc INNER JOIN information_schema.key_column_usage kcu ON tc.table_schema = kcu.table_schema AND tc.table_name = kcu.table_name AND tc.constraint_schema = kcu.constraint_schema AND tc.constraint_name = kcu.constraint_name +INNER JOIN information_schema.referential_constraints rc + ON tc.constraint_schema = rc.constraint_schema + AND tc.constraint_name = rc.constraint_name WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_schema = :schema AND tc.table_name = :tablename @@ -795,7 +823,7 @@ public function getAlterSql($destination, $includeSchema = true) // When adding columns, maintain the same order as in the definition array. Note that // array_diff() maintains the array index so we are able to look up the previous column. - + $position = "FIRST"; if ( $index > 0 ) { $afterColName = $destColNames[$index-1]; @@ -806,7 +834,7 @@ public function getAlterSql($destination, $includeSchema = true) } $position = "AFTER " . $destination->quote($afterColName); } - + $alterList[] = sprintf( "ADD COLUMN %s %s", $destination->getColumn($name)->getSql($includeSchema), @@ -845,7 +873,7 @@ public function getAlterSql($destination, $includeSchema = true) $position = "AFTER " . $destination->quote($destColNames[$index-1]); } } - + $changeList[] = sprintf( "CHANGE COLUMN %s %s %s", $destination->quote($name), @@ -858,7 +886,7 @@ public function getAlterSql($destination, $includeSchema = true) $destColumn = $destination->getColumn($toColumnName); $currentColumn = $this->getColumn($fromColumnName); $index = array_search($toColumnName, $destColNames); - + $position = "FIRST"; if ( $index > 0 ) { $position = "AFTER " . $destination->quote($destColNames[$index-1]); diff --git a/classes/ETL/LockFile.php b/classes/ETL/LockFile.php index 40ac63c48a..6d13668f22 100644 --- a/classes/ETL/LockFile.php +++ b/classes/ETL/LockFile.php @@ -73,7 +73,7 @@ public function __construct($lockDir, $lockPrefix = null, Log $logger = null) parent::__construct($logger); if ( null === $lockDir || "" === $lockDir ) { - $lockDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'xdmod'; + $lockDir = sys_get_temp_dir(); $this->logger->info("Empty lock directory specified, using temp directory: $lockDir"); } diff --git a/classes/Models/Services/Organizations.php b/classes/Models/Services/Organizations.php index 87e0fef83b..b6b039a78b 100644 --- a/classes/Models/Services/Organizations.php +++ b/classes/Models/Services/Organizations.php @@ -7,55 +7,6 @@ class Organizations { - /** - * Retrieve the organization that the user identified by the $userId parameter is associated - * with. - * - * @param int $userId the id of the user for whom an associated organization ( if any ) is to be - * retrieved. - * - * @return int the id of the organization $userId is associated with. If one is not found then - * -1 is returned. - * - * @throws \Exception if there is a problem retrieving a db connection. - * @throws \Exception if there is a problem executing sql statements. - */ - public static function getOrganizationForUser($userId) - { - $sql = <<query( - $sql, - array(':user_id' => $userId) - ); - - return count($rows) > 0 ? $rows[0]['organization_id'] : -1; - } - /** * Retrieve the name for the organization identified by the provided id. * @@ -70,13 +21,14 @@ public static function getOrganizationForUser($userId) public static function getNameById($organizationId) { $query = << $organizationId @@ -94,7 +46,7 @@ public static function getNameById($organizationId) * $organizationName. * * @param string $organizationName the name of the organization to retrieve. - * @return int|null null if no record is found else the organization_id as an int. + * @return int -1 if no record is found else the organization_id as an int. * @throws \Exception if there is a problem retrieving a db connection. * @throws \Exception if there is a problem executing the sql statement. */ diff --git a/classes/OpenXdmod/Migration/Version751To800/DatabasesMigration.php b/classes/OpenXdmod/Migration/Version751To800/DatabasesMigration.php index 0b1220de4b..523a8d93e1 100644 --- a/classes/OpenXdmod/Migration/Version751To800/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/Version751To800/DatabasesMigration.php @@ -21,6 +21,13 @@ public function execute() { parent::execute(); + // Ensure that the User table is updated. + $this->runEtl( + array( + 'actions' => 'xdmod.xdb-bootstrap.xdb-table-create' + ) + ); + $this->runEtl( array( 'process-sections' => array( diff --git a/classes/Rest/Controllers/AuthenticationControllerProvider.php b/classes/Rest/Controllers/AuthenticationControllerProvider.php index 6be591e1ec..daa2fcb9ab 100644 --- a/classes/Rest/Controllers/AuthenticationControllerProvider.php +++ b/classes/Rest/Controllers/AuthenticationControllerProvider.php @@ -22,58 +22,6 @@ */ class AuthenticationControllerProvider extends BaseControllerProvider { - const ADMIN_NOTIFICATION_EMAIL = <<emailLogger = Log::factory( - 'Authentication-email', - array( - 'file' => false, - 'db' => false, - 'console' => false, - 'mail' => true, - 'emailTo' => \xd_utilities\getConfiguration('general', 'tech_support_recipient'), - 'emailFrom' => \xd_utilities\getConfiguration('mailer', 'sender_email'), - 'emailSubject' => 'XDMoD SSO: Additional Actions Necessary' - ) - ); - - $this->fileLogger = Log::factory( - 'Authentication-exceptions-file', - array( - 'file' => LOG_DIR . '/authentication-exceptions.log', - 'db' => false, - 'console' => false, - 'mail' => false - ) - ); } @@ -140,13 +65,11 @@ public function login(Request $request, Application $app) { $user = $this->authorize($request); - $token = \XDSessionManager::recordLogin($user); - - $this->syncUserOrganization($user); + $user->postLogin(); return $app->json(array( 'success' => true, - 'results' => array('token' => $token, 'name' => $user->getFormalName()) + 'results' => array('token' => $user->getSessionToken(), 'name' => $user->getFormalName()) )); } @@ -186,90 +109,4 @@ public function getIdpRedirect(Request $request, Application $app) return $app->json($redirectUrl); } - - /** - * Ensure that the provided user's organization is in sync with their person organization. If - * their organization has changed then remove any elevated organization related access and notify - * the user of the steps that have been taken. Also notify the admins so that they will have some - * visibility in to any additional steps that maybe required. - * - * @param XDUser $user - * - * @throws \Exception if there is a problem updating the provided users organization. - */ - private function syncUserOrganization(XDUser $user) - { - - $userProfileOrganization = $user->getOrganizationID(); - $datawarehouseUserOrganization = Organizations::getOrganizationForUser($user->getUserID()); - - if ($userProfileOrganization !== $datawarehouseUserOrganization) { - $userOrganizationName = Organizations::getNameById($userProfileOrganization); - $currentOrganizationName = Organizations::getNameById($datawarehouseUserOrganization); - - $originalAcls = $user->getAcls(true); - - if (count(array_intersect($originalAcls, self::$CENTER_ROLES)) > 0) { - - $otherAcls = array_diff($originalAcls, self::$CENTER_ROLES); - - // Make sure that they at least have 'usr' - if (empty($otherAcls)) { - $otherAcls = array('usr'); - } - - // Update the user w/ their new set of acls. - foreach($otherAcls as $aclName) { - $acl = Acls::getAclByName($aclName); - $user->addAcl($acl); - } - - $this->emailLogger->notice( - sprintf( - self::ADMIN_NOTIFICATION_EMAIL . self::ACL_EMAIL_ADDITION, - $user->getFormalName(), - $user->getUsername(), - $user->getEmailAddress(), - $userOrganizationName, - $currentOrganizationName, - json_encode($originalAcls), - json_encode($otherAcls) - ) - ); - } - - $user->setOrganizationId($datawarehouseUserOrganization); - $user->saveUser(); - try { - MailWrapper::sendMail( - array( - 'subject' => 'XDMoD User: Organization Update', - 'body' => sprintf( - self::USER_NOTIFICATION_EMAIL, - $user->getFormalName(), - \xd_utilities\getConfiguration('mailer', 'sender_email') - ), - 'toAddress' => $user->getEmailAddress(), - 'fromAddress' => \xd_utilities\getConfiguration('general', 'tech_support_recipient'), - 'fromName' => '', - 'replyAddress' => \xd_utilities\getConfiguration('mailer', 'sender_email') - ) - ); - } catch (\Exception $e) { - $this->fileLogger->err( - sprintf( - self::EMAIL_EXCEPTION_MSG, - $user->getEmailAddress(), - $userOrganizationName, - $currentOrganizationName, - json_encode($originalAcls), - json_encode($otherAcls), - $e->getCode(), - $e->getMessage(), - $e->getTraceAsString() - ) - ); - } - } - } } diff --git a/classes/Rest/Controllers/WarehouseControllerProvider.php b/classes/Rest/Controllers/WarehouseControllerProvider.php index fab498f2ce..364c99f889 100644 --- a/classes/Rest/Controllers/WarehouseControllerProvider.php +++ b/classes/Rest/Controllers/WarehouseControllerProvider.php @@ -1482,8 +1482,15 @@ private function getJobData(Application $app, XDUser $user, $realm, $jobId, $act */ private function getJobDataSet(XDUser $user, $realm, $jobId, $action) { + $config = \Xdmod\Config::factory(); + + $rawstats = $config['rawstatistics']; + if (!isset($rawstats['realms'][$realm])) { + throw new \DataWarehouse\Query\Exceptions\AccessDeniedException; + } + $params = array( - new \DataWarehouse\Query\Model\Parameter('_id', '=', $jobId) + new \DataWarehouse\Query\Model\Parameter($rawstats['realms'][$realm]['primary_key'], '=', $jobId) ); $QueryClass = "\\DataWarehouse\\Query\\$realm\\JobDataset"; @@ -1761,17 +1768,27 @@ private function processHistoryRequest(Application $app, XDUser $user, $realm, $ */ private function processHistoryDefaultRealmRequest(Application $app, $action) { + $config = \Xdmod\Config::factory(); + + $rawstats = $config['rawstatistics']; + + $results = array(); + + if (isset($rawstats['realms'])) { + foreach($rawstats['realms'] as $realm => $realmconfig) { + $results[] = array( + 'dtype' => 'realm', + 'realm' => $realm, + 'text' => $realmconfig['name'] + ); + } + } + return $app->json( array( 'success' => true, 'action' => $action, - 'results' => array( - array( - 'dtype' => 'realm', - 'realm' => 'SUPREMM', - 'text' => 'SUPREMM' - ) - ) + 'results' => $results ) ); } @@ -2062,14 +2079,21 @@ private function getJobTimeSeriesData(Application $app, Request $request, \XDUse */ private function getJobByPrimaryKey(Application $app, \XDUser $user, $realm, $searchparams) { + $config = \Xdmod\Config::factory(); + + $rawstats = $config['rawstatistics']; + if (!isset($rawstats['realms'][$realm])) { + throw new \DataWarehouse\Query\Exceptions\AccessDeniedException; + } + if (isset($searchparams['jobref'])) { $params = array( - new \DataWarehouse\Query\Model\Parameter('_id', '=', $searchparams['jobref']) + new \DataWarehouse\Query\Model\Parameter($rawstats['realms'][$realm]['primary_key'], '=', $searchparams['jobref']) ); } else { $params = array( new \DataWarehouse\Query\Model\Parameter("resource_id", "=", $searchparams['resource_id']), - new \DataWarehouse\Query\Model\Parameter("local_job_id", "=", $searchparams['local_job_id']) + new \DataWarehouse\Query\Model\Parameter($rawstats['realms'][$realm]['ident_key'], "=", $searchparams['local_job_id']) ); } diff --git a/classes/XDUser.php b/classes/XDUser.php index 837e8d7c96..c8ea42f5eb 100644 --- a/classes/XDUser.php +++ b/classes/XDUser.php @@ -4,8 +4,10 @@ use CCR\DB; use CCR\Log; +use CCR\MailWrapper; use Models\Acl; use Models\Services\Acls; +use Models\Services\Organizations; use User\aRole; use DataWarehouse\Query\Exceptions\AccessDeniedException; @@ -74,6 +76,70 @@ class XDUser extends CCR\Loggable implements JsonSerializable const PUBLIC_USER = 1; const INTERNAL_USER = 2; + const ADMIN_NOTIFICATION_EMAIL = <<ssoAttrs;` + * + * @var array + */ + private static $INCLUDE_SSO_ATTRS = array('username', 'organization', 'system_username', 'email_address'); + + /** + * The attributes present when a user logs in via SSO. Defaults to an empty array otherwise. + * + * @var array + */ + private $ssoAttrs; + + /** + * The current session token for this user. Populated via XDSessionManager::recordLogin when + * XDUser::postLogin() is called. + * + * @var string + */ + private $currentToken; + + /** + * The state of this user's `sticky` bit. Corresponds to the moddb.Users.sticky column. + * Indicates that the organization_id and or the person_id has been manually overridden and + * should not be automatically updated. + * + * @var boolean + */ + private $sticky; // --------------------------- /* @@ -90,9 +156,19 @@ class XDUser extends CCR\Loggable implements JsonSerializable * */ - function __construct($username = NULL, $password = NULL, $email_address = NO_EMAIL_ADDRESS_SET, - $first_name = NULL, $middle_name = NULL, $last_name = NULL, - $role_set = array(ROLE_ID_USER), $primary_role = ROLE_ID_USER, $organization_id = NULL, $person_id = NULL + function __construct( + $username = null, + $password = null, + $email_address = NO_EMAIL_ADDRESS_SET, + $first_name = null, + $middle_name = null, + $last_name = null, + $role_set = array(ROLE_ID_USER), + $primary_role = ROLE_ID_USER, + $organization_id = null, + $person_id = null, + array $ssoAttrs = array(), + $sticky = false ) { $this->_pdo = DB::factory('database'); @@ -164,6 +240,9 @@ function __construct($username = NULL, $password = NULL, $email_address = NO_EMA // If you are explicitly calling 'new XDUser(...)', saveUser() must be called on the newly created XDUser object before accessing // these roles using getPrimaryRole() and getActiveRole() $this->_primary_role = $this->_active_role = \User\aRole::factory($primary_role_name); + + $this->sticky = $sticky; + parent::__construct( Log::factory( 'xduser.sql', @@ -175,6 +254,8 @@ function __construct($username = NULL, $password = NULL, $email_address = NO_EMA ) ) ); + + $this->setSSOAttrs($ssoAttrs); }//construct // --------------------------- @@ -432,7 +513,7 @@ public static function getUserByID($uid, &$targetInstance = NULL) $userCheck = $pdo->query(" SELECT username, password, email_address, first_name, middle_name, last_name, - time_created, time_last_updated, password_last_updated, account_is_active, organization_id, person_id, field_of_science, token, user_type + time_created, time_last_updated, password_last_updated, account_is_active, organization_id, person_id, field_of_science, token, user_type, sticky FROM Users WHERE id=:id ", array( @@ -478,6 +559,8 @@ public static function getUserByID($uid, &$targetInstance = NULL) // See: http://stackoverflow.com/questions/1197005/how-to-get-numeric-types-from-mysql-using-pdo $user->_user_type = (int)$userCheck[0]['user_type']; + $user->sticky = (bool)$userCheck[0]['sticky']; + // We retrieve the most privileged acl for this user and use it for the // active / primary role. $mostPrivilegedAcl = Acls::getMostPrivilegedAcl($user); @@ -777,13 +860,13 @@ public function issueNewToken() */ public function getUpdateQuery($updateToken = false, $includePassword = false) { - $result = 'UPDATE moddb.Users SET username = :username, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, user_type = :user_type WHERE id = :id'; + $result = 'UPDATE moddb.Users SET username = :username, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, user_type = :user_type, sticky = :sticky WHERE id = :id'; if ($updateToken && $includePassword) { - $result = 'UPDATE moddb.Users SET username = :username, password = :password, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, token = :token, user_type = :user_type, password_last_updated = :password_last_updated WHERE id = :id'; + $result = 'UPDATE moddb.Users SET username = :username, password = :password, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, token = :token, user_type = :user_type, password_last_updated = :password_last_updated, sticky = :sticky WHERE id = :id'; } else if (!$updateToken && $includePassword) { - $result = 'UPDATE moddb.Users SET username = :username, password = :password, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, user_type = :user_type, password_last_updated = :password_last_updated WHERE id = :id'; + $result = 'UPDATE moddb.Users SET username = :username, password = :password, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, user_type = :user_type, password_last_updated = :password_last_updated, sticky = :sticky WHERE id = :id'; } else if ($updateToken && !$includePassword) { - $result = 'UPDATE moddb.Users SET username = :usernam, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, token = :token, user_type = :user_type WHERE id = :id'; + $result = 'UPDATE moddb.Users SET username = :usernam, email_address = :email_address, first_name = :first_name, middle_name = :middle_name, last_name = :last_name, account_is_active = :account_is_active, person_id = :person_id, organization_id = :organization_id, field_of_science = :field_of_science, token = :token, user_type = :user_type, sticky = :sticky WHERE id = :id'; } return $result; } @@ -802,13 +885,13 @@ public function getUpdateQuery($updateToken = false, $includePassword = false) */ public function getInsertQuery($updateToken = false, $includePassword = false) { - $result = 'INSERT INTO moddb.Users (username, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, user_type) VALUES (:username, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :user_type)'; + $result = 'INSERT INTO moddb.Users (username, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, user_type, sticky) VALUES (:username, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :user_type, :sticky)'; if ($updateToken && $includePassword) { - $result = 'INSERT INTO moddb.Users (username, password, password_last_updated, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, token, user_type) VALUES (:username, :password, :password_last_updated, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :token, :user_type)'; + $result = 'INSERT INTO moddb.Users (username, password, password_last_updated, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, token, user_type, sticky) VALUES (:username, :password, :password_last_updated, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :token, :user_type, :sticky)'; } else if (!$updateToken && $includePassword) { - $result = 'INSERT INTO moddb.Users (username, password, password_last_updated, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, user_type) VALUES (:username, :password, :password_last_updated, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :user_type)'; + $result = 'INSERT INTO moddb.Users (username, password, password_last_updated, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, user_type, sticky) VALUES (:username, :password, :password_last_updated, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :user_type, :sticky)'; } else if ($updateToken && !$includePassword) { - $result = 'INSERT INTO moddb.Users (username, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, token, user_type) VALUES (:username, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :token, :user_type)'; + $result = 'INSERT INTO moddb.Users (username, email_address, first_name, middle_name, last_name, account_is_active, person_id, organization_id, field_of_science, token, user_type, sticky) VALUES (:username, :email_address, :first_name, :middle_name, :last_name, :account_is_active, :person_id, :organization_id, :field_of_science, :token, :user_type, :sticky)'; } return $result; } @@ -923,6 +1006,8 @@ public function saveUser() $this->_token = $update_data['token']; } $update_data['user_type'] = $this->_user_type; + $update_data['sticky'] = $this->sticky ? 1 : 0; + /* END: Query Data Population */ try { /* BEGIN: Construct the parameterized query */ @@ -3044,4 +3129,183 @@ public static function validateRID($rid) return $results; } + + /** + * Executes any actions that need to be conducted immediately after a user is logged into XDMoD. + * + * @throws Exception if there is a problem executing any of the required post logged in steps. + */ + public function postLogin() { + if (!$this->isSticky()) { + $this->updatePerson(); + $this->synchronizeOrganization(); + } + $this->currentToken = XDSessionManager::recordLogin($this); + } + + /** + * Attempts to synchronize this users organization. This will ensure that if the organization + * assigned to the user is not the same as the organization that should be assigned to the user + * ( i.e. the organization assigned to this users person has been updated ). They have their + * organization updated. If they have been associated with a 'center' related acl, center + * director or center staff, then they are to have these acls removed and an email notice sent + * to the admin / user notifying them that additional steps will need to be taken before their + * former level of access is restored. + * + * @throws Exception + */ + public function synchronizeOrganization() + { + // This is pulled from the moddb.Users.organization_id column for this user record. + $actualOrganization = $this->getOrganizationID(); + + // Retrieve the organization associated with this users Person. This is the value we expect + // the user's organization to match. + $expectedOrganization = Organizations::getOrganizationIdForPerson($this->getPersonID()); + + // If we have ssoAttrs available and this user's person's organization is 'Unknown' ( -1 ). + // Then go ahead and lookup the organization value from sso. + if ($expectedOrganization == -1 && count($this->ssoAttrs) > 0) { + $expectedOrganization = Organizations::getIdByName($this->ssoAttrs['organization'][0]); + } + + // If these don't match then the user's organization has been updated. Steps need to be taken. + if ($actualOrganization !== $expectedOrganization) { + $originalAcls = $this->getAcls(true); + + // if the user is currently assigned an acl that interacts with XDMoD's centers ( i.e. + // center director, center staff etc. ) then we need to remove these acls and notify + // the admins that additional setup may be required for this user. + if (count(array_intersect($originalAcls, self::$CENTER_ACLS)) > 0) { + $otherAcls = array_values(array_diff($originalAcls, self::$CENTER_ACLS)); + + // Make sure that they at least have 'usr' + if (empty($otherAcls)) { + $otherAcls = array('usr'); + } + + // Now we need to make sure that the user is only assigned their non-center acls so + // clear any existing acls they have. + $this->setAcls(array()); + + // Update the user w/ their new set of acls. + foreach($otherAcls as $aclName) { + $acl = Acls::getAclByName($aclName); + $this->addAcl($acl); + } + + // Retrieving the names for display purposes. + $userOrganizationName = Organizations::getNameById($actualOrganization); + $currentOrganizationName = Organizations::getNameById($expectedOrganization); + + // Notify the XDMoD Admin that a user has had their privileges altered due to an + // organization change so that they can take any further steps that may be required. + MailWrapper::sendMail( + array( + 'subject' => 'XDMoD User: Organization Update', + 'body' => sprintf( + self::ADMIN_NOTIFICATION_EMAIL, + $this->getFormalName(), + $this->getUsername(), + $this->getEmailAddress(), + $userOrganizationName, + $currentOrganizationName, + json_encode($originalAcls), + json_encode($otherAcls) + ), + 'toAddress' => \xd_utilities\getConfiguration('general', 'tech_support_recipient'), + ) + ); + + // Notify the user that there was an organization change detected. + MailWrapper::sendMail( + array( + 'subject' => 'XDMoD User: Organization Update', + 'body' => sprintf( + self::USER_NOTIFICATION_EMAIL, + $this->getFormalName(), + \xd_utilities\getConfiguration('mailer', 'sender_email') + ), + 'toAddress' => $this->getEmailAddress() + ) + ); + } + + // Update / save the user with their new organization + $this->setOrganizationId($expectedOrganization); + $this->saveUser(); + } + } + + /** + * Updates this Users Person / Organization if they are not currently assigned to the Unknown User && they there are + * ssoAttrs available ( logged in via SSO ). Also, if the person identified via ssoAttrs is not the Unknown User && + * is different than the users curent Person. + * + */ + public function updatePerson() + { + $currentPersonId = $this->getPersonID(); + $hasSSO = count($this->ssoAttrs) > 0; + + if ($currentPersonId == -1 && $hasSSO) { + $username = $this->ssoAttrs['username'][0]; + $systemUserName = isset($this->ssoAttrs['system_username']) ? $this->ssoAttrs['system_username'][0] : $username; + $expectedPersonId = \DataWarehouse::getPersonIdFromPII($systemUserName, null); + + // As long as the identified person is not Unknown and it is different than our current Person Id + // go ahead and update this user with the new person & that person's organization. + if ($expectedPersonId != -1 && $currentPersonId != $expectedPersonId) { + $organizationId = Organizations::getOrganizationIdForPerson($expectedPersonId); + $this->setPersonID($expectedPersonId); + $this->setOrganizationID($organizationId); + + $this->saveUser(); + } + } + } + + public function setSSOAttrs($ssoAttrs) + { + $this->ssoAttrs = array_reduce( + array_intersect(self::$INCLUDE_SSO_ATTRS, array_keys($ssoAttrs)), + function ($carry, $key) use ($ssoAttrs) { + $carry[$key] = $ssoAttrs[$key]; + return $carry; + }, + array() + ); + } + + /** + * Retrieve this users current session token. This will only be populated if the user has had + * its `postLogin` function called. + * + * @return string + */ + public function getSessionToken() + { + return $this->currentToken; + } + + /** + * Set's the value of this user's `sticky` bit. + * + * @param $sticky + */ + public function setSticky($sticky) + { + $this->sticky = $sticky; + } + + /** + * Return's the value of this user's `sticky` bit. If true, then this user's person and or + * organization has been manually overridden, do not update unless via the admin interface. + * + * @return bool + */ + public function isSticky() + { + return $this->sticky; + } }//XDUser diff --git a/configuration/etl/etl_action_defs.d/cloud_eucalyptus/instance.json b/configuration/etl/etl_action_defs.d/cloud_eucalyptus/instance.json index bf358950db..d4d3f9eda2 100644 --- a/configuration/etl/etl_action_defs.d/cloud_eucalyptus/instance.json +++ b/configuration/etl/etl_action_defs.d/cloud_eucalyptus/instance.json @@ -25,7 +25,7 @@ "name": "account", "schema": "${SOURCE_SCHEMA}", "alias": "act", - "on": "act.provider_account = raw.provider_account", + "on": "act.provider_account = raw.provider_account AND act.resource_id = raw.resource_id", "type": "LEFT OUTER" } ], diff --git a/configuration/etl/etl_action_defs.d/cloud_eucalyptus/volume.json b/configuration/etl/etl_action_defs.d/cloud_eucalyptus/volume.json index 1abd21cb5e..cdb17fc232 100644 --- a/configuration/etl/etl_action_defs.d/cloud_eucalyptus/volume.json +++ b/configuration/etl/etl_action_defs.d/cloud_eucalyptus/volume.json @@ -25,7 +25,7 @@ "name": "account", "schema": "${SOURCE_SCHEMA}", "alias": "act", - "on": "act.provider_account = raw.provider_account_number" + "on": "act.provider_account = raw.provider_account_number AND act.resource_id = raw.resource_id" }, { "name": "asset_type", diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/instance.json b/configuration/etl/etl_action_defs.d/cloud_openstack/instance.json index adc11d1c0b..3135052eac 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/instance.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/instance.json @@ -26,14 +26,14 @@ "name": "account", "schema": "${SOURCE_SCHEMA}", "alias": "act", - "on": "act.provider_account = raw.project_id", + "on": "act.provider_account = raw.project_id AND act.resource_id = raw.resource_id", "type": "LEFT OUTER" }, { "name": "user", "schema": "${SOURCE_SCHEMA}", "alias": "u", - "on": "u.provider_account = raw.user_id", + "on": "u.provider_account = raw.user_id AND u.resource_id = raw.resource_id", "type": "LEFT OUTER" } ], diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json b/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json index f44dd6222d..e858349446 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json @@ -26,7 +26,7 @@ "name": "account", "schema": "${SOURCE_SCHEMA}", "alias": "act", - "on": "act.provider_account = raw.project_id" + "on": "act.provider_account = raw.project_id AND act.resource_id = raw.resource_id" } ], diff --git a/configuration/etl/etl_tables.d/acls/acl_group_bys.json b/configuration/etl/etl_tables.d/acls/acl_group_bys.json index fbcc65f79f..ab789703b9 100644 --- a/configuration/etl/etl_tables.d/acls/acl_group_bys.json +++ b/configuration/etl/etl_tables.d/acls/acl_group_bys.json @@ -51,6 +51,87 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "uniq_acl_group_by_realm_statistic", + "columns": [ + "acl_id", + "group_by_id", + "realm_id", + "statistic_id" + ], + "type": "BTREE", + "is_unique": true + }, + { + "name": "idx_acl_id", + "columns": [ + "acl_id" + ] + }, + { + "name": "idx_group_by_id", + "columns": [ + "group_by_id" + ] + }, + { + "name": "idx_realm_id", + "columns": [ + "realm_id" + ] + }, + { + "name": "idx_statistic_id", + "columns": [ + "statistic_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_agb_acl_id", + "columns": [ + "acl_id" + ], + "referenced_table": "acls", + "referenced_columns": [ + "acl_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_agb_group_by_id", + "columns": [ + "group_by_id" + ], + "referenced_table": "group_bys", + "referenced_columns": [ + "group_by_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_agb_realm_id", + "columns": [ + "realm_id" + ], + "referenced_table": "realms", + "referenced_columns": [ + "realm_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_agb_statistic_id", + "columns": [ + "statistic_id" + ], + "referenced_table": "statistics", + "referenced_columns": [ + "statistic_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/acl_hierarchies.json b/configuration/etl/etl_tables.d/acls/acl_hierarchies.json index a96bfb1560..7636cd2825 100644 --- a/configuration/etl/etl_tables.d/acls/acl_hierarchies.json +++ b/configuration/etl/etl_tables.d/acls/acl_hierarchies.json @@ -49,6 +49,35 @@ "hierarchy_id" ], "type": "BTREE" + }, + { + "name": "idx_hierarchy_id", + "columns": [ + "hierarchy_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_ah_acl_id", + "columns": [ + "acl_id" + ], + "referenced_table": "acls", + "referenced_columns": [ + "acl_id" + ], + "on_delete": "CASCADE" + },{ + "name": "fk_ah_hierarchy_id", + "columns": [ + "hierarchy_id" + ], + "referenced_table": "hierarchies", + "referenced_columns": [ + "hierarchy_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/acl_tabs.json b/configuration/etl/etl_tables.d/acls/acl_tabs.json index 9773eba9a7..12f6dd93c2 100644 --- a/configuration/etl/etl_tables.d/acls/acl_tabs.json +++ b/configuration/etl/etl_tables.d/acls/acl_tabs.json @@ -40,6 +40,36 @@ "acl_id", "tab_id" ] + }, + { + "name": "idx_tab_id", + "columns": [ + "tab_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_at_acl_id", + "columns": [ + "acl_id" + ], + "referenced_table": "acls", + "referenced_columns": [ + "acl_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_at_tab_id", + "columns": [ + "tab_id" + ], + "referenced_table": "tabs", + "referenced_columns": [ + "tab_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/acl_types.json b/configuration/etl/etl_tables.d/acls/acl_types.json index f9fd59a145..c37f7c1dd8 100644 --- a/configuration/etl/etl_tables.d/acls/acl_types.json +++ b/configuration/etl/etl_tables.d/acls/acl_types.json @@ -34,6 +34,25 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_module_id", + "columns": [ + "module_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_atp_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/acls.json b/configuration/etl/etl_tables.d/acls/acls.json index 5e2322ade4..e29fecf7e9 100644 --- a/configuration/etl/etl_tables.d/acls/acls.json +++ b/configuration/etl/etl_tables.d/acls/acls.json @@ -54,6 +54,36 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_type_id", + "columns": [ + "acl_type_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_a_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_a_acl_type_id", + "columns": [ + "acl_type_id" + ], + "referenced_table": "acl_types", + "referenced_columns": [ + "acl_type_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/group_bys.json b/configuration/etl/etl_tables.d/acls/group_bys.json index 4766c6dab4..f58f5d984c 100644 --- a/configuration/etl/etl_tables.d/acls/group_bys.json +++ b/configuration/etl/etl_tables.d/acls/group_bys.json @@ -34,6 +34,42 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_module_id", + "columns": [ + "module_id" + ] + }, + { + "name": "idx_realm_id", + "columns": [ + "realm_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_gb_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_gb_realm_id", + "columns": [ + "realm_id" + ], + "referenced_table": "realms", + "referenced_columns": [ + "realm_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/hierarchies.json b/configuration/etl/etl_tables.d/acls/hierarchies.json index ae2b8a150d..0944ff7f65 100644 --- a/configuration/etl/etl_tables.d/acls/hierarchies.json +++ b/configuration/etl/etl_tables.d/acls/hierarchies.json @@ -34,6 +34,25 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_module_id", + "columns": [ + "module_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_h_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/realms.json b/configuration/etl/etl_tables.d/acls/realms.json index b55dd37df6..0099458358 100644 --- a/configuration/etl/etl_tables.d/acls/realms.json +++ b/configuration/etl/etl_tables.d/acls/realms.json @@ -34,6 +34,25 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "fk_r_module_id", + "columns": [ + "module_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_r_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/statistics.json b/configuration/etl/etl_tables.d/acls/statistics.json index 3ebe685145..508e25e8b6 100644 --- a/configuration/etl/etl_tables.d/acls/statistics.json +++ b/configuration/etl/etl_tables.d/acls/statistics.json @@ -34,6 +34,42 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_module_id", + "columns": [ + "module_id" + ] + }, + { + "name": "idx_realm_id", + "columns": [ + "realm_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_s_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_s_realm_id", + "columns": [ + "realm_id" + ], + "referenced_table": "realms", + "referenced_columns": [ + "realm_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/tabs.json b/configuration/etl/etl_tables.d/acls/tabs.json index db84c91f27..b43924d5ad 100644 --- a/configuration/etl/etl_tables.d/acls/tabs.json +++ b/configuration/etl/etl_tables.d/acls/tabs.json @@ -33,6 +33,42 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_module_id", + "columns": [ + "module_id" + ] + }, + { + "name": "idx_parent_tab_id", + "columns": [ + "parent_tab_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_t_module_id", + "columns": [ + "module_id" + ], + "referenced_table": "modules", + "referenced_columns": [ + "module_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_t_parent_tab_id", + "columns": [ + "parent_tab_id" + ], + "referenced_table": "tabs", + "referenced_columns": [ + "tab_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/user_acl_group_by_parameters.json b/configuration/etl/etl_tables.d/acls/user_acl_group_by_parameters.json index 5fdb22051a..e81d1f1c0c 100644 --- a/configuration/etl/etl_tables.d/acls/user_acl_group_by_parameters.json +++ b/configuration/etl/etl_tables.d/acls/user_acl_group_by_parameters.json @@ -39,6 +39,59 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_user_id", + "columns": [ + "user_id" + ] + }, + { + "name": "idx_acl_id", + "columns": [ + "acl_id" + ] + }, + { + "name": "idx_group_by_id", + "columns": [ + "group_by_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_uagbp_user_id", + "columns": [ + "user_id" + ], + "referenced_table": "Users", + "referenced_columns": [ + "id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_uagbp_acl_id", + "columns": [ + "acl_id" + ], + "referenced_table": "acls", + "referenced_columns": [ + "acl_id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_uagbp_group_by_id", + "columns": [ + "group_by_id" + ], + "referenced_table": "group_bys", + "referenced_columns": [ + "group_by_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/acls/user_acls.json b/configuration/etl/etl_tables.d/acls/user_acls.json index 5063f6ef32..c55498bfa9 100644 --- a/configuration/etl/etl_tables.d/acls/user_acls.json +++ b/configuration/etl/etl_tables.d/acls/user_acls.json @@ -29,6 +29,42 @@ ], "type": "BTREE", "is_unique": true + }, + { + "name": "idx_user_id", + "columns": [ + "user_id" + ] + }, + { + "name": "idx_acl_id", + "columns": [ + "acl_id" + ] + } + ], + "foreign_key_constraints": [ + { + "name": "fk_ua_user_id", + "columns": [ + "user_id" + ], + "referenced_table": "Users", + "referenced_columns": [ + "id" + ], + "on_delete": "CASCADE" + }, + { + "name": "fk_ua_acl_id", + "columns": [ + "acl_id" + ], + "referenced_table": "acls", + "referenced_columns": [ + "acl_id" + ], + "on_delete": "CASCADE" } ] } diff --git a/configuration/etl/etl_tables.d/xdb/users.json b/configuration/etl/etl_tables.d/xdb/users.json index 46b86c65a0..7ff9716e8b 100644 --- a/configuration/etl/etl_tables.d/xdb/users.json +++ b/configuration/etl/etl_tables.d/xdb/users.json @@ -96,6 +96,13 @@ "name": "user_type", "type": "int(11)", "nullable": false + }, + { + "name": "sticky", + "comment": "Set when an admin manually updates the [person|organization]_id. Indicates that further modification must be made manually by an admin.", + "type": "tinyint(1) unsigned", + "nullable": false, + "default": 0 } ], "indexes": [ diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini index da43c096ab..81844081a8 100644 --- a/configuration/portal_settings.ini +++ b/configuration/portal_settings.ini @@ -6,7 +6,7 @@ contact_page_recipient = "" tech_support_recipient = "" ; The version number is updated during the upgrade process. -version = "8.0.0" +version = "8.1.0" debug_mode = "off" debug_recipient = "" @@ -49,7 +49,6 @@ singlejobviewer = "off" multiple_service_providers = "off" [sso] -force_default_organization = "on" ; used to show local sign in portion of the sign in modal ; setting to true will show it. show_local_login = "false" diff --git a/configuration/rawstatistics.d/.gitignore b/configuration/rawstatistics.d/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/configuration/rawstatistics.json b/configuration/rawstatistics.json new file mode 100644 index 0000000000..0809b81b40 --- /dev/null +++ b/configuration/rawstatistics.json @@ -0,0 +1,3 @@ +{ + "realms": [] +} diff --git a/configuration/user_management.json b/configuration/user_management.json new file mode 100644 index 0000000000..c7ec23b6b0 --- /dev/null +++ b/configuration/user_management.json @@ -0,0 +1,3 @@ +{ + "person_mapping": "SELECT DISTINCT(person_id) AS person_id FROM `modw`.`systemaccount` WHERE username = :username" +} diff --git a/docs/faq.md b/docs/faq.md index 72f72e9149..28d3bcb894 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -51,6 +51,7 @@ configuration. thread_cache_size = 8 query_cache_limit = 16M query_cache_size = 1G + group_concat_max_len = 16M [optimizing-mysql]: https://dev.mysql.com/doc/refman/5.5/en/optimizing-the-server.html diff --git a/docs/simpleSAMLphp.md b/docs/simpleSAMLphp.md index f1ea071f92..95d1525cbb 100644 --- a/docs/simpleSAMLphp.md +++ b/docs/simpleSAMLphp.md @@ -73,24 +73,16 @@ Conditionally, if your installation supports multiple organizations then you mus * `organization` * This will be used to identify which Organization the user should be associated with via the `modw.organization.name` column -There is one property in `portal_settings.ini` that supports and interacts with this SAML property. -* `force_default_organization`: `on`|`off` - * Controls how Organization association is handled when new SSO users log in to XDMoD. - To get a better idea of how these properties translate into expected behavior during SSO login. Please refer to the table below: -|Property Name |Value|SAML Organization Present|Person Present|Expected Behavior | -|:---------------------------|:---:|:-----------------------:|:------------:|:-----------------| -| force_default_organization | on | true | true | The user is associated with the organization defined in `organization.json`| -| force_default_organization | on | true | false | The user is associated with the organization defined in `organization.json`| -| force_default_organization | on | false | true | The user is associated with the organization defined in `organization.json`| -| force_default_organization | on | false | false | The user is associated with the organization defined in `organization.json`| -| force_default_organization | off | true | true | The user is associated with the the Person's organization if found, else the Unknown Organization| -| force_default_organization | off | true | false | The user is associated with the SAML Organization if found, else the Unknown organization| -| force_default_organization | off | false | true | The user is associated with the Persons organization if found, else the Unknown organization| -| force_default_organization | off | false | false | The user is associated with the Unknown organization| +|SAML Organization Present|Person Present|Expected Behavior | +|:-----------------------:|:------------:|:-----------------| +| true | true | The user is associated with the the Person's organization if found, else the SAML Organization if found, else the Unknown Organization| +| true | false | The user is associated with the SAML Organization if found, else the Unknown organization| +| false | true | The user is associated with the Persons organization if found, else the Unknown organization| +| false | false | The user is associated with the Unknown organization| -Here is an example `authsources.php` file: +Here is an example `authsources.php` file **note: keys 60 and 61 must be present** These check that the _mandatory_ username and organization properties are present. ```php 'organization', 'fieldOfScience' => 'field_of_science', 'itname' => 'username' + ), + // Ensures that the 'username' property has one or more non-whitespace characters + 60 => array( + 'class' => 'authorize:Authorize', + 'username' => array( + '/\S+/' + ), + ), + // Ensures that the 'organization' property has one or more non-whitespace characters + 61 => array( + 'class' => 'authorize:Authorize', + 'organization' => array( + '/\S+/' + ) ) ) ), diff --git a/docs/software-requirements.md b/docs/software-requirements.md index 33384abce6..8d82ab674e 100644 --- a/docs/software-requirements.md +++ b/docs/software-requirements.md @@ -131,6 +131,15 @@ database. [Server SQL Modes][sql-mode]. You must set `sql_mode = ''` in your MySQL server configuration. +**NOTE**: Open XDMoD uses the `GROUP_CONCAT()` sql function. The `group_concat_max_len` server system variable must be changed to 16MB from its default value of 1024 bytes. The `max_allowed_packet` +setting must be set to at least 16MB. The recommended setting in the mysql server configuration file is as follows: + +```ini +[mysqld] +max_allowed_packet = 16M +group_concat_max_len = 16M +``` + [sql-mode]: https://dev.mysql.com/doc/refman/5.5/en/sql-mode.html ### PhantomJS diff --git a/docs/upgrade.md b/docs/upgrade.md index 0a9df79734..de3c785095 100644 --- a/docs/upgrade.md +++ b/docs/upgrade.md @@ -46,6 +46,11 @@ merge `portal_settings.ini`. This file will be updated by the upgrade script. If you have manually edited this file, you should create a backup and merge any changes after running the upgrade script. +### Verify server configuration settings + +Double check that the MySQL server configuration settings are consistent with +the recommended values listed on the [software requirements page][mysql-config]. + ### Upgrade Database Schema and Config Files # xdmod-upgrade @@ -89,6 +94,11 @@ changed in the new version. You do not need to merge If you have manually edited this file, you should create a backup and merge any changes after running the upgrade script. +### Verify server configuration settings + +Double check that the MySQL server configuration settings are consistent with +the recommended values listed on the [software requirements page][mysql-config]. + ### Upgrade Database Schema and Config Files # /opt/xdmod-new/bin/xdmod-upgrade @@ -99,6 +109,7 @@ merge any changes after running the upgrade script. - This upgrade includes config file changes. - The contents of `resource_types.json` has been changed to include additional resource types. +- The recommended [MySQL server settings][mysql-config] were updated. 7.5.0 to 7.5.1 Upgrade Notes ---------------------------- @@ -244,3 +255,4 @@ take over an hour if you have millions of job records in your database. - This upgrade includes config file format changes. [github-latest-release]: https://github.com/ubccr/xdmod/releases/latest +[mysql-config]: software-requirements.md#mysql diff --git a/etl/js/lib/dataset_processor.js b/etl/js/lib/dataset_processor.js index 682ff5f8e4..edb58588d1 100644 --- a/etl/js/lib/dataset_processor.js +++ b/etl/js/lib/dataset_processor.js @@ -240,9 +240,7 @@ DatasetProcessor.prototype.process = function (totalCores, coreIndex) { var self = this; var multiCore = totalCores !== undefined && coreIndex !== undefined; if (this.dataset.input.dbEngine == 'mongodb') { - var uri_decode_auth = this.dataset.input.config.uri.indexOf('@') > -1; - - MongoClient.connect(self.dataset.input.config.uri, {native_parser: true, uri_decode_auth: uri_decode_auth}, function(err, db) { + MongoClient.connect(self.dataset.input.config.uri, { useNewUrlParser: true }, function (err, client) { if (err) { self.emit("error", self.dataset.name + ': ' + "MongoClient Open Error: " + util.inspect(err)); self._processEnded = true; @@ -250,6 +248,9 @@ DatasetProcessor.prototype.process = function (totalCores, coreIndex) { return; } + self.client = client; + var db = client.db(); + self.emit('message', self.dataset.name + ': connected to database \'' + db.databaseName + '\''); //look for jobs that haven't been processed yet, @@ -267,8 +268,7 @@ DatasetProcessor.prototype.process = function (totalCores, coreIndex) { return; } - self.db = db; - self.collection = self.db.collection(self.dataset.input.config.collection); + self.collection = db.collection(self.dataset.input.config.collection); // Ensure the query is indexed var indexParams = {}; @@ -378,8 +378,8 @@ DatasetProcessor.prototype.onEndProcess = function () { if (this.stats.currentlyMarking === 0) { this.mysqlPool.end(); this.emit('message', this.dataset.name + ': mysqlPool closed'); - if (this.db) { - this.db.close(); + if (this.client) { + this.client.close(true); this.emit('message', this.dataset.name + ': mongo connection closed'); } diff --git a/etl/js/package.json b/etl/js/package.json index 0646a4a2a0..99234ccac3 100644 --- a/etl/js/package.json +++ b/etl/js/package.json @@ -8,7 +8,7 @@ "dependencies": { "cloneextend": "0.0.x", "ini": "1.2.x", - "mongodb": "2.1.x", + "mongodb": "3.1.x", "mysql": "2.2.x", "tv4": "^1.0.13", "winston": "0.7.x", diff --git a/html/about/release_notes/xdmod.html b/html/about/release_notes/xdmod.html index 8cf9b1b4a1..770c839dc8 100644 --- a/html/about/release_notes/xdmod.html +++ b/html/about/release_notes/xdmod.html @@ -1,9 +1,8 @@

Open XDMoD Release Notes

-

Below is a list of Open XDMoD releases with major features and bug fixes -listed.

+

Below is a list of Open XDMoD releases with major features and bug fixes listed.

-

Version 8.0.0 (2018-09-30)

+

Version 8.0.0 (2018-10-30)

Features @@ -20,10 +19,15 @@

Version 8.0.0 (2018-09-30)

  • All XDMoD user profiles are now associated with an organization. Previously, this was only required for Campus Champions.
    • +
  • Added support for automatically detecting / assigning a new SSO User's + organization.
    • +
  • Added support for automatically detecting if a user's organization has changed + and updating their accounts accordingly. This may include, but is not limited to, + the removal of elevated privileges.
  • Hardened the login and password reset process as a result of a security audit by University of Cambridge.
  • Improved support for resource manager job arrays.
    • -
  • Many improvements to the documentation based on support tickets.
    • +
  • Many improvements to the documentation.
  • ETL diff --git a/html/controllers/user_admin/get_user_details.php b/html/controllers/user_admin/get_user_details.php index 764758f468..d5453b5300 100644 --- a/html/controllers/user_admin/get_user_details.php +++ b/html/controllers/user_admin/get_user_details.php @@ -49,6 +49,7 @@ } $userDetails['is_active'] = $selected_user->getAccountStatus() ? 'active' : 'disabled' ; + $userDetails['sticky'] = $selected_user->isSticky(); $acls = Acls::listUserAcls($selected_user); $populatedAcls = array_reduce( diff --git a/html/controllers/user_admin/update_user.php b/html/controllers/user_admin/update_user.php index 7b654a572f..73be801516 100644 --- a/html/controllers/user_admin/update_user.php +++ b/html/controllers/user_admin/update_user.php @@ -110,6 +110,10 @@ } +if (isset($_POST['sticky'])) { + $user_to_update->setSticky($_POST['sticky'] === 'true'); +} + // Store this users original set of acls before they are possibly modified below. $originalAcls = $user_to_update->getAcls(true); diff --git a/html/gui/general/login.php b/html/gui/general/login.php index 8f9f05048c..0cdbd0820e 100644 --- a/html/gui/general/login.php +++ b/html/gui/general/login.php @@ -4,23 +4,25 @@ $formal_name = isset($_REQUEST['xd_user_formal_name']) ? $_REQUEST['xd_user_formal_name'] : ""; $samlError = false; $auth = null; +$message = ''; + try { $auth = new Authentication\SAML\XDSamlAuthentication(); } catch (InvalidArgumentException $ex) { // This will catch when a configuration directory does not exist if it is set in the environment level } -if ($auth && $auth->isSamlConfigured()) { - $xdmodUser = $auth->getXdmodAccount(); - if ($xdmodUser && $xdmodUser != "EXCEPTION" && $xdmodUser != "ERROR" && $xdmodUser != "EXISTS" && $xdmodUser != "AMBIGUOUS") { +try { + if ($auth && $auth->isSamlConfigured()) { + $xdmodUser = $auth->getXdmodAccount(); if ($xdmodUser->getAccountStatus()) { - \XDSessionManager::recordLogin($xdmodUser); $formal_name = $xdmodUser->getFormalName(); + $xdmodUser->postLogin(); } else { - $samlError = "INACTIVE"; + $message = 'Your account is currently inactive, please contact an administrator.'; } - } else { - $samlError = $xdmodUser; } +} catch (Exception $e) { + $message = $e->getMessage(); } // Used for Single Sign On or samlErrors ?> @@ -57,24 +59,8 @@ function contactAdmin() {

    diff --git a/html/gui/js/modules/job_viewer/JobViewer.js b/html/gui/js/modules/job_viewer/JobViewer.js index ae1c60239d..3f0c70ced7 100644 --- a/html/gui/js/modules/job_viewer/JobViewer.js +++ b/html/gui/js/modules/job_viewer/JobViewer.js @@ -216,7 +216,9 @@ XDMoD.Module.JobViewer = Ext.extend(XDMoD.PortalModule, { modal: true, title: 'Search', layout: 'fit', - resizable: false, + resizable: true, + boxMaxHeight: 641, + boxMaxWidth: 1014, items: [searchPanel] }); searchPanel.relayEvents(self.searchWindow, ['show', 'hide', 'move']); diff --git a/html/gui/js/modules/job_viewer/SearchPanel.js b/html/gui/js/modules/job_viewer/SearchPanel.js index 1f51af81ac..4c7922bc08 100644 --- a/html/gui/js/modules/job_viewer/SearchPanel.js +++ b/html/gui/js/modules/job_viewer/SearchPanel.js @@ -65,6 +65,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { Ext.apply(this, { layout: 'table', width: 1000, + autoScroll: true, border: false, layoutConfig: { columns: 2 @@ -129,8 +130,6 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { window.setWidth(adjWidth); window.setPosition(adjX, adjY); - this._selectInitial('realm-field', 0, null); - this.shown = true; if (!this.children) { this.children = []; @@ -291,25 +290,38 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { }); }, // search_requested + basic_search_realm_selected: function (realm) { + var basicSearch = Ext.getCmp('job-viewer-search-lookup'); + basicSearch.disable(); + var jobidField = Ext.getCmp('basic-localjobid'); + jobidField.reset(); + var resource = Ext.getCmp('basic-resource'); + resource.store.load({ + params: { + realm: realm + } + }); + }, + /** * Event fired when a realm has been selected. * * @param realm */ realm_selected: function (realm) { - var self = this; - if (CCR.exists(self.valueField) && CCR.exists(self.valueField.store)) { - Ext.apply(self.valueField.store.baseParams, { - realm: realm - }); - } - if (CCR.exists(self.searchField) && CCR.exists(self.searchField.store)) { - Ext.apply(self.searchField.store.baseParams, { + Ext.getCmp('search-add').disable(); + Ext.getCmp('job-viewer-search-search').disable(); + this.searchStore.removeAll(); + this.valueField.store.setBaseParam({ + realm: realm + }); + this.searchField.reset(); + this.searchField.store.load({ + params: { realm: realm - }); - self._selectInitial('search-field'); - } - }, // realm_selected + } + }); + }, validate_search_criteria: function() { var lookupValid, searchValid; @@ -908,12 +920,16 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { qtip: 'Use the quick lookup form to search for a job based on its ID and the resource on which it ran.' }], layout: 'border', - height: 135, - items: [ - { + height: 160, + items: [{ xtype: 'fieldset', region: 'center', - items: [ + items: [{ + xtype: 'realmcombo', + id: 'basic-search-realm', + panel: self, + realmSelectEvent: 'basic_search_realm_selected' + }, { xtype: 'combo', fieldLabel: 'Resource', @@ -929,10 +945,15 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { enableKeyEvents: true, store: new Ext.data.JsonStore({ proxy: new Ext.data.HttpProxy({ - url: XDMoD.REST.url + '/' + self.jobViewer.rest.warehouse + '/dimensions/resource?querygroup=tg_usage&realm=SUPREMM&filter=true&token=' + self.token + url: XDMoD.REST.url + '/' + self.jobViewer.rest.warehouse + '/dimensions/resource', + method: 'GET' }), - idProperty: 'id', - autoLoad: false, + baseParams: { + realm: CCR.xdmod.ui.rawDataAllowedRealms[0], + token: self.token + }, + storeId: 'jobviewer-basicsearch-resource', + autoLoad: true, root: 'results', fields: [ {name: 'id', type: 'string'}, @@ -949,12 +970,6 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { } }), listeners: { - render: { - fn: function (combo) { - combo.getStore().load(); - }, - single: true - }, select: function( /* combo, record, index */ ) { self.fireEvent('validate_search_criteria'); }, @@ -992,7 +1007,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { handler: function( /*button, event*/ ) { var resourceField = Ext.getCmp('basic-resource'); var localjobidField = Ext.getCmp('basic-localjobid'); - var realmField = Ext.getCmp('realm-field'); + var realmField = Ext.getCmp('basic-search-realm'); var params = { realm: realmField.getValue(), params: JSON.stringify({ @@ -1003,24 +1018,24 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { self.fireEvent('search_requested', self, 'Lookup', params); } }] - }] - }, - { - xtype: "panel", - id: "job-viewer-advanced-search", - title: "Advanced Search", - tools: [{ - id: 'help', - qtip: 'Use the advanced search form to search for jobs based on one or more filters and a date range.' - }], - height: 400, - layout: 'border', - items: [{ - region: 'center', - id: 'criteria_advanced', - xtype: 'fieldset', - labelWidth: 55, + }] + }, + { + xtype: 'panel', + id: 'job-viewer-advanced-search', + title: 'Advanced Search', + tools: [{ + id: 'help', + qtip: 'Use the advanced search form to search for jobs based on one or more filters and a date range.' + }], + height: 375, + layout: 'border', items: [{ + region: 'center', + id: 'criteria_advanced', + xtype: 'fieldset', + labelWidth: 55, + items: [{ xtype: 'datefield', id: 'search_start_date', format: 'Y-m-d', @@ -1070,73 +1085,9 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { }, { id: 'realm-field', - xtype: 'combo', - hidden: true, - fieldLabel: 'Realm', - disabled: true, - emptyText: 'Select a Realm', - triggerAction: 'all', - selectOnFocus: true, - displayField: 'name', - valueField: 'name', - forceSelection: true, - store: new Ext.data.JsonStore({ - proxy: new Ext.data.HttpProxy({ - method: 'GET', - /*'/rest/datawarehouse/explorer/realms/'*/ - url: XDMoD.REST.url + '/' + self.jobViewer.rest.warehouse + '/realms' - }), - baseParams: { - token: self.token, - querygroup: 'tg_usage', - filter: true - }, - storeId: 'realmStore', - root: 'results', - fields: ['name'], - listeners: { - - load: function (store, records /*, options*/) { - if (CCR.exists(records)) { - for (var i = 0; i < records.length; i++) { - var record = records[i]; - record.set('name', record.json); - if ('SUPREMM' !== record.get('name')) { - store.remove(record); - } - } - } - }, - exception: function (proxy, type, action, exception, response) { - switch (response.status) { - case 403: - case 500: - var details = Ext.decode(response.responseText); - Ext.Msg.alert("Error " + response.status + " " + response.statusText, details.message); - break; - case 401: - // Do nothing - break; - default: - Ext.Msg.alert(response.status + ' ' + response.statusText, response.responseText); - } - } - } - }), - listeners: { - select: function (field, record /*, index*/) { - if (CCR.exists(record)) { - var value = record.get('name'); - self.fireEvent('realm_selected', value); - } - - }, - afterrender: function (field) { - if (!CCR.exists(self.realmField)) { - self.realmField = field; - } - } - } + xtype: 'realmcombo', + panel: self, + realmSelectEvent: 'realm_selected' }, { xtype: 'compositefield', @@ -1167,6 +1118,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { }), baseParams: { token: self.token, + realm: CCR.xdmod.ui.rawDataAllowedRealms[0], querygroup: 'tg_usage' }, @@ -1175,6 +1127,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { direction: 'ASC' }, groupField: 'Category', + autoLoad: true, storeId: 'dimensionResults', reader: new Ext.data.JsonReader({ root: 'results', @@ -1247,6 +1200,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { baseParams: { token: self.token, querygroup: 'tg_usage', + realm: CCR.xdmod.ui.rawDataAllowedRealms[0], filter: 'true' }, storeId: 'valueStore', @@ -1414,7 +1368,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { self.fireEvent('search_requested', self, 'Search', params); } }] - }] + }] }, { @@ -1595,8 +1549,7 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { }, /** - * Perform the steps necessary to get the SearchPanel ready - * for the editing of a 'Quick Search' + * Load the Quick Job Lookup form with the provided searchTerms. * * @param {Object} searchTerms */ @@ -1605,32 +1558,19 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { var params = JSON.parse(searchTerms.params); - // populate the basic settings. - var resourceField = Ext.getCmp('basic-resource'); - var localJobIdField = Ext.getCmp('basic-localjobid'); - - var setLocalJobId = function() { - localJobIdField.setValue(params.local_job_id); - localJobIdField.focus(); - self.fireEvent('validate_search_criteria'); - }; - var setResourceId = function() { - resourceField.setValue(params.resource_id); - var id = resourceField.store.find('id', params.resource_id); - resourceField.selectedIndex = id || - 1; - setLocalJobId(); - }; + Ext.getCmp('basic-search-realm').setValue(searchTerms.realm); + Ext.getCmp('basic-localjobid').setValue(params.local_job_id); - var loadListener = function() { - setResourceId(); - resourceField.un('load', loadListener); - }; - - if (resourceField.store.getTotalCount() < 1) { - resourceField.store.on('load', loadListener); - } else { - setResourceId(); - } + var resourceField = Ext.getCmp('basic-resource'); + resourceField.store.load({ + params: { + realm: searchTerms.realm + }, + callback: function () { + resourceField.setValue(params.resource_id); + self.fireEvent('validate_search_criteria'); + } + }); }, /** @@ -1651,21 +1591,10 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { startDateField.setValue(startDate); endDateField.setValue(endDate); - var realm = searchTerms.realm; - - var setRealm = function() { - if (realm === undefined) { - var defaultRealm = self.realmField.store.getAt(0); - if (defaultRealm) { - realm = defaultRealm.get('name'); - } - } - - self.realmField.setValue(realm); + var realmField = Ext.getCmp('realm-field'); - var id = self.realmField.store.find('name', realm); - self.realmField.selectedIndex = id || - 1; - }; + var realm = searchTerms.realm; + realmField.setValue(searchTerms.realm); var clearSearchCriteria = function() { var store = CCR.exists(self.searchStore) ? self.searchStore : null; @@ -1733,23 +1662,9 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { } }; - var setState = function() { - setRealm(); - clearSearchCriteria(); - addSearchCriteria(); - self.resetResults(); - }; - - var realmLoadListener = function() { - setState(); - self.realmField.store.un('load', realmLoadListener); - }; - - if (this.realmField.store.getTotalCount() < 1) { - this.realmField.store.on('load', realmLoadListener); - } else { - setState(); - } + clearSearchCriteria(); + addSearchCriteria(); + self.resetResults(); }, /** @@ -2039,3 +1954,28 @@ XDMoD.Module.JobViewer.SearchPanel = Ext.extend(Ext.Panel, { }); + +XDMoD.Module.JobViewer.RealmCombo = Ext.extend(Ext.form.ComboBox, { + fieldLabel: 'Realm', + mode: 'local', + typeAhead: true, + triggerAction: 'all', + selectOnFocus: true, + forceSelection: true, + store: CCR.xdmod.ui.rawDataAllowedRealms, + value: CCR.xdmod.ui.rawDataAllowedRealms[0], + listeners: { + select: function (field) { + if (field.startValue !== field.getValue()) { + this.panel.fireEvent(this.realmSelectEvent, field.getValue()); + } + }, + blur: function (field) { + if (field.startValue !== field.getValue()) { + this.panel.fireEvent(this.realmSelectEvent, field.getValue()); + } + } + } +}); + +Ext.reg('realmcombo', XDMoD.Module.JobViewer.RealmCombo); diff --git a/html/gui/js/modules/metric_explorer/MetricExplorer.js b/html/gui/js/modules/metric_explorer/MetricExplorer.js index a363ad02d4..7d324fc81e 100644 --- a/html/gui/js/modules/metric_explorer/MetricExplorer.js +++ b/html/gui/js/modules/metric_explorer/MetricExplorer.js @@ -887,12 +887,10 @@ Ext.apply(XDMoD.Module.MetricExplorer, { if (drillId) { if (CCR.xdmod.ui.jobViewer && legendItemClick === false) { - var raw_data_allowed_realms = ['SUPREMM']; - var raw_data_disabled = true; - var raw_data_tooltip = 'Show raw data is only available for the following data realms: ' + raw_data_allowed_realms.join(', '); + var raw_data_tooltip = 'Show raw data is only available for the following data realms: ' + CCR.xdmod.ui.rawDataAllowedRealms.join(', '); - if (raw_data_allowed_realms.indexOf(realm) !== -1) { + if (CCR.xdmod.ui.rawDataAllowedRealms.indexOf(realm) !== -1) { if (dimension == 'none') { raw_data_disabled = true; raw_data_tooltip = 'Show raw data is only available for drilled-down datasets.
    ' + diff --git a/html/index.php b/html/index.php index eff422b187..a6b665fa1e 100644 --- a/html/index.php +++ b/html/index.php @@ -282,6 +282,11 @@ function isReferrer($referrer) print "CCR.xdmod.ui.isCenterDirector = $primary_center_director;\n"; } + $config = \Xdmod\Config::factory(); + $rawDataRealms = array_keys($config['rawstatistics']['realms']); + + print "CCR.xdmod.ui.rawDataAllowedRealms = " . json_encode($rawDataRealms) . ";\n"; + print "CCR.xdmod.ui.disabledMenus = " . json_encode(Acls::getDisabledMenus($user, $realms)) . ";\n"; if ($userLoggedIn) { diff --git a/html/internal_dashboard/controllers/pseudo_login.php b/html/internal_dashboard/controllers/pseudo_login.php index 46ffc5596e..0cdc36d2af 100644 --- a/html/internal_dashboard/controllers/pseudo_login.php +++ b/html/internal_dashboard/controllers/pseudo_login.php @@ -30,7 +30,7 @@ function getAbsoluteURL() { exit; } - XDSessionManager::recordLogin($user); + $user->postLogin(); $redirect_url = str_replace('internal_dashboard/controllers/pseudo_login.php', '', getAbsoluteURL()); diff --git a/html/internal_dashboard/js/admin_panel/SectionExistingUsers.js b/html/internal_dashboard/js/admin_panel/SectionExistingUsers.js index 56386c0944..8ecb22e8f4 100644 --- a/html/internal_dashboard/js/admin_panel/SectionExistingUsers.js +++ b/html/internal_dashboard/js/admin_panel/SectionExistingUsers.js @@ -203,13 +203,10 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { /* eslint-disable no-use-before-define */ settingsAreDirty = true; saveIndicator.show(); - - // If the currently selected person is the Unknown person then make sure we - // enable the institution drop down for manual overrides. - if (cmbUserMapping.getValue() === '-1') { - cmbInstitution.setDisabled(false); + if (cmbUserMapping.startValue !== cmbUserMapping.getValue() || cmbInstitution.startValue !== cmbInstitution.getValue()) { + stickyCheckbox.setValue(true); } else { - cmbInstitution.setDisabled(true); + stickyCheckbox.setValue(false); } /* eslint-enable no-use-before-define */ }; @@ -359,17 +356,25 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { }, this, { single: true }); // ------------------------------------------ + var stickyCheckbox = new Ext.form.Checkbox({ + boxLabel: 'Manually Overridden', + labelStyle: 'display: none; visible: none' + }); + var cmbInstitution = new CCR.xdmod.ui.InstitutionDropDown({ fieldLabel: 'Institution', emptyText: 'No Institution Selected', width: 165, listWidth: 310, - listeners: { change: comboChangeHandler }, + listeners: { + select: comboChangeHandler, + blur: comboChangeHandler, + change: comboChangeHandler + }, allowBlank: false }); - cmbInstitution.setDisabled(true); // ------------------------------------------ @@ -687,7 +692,9 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { valueProperty: 'id' }, listeners: { - change: comboChangeHandler + change: comboChangeHandler, + select: comboChangeHandler, + blur: comboChangeHandler } }); @@ -762,7 +769,8 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { cmbUserType, lblXSEDEUser, cmbUserMapping, - cmbInstitution + cmbInstitution, + stickyCheckbox ] }); @@ -850,7 +858,8 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { '-1' : cmbUserMapping.getValue(), institution: cmbInstitution.getValue(), - user_type: userType + user_type: userType, + sticky: stickyCheckbox.getValue() }; Ext.Ajax.request({ @@ -1142,9 +1151,6 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { // We then disable / enable controls based on the information retrieved. userSettings.setDisabled(false); - // We disabled cmbInstitution because it's always disabled now. - cmbInstitution.setDisabled(true); - userEditor.setTitle('User Details: ' + Ext.util.Format.htmlEncode(json.user_information.formal_name)); existingUserEmailField.setValue(json.user_information.email_address); @@ -1170,16 +1176,9 @@ XDMoD.ExistingUsers = Ext.extend(Ext.Panel, { cmbUserType.setDisabled(false); cmbUserType.setValue(cached_user_type); } - + stickyCheckbox.setValue(Boolean(json.user_information.sticky)); cmbInstitution.initializeWithValue(json.user_information.institution, json.user_information.institution_name); - // If the current person mapped is the Unknown person then make - // sure to enable the institution drop down for manual override. - // we don't need an else as it's already setDisabled(true) above. - if (cmbUserMapping.getValue() === '-1') { - cmbInstitution.setDisabled(false); - } - /** * acls are in the form: * { diff --git a/html/internal_dashboard/user_check.php b/html/internal_dashboard/user_check.php index 4f0e547606..fb3bb68314 100644 --- a/html/internal_dashboard/user_check.php +++ b/html/internal_dashboard/user_check.php @@ -14,8 +14,9 @@ denyWithMessage('Invalid login'); } + $user->postLogin(); + $_SESSION['xdDashboardUser'] = $user->getUserID(); - XDSessionManager::recordLogin($user); } // Check that the user has been set in the session. diff --git a/open_xdmod/modules/xdmod/build.json b/open_xdmod/modules/xdmod/build.json index 19a97a79ed..1e45d7b898 100644 --- a/open_xdmod/modules/xdmod/build.json +++ b/open_xdmod/modules/xdmod/build.json @@ -1,6 +1,6 @@ { "name": "xdmod", - "version": "8.0.0", + "version": "8.1.0", "release": "1.0", "files": { "include_paths": [ @@ -64,6 +64,8 @@ "configuration/portal_settings.ini", "configuration/portal_settings.d", "configuration/processor_buckets.json", + "configuration/rawstatistics.json", + "configuration/rawstatistics.d", "configuration/resource_specs.json", "configuration/resource_types.json", "configuration/resources.json", @@ -72,6 +74,7 @@ "configuration/rest.d", "configuration/setup.json", "configuration/update_check.json", + "configuration/user_management.json", "configuration/assets.json", "configuration/modules.json", "configuration/hierarchies.json", diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/BaseUserAdminTest.php b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/BaseUserAdminTest.php index 2e39539113..d17485734f 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/BaseUserAdminTest.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/BaseUserAdminTest.php @@ -283,7 +283,7 @@ protected function createUser(array $options) return $userId; } - protected function updateUser($userId, $password = null, $firstName = null, $lastName = null, $emailAddress = null) + protected function updateCurrentUser($userId, $password = null, $firstName = null, $lastName = null, $emailAddress = null) { $helper = new XdmodTestHelper(); $helper->authenticateDashboard('mgr'); @@ -335,6 +335,53 @@ protected function updateUser($userId, $password = null, $firstName = null, $las $helper->logout(); } + /** + * Update the user identified by $userId w/ the values supplied for the rest of the function + * arguments. Note that this utilizes the user_admin/update_user operation to do the updating + * as opposed to the `updateCurrentUser` function that utilizes the `users/current` rest path. + * + * @param int $userId + * @param string $emailAddress + * @param array $acls + * @param int $assignedPerson + * @param int $institution + * @param int $user_type + * @throws Exception + */ + protected function updateUser($userId, $emailAddress, $acls, $assignedPerson, $institution, $user_type, $sticky = false) + { + $data = array( + 'operation' => 'update_user', + 'uid' => $userId, + 'email_address' => $emailAddress, + 'acls' => json_encode( + $acls + ), + 'assigned_user' => $assignedPerson, + 'institution' => $institution, + 'user_type' => $user_type, + 'sticky' => $sticky + ); + $this->helper->authenticateDashboard('mgr'); + + $response = $this->helper->post('controllers/user_admin.php', null, $data); + + $this->assertEquals('application/json', $response[1]['content_type']); + $this->assertEquals(200, $response[1]['http_code']); + + + $data = $response[0]; + + $this->assertArrayHasKey('success', $data, "Expected the returned data structure to contain a 'success' property."); + $this->assertArrayHasKey('status', $data, "Expected the returned data structure to contain a 'status' property."); + $this->assertArrayHasKey('username', $data, "Expected the returned data structure to contain a 'username' property."); + $this->assertArrayHasKey('user_type', $data, "Expected the returned data structure to contain a 'user_type' property."); + + $this->assertTrue($data['success'], "Expected the 'success' property to be: true Received: " . $data['success']); + + $this->helper->logoutDashboard(); + } + /** * Attempts to lookup a user_id for the user identified by the provided * $userName and $userGroup. This will either return the id or fail the diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/SSOLoginTest.php b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/SSOLoginTest.php index 830b4cd57e..ba56008360 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/SSOLoginTest.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/SSOLoginTest.php @@ -2,18 +2,174 @@ namespace IntegrationTests\Controllers; -class SSOLoginTest extends \PHPUnit_Framework_TestCase +use CCR\DB; + +class SSOLoginTest extends BaseUserAdminTest { + /** + * key to use when providing / retrieving the value that controls whether or not to include the + * default SSO parameters when conducting an SSO login. By default these keys / values will be + * included which may cause problems if you're attempting to test the absence of said keys / + * values + * + * @var string + */ + const INCLUDE_DEFAULT_SSO = 'include_default_sso'; + + /** + * Key to use when providing / retrieving the value that indicates whether or not a user is + * expected to be created and therefor should be removed after the test is run. + * + * @var string + */ + const REMOVE_USER = 'remove_user'; + + /** + * Key to use when retrieving the username ( 'itname' ) value from SSO properties. + * + * @var string + */ + const SSO_USERNAME = 'itname'; + + /** + * Key to use when providing / retrieving the value that indicates whether or not a user should + * have the 'sticky' bit set + * + * @var string + */ + const STICKY = 'sticky'; + + /** + * Key to use when providing / retrieving the value that must match the Users organization_id. + * + * @var string + */ + const EXPECTED_ORG = 'expected_org'; + + /** + * Key to use when providing / retrieving the set of acls a user is to be updated with. + * @var string + */ + const SET_ACLS = 'acls'; + + /** + * Key to use when providing / retrieving the set of acls a user is expected to have after + * they have logged in. + * @var string + */ + const EXPECTED_ACLS = 'expected_acls'; + + /** + * Key to use when providing / retrieving the info to use when creating a new person. + * @var string + */ + const CREATE_PERSON = 'create_person'; + + /** + * Key to use when providing / retrieving the info to be used when creating a new system_account + * record. + * @var string + */ + const CREATE_SYSTEM_ACCOUNT = 'create_system_account'; + + /** + * Key to use when providing / retrieving the information to be used in removing a person. + * aka. their 'long_name' value. + * + * @var string + */ + const REMOVE_PERSON = 'remove_person'; + + /** + * Key to use when providing / retrieving information to be used in removing a system_account. + * aka. their 'username' value. + * + * @var string + */ + const REMOVE_SYSTEM_ACCOUNT = 'remove_system_account'; + + /** + * Key to use when providing / retrieving information to be used when setting the current users + * organization. + * + * @var string + */ + const SET_ORGANIZATION = 'set_organization'; + /** * used to test that SSO logins work correctly and the correct user information * is reported * * @dataProvider loginsProvider */ - public function testLogin($ssoSettings, $expected) + public function testLogin($ssoSettings, $expected, $testOptions = array()) { $helper = new \TestHarness\XdmodTestHelper(); - $helper->authenticateSSO($ssoSettings); + $peopleHelper = new \TestHarness\PeopleHelper(); + + $includeDefault = \xd_utilities\array_get($testOptions, self::INCLUDE_DEFAULT_SSO, true); + $removeUser = \xd_utilities\array_get($testOptions, self::REMOVE_USER, false); + $sticky = \xd_utilities\array_get($testOptions, self::STICKY, false); + $expectedOrg = \xd_utilities\array_get($testOptions, self::EXPECTED_ORG, null); + $setAcls = \xd_utilities\array_get($testOptions, self::SET_ACLS, null); + $setOrganization = \xd_utilities\array_get($testOptions, self::SET_ORGANIZATION, null); + $expectedAcls = \xd_utilities\array_get($testOptions, self::EXPECTED_ACLS, null); + + $createPerson = \xd_utilities\array_get($testOptions, self::CREATE_PERSON, null); + $createSystemAccount = \xd_utilities\array_get($testOptions, self::CREATE_SYSTEM_ACCOUNT, null); + + $removePerson = \xd_utilities\array_get($testOptions, self::REMOVE_PERSON, null); + $removeSystemAccount = \xd_utilities\array_get($testOptions, self::REMOVE_SYSTEM_ACCOUNT, null); + + $username = \xd_utilities\array_get($ssoSettings, self::SSO_USERNAME, ''); + + // If we need to create a person then do it now. Person needs to be created before a system_account + // so that it can be associated with it. + if ($createPerson) { + $peopleHelper->createPerson( + $createPerson['organization_id'], + $createPerson['nsfstatuscode_id'], + $createPerson['first_name'], + $createPerson['last_name'], + $createPerson['long_name'], + $createPerson['short_name'] + ); + } + + // If we need to create a system account then go ahead and do it now. + if ($createSystemAccount) { + $this->createSystemAccount( + $createSystemAccount['person_long_name'], + $createSystemAccount['resource_id'], + $createSystemAccount['username'] + ); + } + + // Take care of setting the sticky bit for a user. NOTE: Can only be set for users that exist. + if ($sticky) { + $userId = $this->retrieveUserId($username, SSO_USER_TYPE); + $properties = $this->retrieveUserProperties( + $userId, + array( + 'email_address', + 'assigned_user_id', + 'institution' + ) + ); + + $this->updateUser( + $userId, + $properties['email_address'], + array('usr' => array()), + $properties['assigned_user_id'], + $properties['institution'], + SSO_USER_TYPE, + 'true' + ); + } + + // Perform the SSO login + $helper->authenticateSSO($ssoSettings, $includeDefault); $response = $helper->get('index.php'); $this->assertEquals(200, $response[1]['http_code']); @@ -22,29 +178,902 @@ public function testLogin($ssoSettings, $expected) preg_match_all('/^(CCR\.xdmod.[a-zA-Z_\.]*) = ([^=;]*);?$/m', $response[0], $matches); $jsvariables = array_combine($matches[1], $matches[2]); - foreach($expected as $varname => $varvalue) - { + // Ensure that everything is copacetic + foreach ($expected as $varname => $varvalue) { $this->assertEquals($varvalue, $jsvariables[$varname]); } + + // Log the SSO User out + $helper->logout(); + + // If specified, update the users set of acls + if ($setAcls) { + $userId = $this->retrieveUserId($username, SSO_USER_TYPE); + $properties = $this->retrieveUserProperties( + $userId, + array( + 'email_address', + 'assigned_user_id', + 'institution' + ) + ); + $this->updateUser( + $userId, + $properties['email_address'], + $setAcls, + $properties['assigned_user_id'], + $properties['institution'], + SSO_USER_TYPE + ); + } + + // If specified, update this users organization + if ($setOrganization) { + $userId = $this->retrieveUserId($username, SSO_USER_TYPE); + $properties = $this->retrieveUserProperties( + $userId, + array( + 'email_address', + 'assigned_user_id', + 'acls' + ) + ); + + $this->updateUser( + $userId, + $properties['email_address'], + $properties['acls'], + $properties['assigned_user_id'], + $setOrganization, + SSO_USER_TYPE, + false + ); + } + + // If specified, ensure that this user's organization is as expected. + if ($expectedOrg) { + $userId = $this->retrieveUserId($username, SSO_USER_TYPE); + $actualOrganization = $this->retrieveUserProperties( + $userId, + array( + 'institution' + ) + ); + $this->assertEquals($expectedOrg, $actualOrganization, "Expected $expectedOrg == $actualOrganization."); + } + + // If specified, ensure that this users acls are as expected. + if ($expectedAcls) { + $userId = $this->retrieveUserId($username, SSO_USER_TYPE); + $actualAcls = $this->retrieveUserProperties( + $userId, + array( + 'acls' + ) + ); + $this->assertEquals(array_keys($expectedAcls), array_keys($actualAcls), "Expected Acls !== Actual Acls"); + } + + if ($removeSystemAccount) { + $this->removeSystemAccount($removeSystemAccount); + } + + if ($removePerson) { + $peopleHelper->removePerson($removePerson); + } + + if ($removeUser) { + $userId = $this->retrieveUserId($username, SSO_USER_TYPE); + $this->removeUser($userId, $username); + } } public function loginsProvider() { return array( + // 0 NU1: New User Test 1 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + + // 1 NU2: New User Test 2 array( array( - 'itname' => 'alpsw', + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::REMOVE_USER => true + ) + ), + // 2 NU3: New User Test 3 + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'UB CCR', 'firstName' => 'Alpine', 'lastName' => 'Swift', 'email' => 'alpsw@example.com' ), array( - 'CCR.xdmod.ui.username' => "'alpsw'", + 'CCR.xdmod.ui.username' => "'testy'", 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + + // 3 EU1: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1 + ) + ), + + // 4 EU1 + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::STICKY => true, + self::EXPECTED_ORG => -1, + self::REMOVE_USER => true + ) + ), + + // 5 E02: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1 + ) + ), + + // 6 E02 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::REMOVE_USER => true + ) + ), + + // 7 E03: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::SET_ACLS => array('usr' => array(), 'cd' => array()), + self::EXPECTED_ORG => -1 ) - ) + ), + + // 8 E03 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'alpsw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ACLS => array('usr' => array()), + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + + // 9 E04: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1 + ) + ), + + // 10 E04 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'alpsw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ACLS => array('usr' => array()), + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + + // 11 E05: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1 + ) + ), + + // 12 E05 + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'alpsw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ACLS => array('usr' => array()), + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + + // 13 E06: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::CREATE_PERSON => array( + 'organization_id' => -1, + 'nsfstatuscode_id' => 0, + 'first_name' => 'Testy', + 'last_name' => 'Person', + 'long_name' => 'Person, Testy', + 'short_name' => 'Person, T', + ), + self::CREATE_SYSTEM_ACCOUNT => array( + 'person_long_name' => 'Person, Testy', + 'resource_id' => 5, + 'username' => 'teper' + ) + ) + ), + + // 14 E06 + array( + array( + 'itname' => 'testy', + 'system_username' => 'teper', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ACLS => array('usr' => array()), + self::EXPECTED_ORG => -1, + self::REMOVE_PERSON => 'Person, Testy', + self::REMOVE_SYSTEM_ACCOUNT => 'teper', + self::REMOVE_USER => true + ) + ), + + // 15 E07: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::SET_ACLS => array('usr' => array(), 'cd' => array()), + + self::CREATE_PERSON => array( + 'organization_id' => -1, + 'nsfstatuscode_id' => 0, + 'first_name' => 'Testy', + 'last_name' => 'Person', + 'long_name' => 'Person, Testy', + 'short_name' => 'Person, T', + ), + self::CREATE_SYSTEM_ACCOUNT => array( + 'person_long_name' => 'Person, Testy', + 'resource_id' => 5, + 'username' => 'teper' + ) + ) + ), + + // 16 E07 + array( + array( + 'itname' => 'testy', + 'system_username' => 'teper', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ACLS => array('usr' => array()), + self::EXPECTED_ORG => 1, + self::REMOVE_PERSON => 'Person, Testy', + self::REMOVE_SYSTEM_ACCOUNT => 'teper', + self::REMOVE_USER => true + ) + ), + + // 17 E08: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Unknown, Unknown"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::CREATE_PERSON => array( + 'organization_id' => -1, + 'nsfstatuscode_id' => 0, + 'first_name' => 'Testy', + 'last_name' => 'Person', + 'long_name' => 'Person, Testy', + 'short_name' => 'Person, T', + ), + self::CREATE_SYSTEM_ACCOUNT => array( + 'person_long_name' => 'Person, Testy', + 'resource_id' => 5, + 'username' => 'teper' + ) + ) + ), + + // 18 E08 + array( + array( + 'itname' => 'testy', + 'system_username' => 'teper', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ACLS => array('usr' => array()), + self::EXPECTED_ORG => 1, + self::REMOVE_PERSON => 'Person, Testy', + self::REMOVE_SYSTEM_ACCOUNT => 'teper', + self::REMOVE_USER => true + ) + ), + + // 19 E09: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'teper', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::CREATE_PERSON => array( + 'organization_id' => -1, + 'nsfstatuscode_id' => 0, + 'first_name' => 'Testy', + 'last_name' => 'Person', + 'long_name' => 'Person, Testy', + 'short_name' => 'Person, T', + ), + self::CREATE_SYSTEM_ACCOUNT => array( + 'person_long_name' => 'Person, Testy', + 'resource_id' => 5, + 'username' => 'teper' + ) + ) + ), + + // 20 E09 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'UB CCR', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::REMOVE_PERSON => 'Person, Testy', + self::REMOVE_SYSTEM_ACCOUNT => 'teper', + self::REMOVE_USER => true + ) + ), + + // 21 E10: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'teper', + 'orgId' => 'testy', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => -1, + self::SET_ACLS => array('usr' => array(), 'cd' => array()), + self::CREATE_PERSON => array( + 'organization_id' => -1, + 'nsfstatuscode_id' => 0, + 'first_name' => 'Testy', + 'last_name' => 'Person', + 'long_name' => 'Person, Testy', + 'short_name' => 'Person, T', + ), + self::CREATE_SYSTEM_ACCOUNT => array( + 'person_long_name' => 'Person, Testy', + 'resource_id' => 5, + 'username' => 'teper' + ) + ) + ), + + // 22 E10 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::EXPECTED_ACLS => array('usr' => array()), + self::REMOVE_PERSON => 'Person, Testy', + self::REMOVE_SYSTEM_ACCOUNT => 'teper', + self::REMOVE_USER => true + ) + ), + + // 23 E11: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'teper', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctesterson@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::CREATE_PERSON => array( + 'organization_id' => -1, + 'nsfstatuscode_id' => 0, + 'first_name' => 'Testy', + 'last_name' => 'Person', + 'long_name' => 'Person, Testy', + 'short_name' => 'Person, T', + ), + self::CREATE_SYSTEM_ACCOUNT => array( + 'person_long_name' => 'Person, Testy', + 'resource_id' => 5, + 'username' => 'teper' + ) + ) + ), + + // 24 E11 + array( + array( + 'itname' => 'testy', + 'system_username' => 'testy', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Testy McTesterson"', + 'CCR.xdmod.ui.mappedPName' => '"Person, Testy"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::REMOVE_PERSON => 'Person, Testy', + self::REMOVE_SYSTEM_ACCOUNT => 'teper', + self::REMOVE_USER => true + ) + ), + + // 25 E12: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Alpine', + 'lastName' => 'Swift', + 'email' => 'alpsw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1 + ) + ), + + // 26 E12 + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + + // 27 E13: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Alpine', + 'lastName' => 'Swift', + 'email' => 'alpsw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::SET_ORGANIZATION => 2, + self::SET_ACLS => array('usr' => array(), 'cd' => array()), + self::EXPECTED_ORG => 2 + ) + ), + + // 28 E13 + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::EXPECTED_ACLS => array('usr' => array()), + self::REMOVE_USER => true + ) + ), + + // 29 E14: User Creation + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Alpine', + 'lastName' => 'Swift', + 'email' => 'alpsw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::SET_ORGANIZATION => 2, + self::EXPECTED_ORG => 2 + ) + ), + + // 30 E14 + array( + array( + 'itname' => 'testy', + 'system_username' => 'alpsw', + 'orgId' => 'Screwdriver', + 'firstName' => 'Testy', + 'lastName' => 'McTesterson', + 'email' => 'tmctestersonw@example.com' + ), + array( + 'CCR.xdmod.ui.username' => "'testy'", + 'CCR.xdmod.ui.fullName' => '"Alpine Swift"', + 'CCR.xdmod.ui.mappedPName' => '"Swift, Alpine"', + 'CCR.xdmod.org_name' => '"Screwdriver"' + ), + array( + self::EXPECTED_ORG => 1, + self::REMOVE_USER => true + ) + ), + ); + } + + public function createSystemAccount($personLongName, $resourceId, $username) + { + $query = << $personLongName, + ':resource_id'=> $resourceId, + ':username' => $username + ); + + $db = DB::factory('database'); + $db->execute($query, $params); + } + + public function removeSystemAccount($username) + { + $query = "DELETE FROM modw.systemaccount WHERE username = :username"; + $params = array( + ':username' => $username ); + $db = DB::factory('database'); + $db->execute($query, $params); } } diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserAdminTest.php b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserAdminTest.php index 556dcff429..775e84b928 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserAdminTest.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserAdminTest.php @@ -176,7 +176,7 @@ public function testCreateUsersSuccess(array $user) // users password so that it can be used to login in future tests. if ($userId !== null) { $username = array_search($userId, self::$newUsers); - $this->updateUser($userId, $username); + $this->updateCurrentUser($userId, $username); } } diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserOrganizationTest.php b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserOrganizationTest.php index d5fd4d5ad9..91a844804e 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserOrganizationTest.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UserOrganizationTest.php @@ -28,29 +28,43 @@ public function __construct($name = null, array $data = array(), $dataName = '') */ public function testOrganizationUpdateOnLogin(array $options) { + $centerRelatedAcls = array('cd', 'cs'); + $user = $options['user']; $newOrganization = $options['organization']; $this->createTestOrganization($newOrganization); if (is_string($user)) { - $this->helper->authenticate($user); $userName = $this->config['role'][$user]['username']; $userGroup = 1; + $userCenterRoles = array_intersect($centerRelatedAcls, array($user)); + + $this->helper->authenticate($user); } else { $this->createUser($user); $userName = $user['username']; $userGroup = $user['user_type']; + $userAcls = isset($user['acls']) ? $user['acls'] : array(); + $userCenterRoles = array_intersect($centerRelatedAcls, array_keys($userAcls)); + $this->helper->authenticateDirect($userName, $userName); } $userId = $this->retrieveUserId($userName, $userGroup); - $requestedProperties = array('institution', 'person'); - $currentUserInfo = $this->retrieveUserProperties($userId, array('institution', 'assigned_user_id')); + $requestedProperties = array( + 'institution', + 'assigned_user_id', + 'acls', + 'email_address', + 'user_type' + ); + + $currentUserInfo = $this->retrieveUserProperties($userId, $requestedProperties); $this->assertCount( - 2, + count($requestedProperties), $currentUserInfo, sprintf( "Unable to retrieve properties for %s\n\tRequested: %s\n\tFound: %s", @@ -62,6 +76,9 @@ public function testOrganizationUpdateOnLogin(array $options) $originalOrganization = $currentUserInfo['institution']; $currentPerson = $currentUserInfo['assigned_user_id']; + $originalAcls = array_keys($currentUserInfo['acls']); + $emailAddress = $currentUserInfo['email_address']; + $userType = $currentUserInfo['user_type']; $this->updatePersonOrganization($currentPerson, $newOrganization); @@ -112,6 +129,35 @@ public function testOrganizationUpdateOnLogin(array $options) ) ); + // If the user had center related roles we have a few more things to check. + if (count($userCenterRoles) > 0) { + $currentUserAcls = array_keys($this->retrieveUserProperties($userId, array('acls'))); + $missingAcls = array_diff($originalAcls, $currentUserAcls); + + // They should have had their center related role revoked, so they should have at least + // one acl missing. + $this->assertTrue(count($missingAcls) > 0); + $this->assertTrue(count($missingAcls) === count($userCenterRoles)); + + $userAcls = array_reduce( + $originalAcls, + function ($carry, $item) { + $carry[$item] = array(); + return $carry; + }, + array() + ); + + $this->updateUser( + $userId, + $emailAddress, + $userAcls, + $currentPerson, + $originalOrganization, + $userType + ); + } + $this->deleteTestOrganization($newOrganization); } diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/PeopleHelper.php b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/PeopleHelper.php index a6c180628d..1df5d7b9be 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/PeopleHelper.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/PeopleHelper.php @@ -39,4 +39,56 @@ public function getPersonIdByLongName($longName) } return $people[0]['id']; } + + /** + * Manually create a person with the attributes provided. + * + * @param int $organizationId + * @param int $nsfStatusCodeId + * @param string $firstName + * @param string $lastName + * @param string $longName + * @param string $shortName + */ + public function createPerson($organizationId, $nsfStatusCodeId, $firstName, $lastName, $longName, $shortName) + { + $query = << $organizationId, + ':nsfstatuscode_id' => $nsfStatusCodeId, + ':first_name' => $firstName, + ':last_name' => $lastName, + ':long_name' => $longName, + ':short_name' => $shortName + ); + + $this->dbh->execute($query, $params); + } + + /** + * Remove the person identified by the provided `$longName`. + * + * @param string $longName + */ + public function removePerson($longName) + { + $query = << $longName + ); + $this->dbh->execute($query, $params); + } } diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php index 1b79d14a22..dfbd0bf3fe 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php @@ -172,15 +172,19 @@ private function getHTMLFormData($html) * Authenticate a user via SSO. SSO authentication requires a saml-idp * server. This is setup in the integration_tests/scripts/samlSetup.sh */ - public function authenticateSSO($parameters) + public function authenticateSSO($parameters, $includeDefault = true) { $result = $this->get('rest/auth/idpredirect', array('returnTo' => '/gui/general/login.php')); $nextlocation = $result[0]; $result = $this->get($nextlocation, null, true); list($action, $authSettings) = $this->getHTMLFormData($result[0]); + if ($includeDefault) { + $finalSettings = array_merge($authSettings, $parameters); + } else { + $finalSettings = $parameters; + } - $finalSettings = array_merge($authSettings, $parameters); $providerInfo = parse_url($result[1]['url']); $url = $providerInfo['scheme'] . '://' . $providerInfo['host'] . ':' . $providerInfo['port'] . $action; diff --git a/open_xdmod/modules/xdmod/integration_tests/phpunit.xml.dist b/open_xdmod/modules/xdmod/integration_tests/phpunit.xml.dist index 19ae4136f7..b1d9ff9eef 100644 --- a/open_xdmod/modules/xdmod/integration_tests/phpunit.xml.dist +++ b/open_xdmod/modules/xdmod/integration_tests/phpunit.xml.dist @@ -25,6 +25,7 @@ ./lib/Controllers/SSOLoginTest.php + ./lib/Controllers/BaseUserAdminTest.php ./lib/Controllers/SSOLoginTest.php diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh b/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh index 4906bdd95f..10eb5f5dac 100755 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh @@ -5,7 +5,10 @@ # set of commands that are run would work on a real production system. BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -REF_DIR=$BASEDIR/../../tests/artifacts/xdmod-test-artifacts/xdmod/referencedata +REF_SOURCE=`realpath $BASEDIR/../../tests/artifacts/xdmod-test-artifacts/xdmod/referencedata` +REF_DIR=/var/tmp/referencedata + +cp -r $REF_SOURCE /var/tmp/ set -e set -o pipefail @@ -21,44 +24,32 @@ then GRANT ALL PRIVILEGES ON *.* TO 'root'@'gateway' WITH GRANT OPTION; FLUSH PRIVILEGES;" expect $BASEDIR/xdmod-setup.tcl | col -b + xdmod-import-csv -t hierarchy -i $REF_DIR/hierarchy.csv + xdmod-import-csv -t group-to-hierarchy -i $REF_DIR/group-to-hierarchy.csv for resource in $REF_DIR/*.log; do - xdmod-shredder -r `basename $resource .log` -f slurm -i $resource; + sudo -u xdmod xdmod-shredder -r `basename $resource .log` -f slurm -i $resource; done - xdmod-ingestor - xdmod-import-csv -t names -i $REF_DIR/names.csv - xdmod-ingestor + sudo -u xdmod xdmod-ingestor + sudo -u xdmod xdmod-import-csv -t names -i $REF_DIR/names.csv + sudo -u xdmod xdmod-ingestor php /root/bin/createusers.php # This will ensure that the users created in `/root/bin/createusers.php` # have their organizations set correctly. - php /usr/share/xdmod/tools/etl/etl_overseer.php -p xdmod.acls-import + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p xdmod.acls-import #Updating minmaxdate table so data for cloud realm shows up mysql -e "UPDATE modw.minmaxdate SET max_job_date = '2018-07-01';" #Ingesting cloud data from references folder - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-common - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-common - php /usr/share/xdmod/tools/etl/etl_overseer.php -p ingest-resources - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-ingest-openstack -r openstack -d "CLOUD_EVENT_LOG_DIRECTORY=$REF_DIR/openstack" - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-extract-openstack - php /usr/share/xdmod/tools/etl/etl_overseer.php -p cloud-state-pipeline + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-common + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-common + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p ingest-resources + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-ingest-openstack -r openstack -d "CLOUD_EVENT_LOG_DIRECTORY=$REF_DIR/openstack" + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-extract-openstack + sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p cloud-state-pipeline fi if [ "$XDMOD_TEST_MODE" = "upgrade" ]; then yum -y install ~/rpmbuild/RPMS/*/*.rpm ~/bin/services start - # Delete this once it is added to the docker build by default - mysql -e "CREATE USER 'root'@'gateway' IDENTIFIED BY ''; - GRANT ALL PRIVILEGES ON *.* TO 'root'@'gateway' WITH GRANT OPTION; - FLUSH PRIVILEGES;" expect $BASEDIR/xdmod-upgrade.tcl | col -b - expect $BASEDIR/xdmod-upgrade-add-cloud-resource.tcl | col -b - #Updating minmaxdate table so data for cloud realm shows up - mysql -e "UPDATE modw.minmaxdate SET max_job_date = '2018-07-01';" - #Ingesting cloud data from references folder - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-common - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-common - php /usr/share/xdmod/tools/etl/etl_overseer.php -p ingest-resources - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-ingest-openstack -r openstack -d "CLOUD_EVENT_LOG_DIRECTORY=$REF_DIR/openstack" - php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-extract-openstack - php /usr/share/xdmod/tools/etl/etl_overseer.php -p cloud-state-pipeline fi diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh b/open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh index 0f14763b31..9d263b15dc 100755 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh @@ -35,7 +35,8 @@ var profile = { mobilePhone: '+1-415-555-5141', groups: 'Simple AIdP Users, West Coast Users, Cloud Users', itname: 'samlj', - orgId: 'University At Buffalo', + system_username: 'samlj', + orgId: 'Screwdriver', fieldOfScience: 'Computational Research' } @@ -57,9 +58,15 @@ var metadata = [{ }, { id: "itname", optional:'false', - displayName: 'System Username', + displayName: 'Organization Username', description: 'The system user', multiValue: false +}, { + id: 'system_username', + optional: 'true', + displayName: 'System Username', + description: 'Username of account used to run jobs.', + multiValue: false }, { id: "firstName", optional: false, @@ -147,6 +154,18 @@ cat > "$VENDOR_DIR/simplesamlphp/simplesamlphp/config/authsources.php" < 'organization', 'fieldOfScience' => 'field_of_science', 'itname' => 'username' + ), + 60 => array( + 'class' => 'authorize:Authorize', + 'username' => array( + '/\S+/' + ), + ), + 61 => array( + 'class' => 'authorize:Authorize', + 'organization' => array( + '/\S+/' + ) ) ) ), @@ -212,5 +231,5 @@ cat > "$VENDOR_DIR/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php" < ); EOF -node app.js --acs http://localhost:8080/simplesaml/module.php/saml/sp/saml2-acs.php/xdmod-sp --aud http://localhost:8080/simplesaml/module.php/saml/sp/metadata.php/xdmod-sp --httpsPrivateKey ./idp-private-key.pem --httpsCert ./idp-public-cert.pem --https false & +node app.js --acs http://localhost:8080/simplesaml/module.php/saml/sp/saml2-acs.php/xdmod-sp --aud http://localhost:8080/simplesaml/module.php/saml/sp/metadata.php/xdmod-sp --httpsPrivateKey ./idp-private-key.pem --httpsCert ./idp-public-cert.pem --https false > /var/log/xdmod/samlidp.log 2>&1 & httpd -k start diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl index c28f9d93b2..5037e9110a 100644 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl @@ -23,32 +23,9 @@ expect { timeout { send_user "\nFailed to get prompt\n"; exit 1 } - -re "\nDo you want to run aggregation now.*\\\]" { - send yes\n - } -} -expect { - timeout { - send_user "\nFailed to get prompt\n"; exit 1 - } - -re "\nAdmin Username:" { - send root\n - } -} - -expect { - timeout { - send_user "\nFailed to get prompt\n"; exit 1 - } - -re "\nAdmin Password:" { - send \n - exp_continue - } "Upgrade Complete" { lassign [wait] pid spawnid os_error_flag value } } - - exit $value diff --git a/open_xdmod/modules/xdmod/regression_tests/lib/Controllers/UsageExplorerTest.php b/open_xdmod/modules/xdmod/regression_tests/lib/Controllers/UsageExplorerTest.php index 3fb5f7361b..d530920de4 100644 --- a/open_xdmod/modules/xdmod/regression_tests/lib/Controllers/UsageExplorerTest.php +++ b/open_xdmod/modules/xdmod/regression_tests/lib/Controllers/UsageExplorerTest.php @@ -76,6 +76,7 @@ public function testCsvExport($testName, $input, $expectedFile, $userRole) $this->assertEquals($expected, $csvdata); return; } + self::$messages[] = "Raw Expected:\n$expected\n\nRaw Actual:\n$csvdata\n"; $failures = $this->csvDataDiff($expected, $csvdata, $fullTestName); if(empty($failures)) diff --git a/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php b/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php index 86536b82ee..18edd4de3a 100644 --- a/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php +++ b/open_xdmod/modules/xdmod/tests/lib/ETL/DbModel/DbModelTest.php @@ -140,6 +140,37 @@ public function testTableVerificationError() $table->verify(); } + /** + * Test foreign key constraint verification error + * + * @expectedException Exception + * @expectedExceptionMessage Columns in foreign key constraint 'invalid_fk' must be contained at the beginning of an index + */ + + public function testForeignKeyConstraintVerificationError() + { + // Foreign key constraint with no corresponding index. + $config = (object) array( + 'name' => "fk_verification_error", + 'columns' => array( (object) array( + 'name' => 'column1', + 'type' => 'int(11)', + 'nullable' => true, + )), + 'foreign_key_constraints' => array( (object) array( + 'name' => 'invalid_fk', + 'columns' => array('column1'), + 'referenced_table' => 'other_table', + 'referenced_columns' => array( + 'other_column', + ), + )), + ); + + $table = new Table($config); // No logger here + $table->verify(); + } + /** * Verify creating table elements manually. */ @@ -246,6 +277,10 @@ public function testAlterTable() $expected = trim(file_get_contents($file)); $this->assertEquals($expected, $generated, sprintf("%s(): %s", __FUNCTION__, $file)); + // The table should generate no SQL if there are no changes. + $generated = $currentTable->getAlterSql($currentTable); + $this->assertFalse($generated, sprintf("%s(): Expected false (no SQL)", __FUNCTION__)); + // Alter the table by manually adding columns, index, and trigger. $config = (object) array( diff --git a/open_xdmod/modules/xdmod/xdmod.spec.in b/open_xdmod/modules/xdmod/xdmod.spec.in index 2768056bb8..bd8eb46614 100644 --- a/open_xdmod/modules/xdmod/xdmod.spec.in +++ b/open_xdmod/modules/xdmod/xdmod.spec.in @@ -88,6 +88,40 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_datadir}/%{name}/html/robots.txt %changelog +* Tue Oct 30 2018 Steven M. Gallo 8.0.0-1.0 +- Features + - General + - Added a **beta** version of the Cloud realm to provide metrics relevant to cloud computing resources. + - Added a **beta** version of the Storage realm to provide metrics relevant to storage systems installed at a center. + - Federated XDMoD has been released for production. Federated XDMoD allows individual, locally managed, XDMoD instances to report all or a subset of their accounting data to a central Hub which provides a global view of the federation. + - All XDMoD user profiles are now associated with an organization. Previously, this was only required for Campus Champions. + - Added support for automatically detecting / assigning a new SSO User's organization. + - Added support for automatically detecting if a user's organization has changed and updating their accounts accordingly. This may include, but is not limited to, the removal of elevated privileges. + - Hardened the login and password reset process as a result of a security audit by University of Cambridge. + - Improved support for resource manager job arrays. + - Many improvements to the documentation. + - ETL + - Reorganized several ETL pipelines. + - Improved data sanitization for tighter checks present in MySQL 5.7. + - Refactored Jobs realm ingestion to utilize ETLv2. + - Standardize action names to follow the format module.pipeline.action. For example, xdmod.acls.manage-tables. + - Added character set and coalition to table definitions. + - Added support for foreign key constraints. + - Added support for the definition of ETL variables on the command line using -d variable=value. + - Add ingestion of node hostname data from SGE logs. + - Various ETL performance improvements. +- Bug Fixes + - User Interface + - Deep linking when logged in using SSO has been restored. + - Update the logrotate configuration to use the su and create options. + - ETL + - Add primary keys to select ETL source queries. + - When modifying an existing table, preserve the order of the columns in the definition file. + - Ensure that file handles are flushed before inserting the final chunk of data. + - Misc + - Fixed several exceptions that were outside of a namespace. + - Fixed an issue where ACLs were not properly created on upgrade. + - Several minor bugfixes * Wed May 23 2018 Steven M. Gallo 7.5.1-1.0 - Bug Fixes - Properly implement data access for non-feature ACLs (e.g., ACLs that provide access to data diff --git a/shippable.yml b/shippable.yml index 15c38a0900..c0a38991fd 100644 --- a/shippable.yml +++ b/shippable.yml @@ -25,10 +25,10 @@ build: - cp -f /etc/xdmod/portal_settings.ini ./configuration/portal_settings.ini - ./open_xdmod/modules/xdmod/integration_tests/runtests.sh --junit-output-dir `pwd`/shippable/testresults/ - ./open_xdmod/modules/xdmod/component_tests/runtests.sh --log-junit `pwd`/shippable/testresults/xdmod-component.xml - - mv ./configuration/portal_settings.ini.old ./configuration/portal_settings.ini - ./open_xdmod/modules/xdmod/automated_tests/runtests.sh --headless --log-junit `pwd`/shippable/testresults - ./open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh - ./open_xdmod/modules/xdmod/automated_tests/runtests.sh --headless --log-junit `pwd`/shippable/testresults --sso - ./vendor/phpunit/phpunit/phpunit -c ./open_xdmod/modules/xdmod/integration_tests/phpunit.xml.dist --testsuite sso --log-junit `pwd`/shippable/testresults/xdmod-sso-integration.xml + - mv ./configuration/portal_settings.ini.old ./configuration/portal_settings.ini on_failure: - cat /var/log/xdmod/* diff --git a/templates/portal_settings.template b/templates/portal_settings.template index 129b4989f8..9fbab93b0c 100644 --- a/templates/portal_settings.template +++ b/templates/portal_settings.template @@ -49,7 +49,6 @@ singlejobviewer = "off" multiple_service_providers = "off" [sso] -force_default_organization = "on" ; used to show local sign in portion of the sign in modal ; setting to true will show it. show_local_login = "false" diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/input/table_def-charset.json b/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/input/table_def-charset.json index f548d0cfd0..ecec929832 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/input/table_def-charset.json +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/input/table_def-charset.json @@ -78,7 +78,9 @@ "referenced_table": "db_test_model2", "referenced_columns": [ "col3" - ] + ], + "on_delete": "CASCADE", + "on_update": "NO ACTION" } ], "triggers": [] diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output/table_def-charset.sql b/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output/table_def-charset.sql index 4f92783457..5ffe931457 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output/table_def-charset.sql +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/etlv2/dbmodel/output/table_def-charset.sql @@ -7,5 +7,5 @@ CREATE TABLE IF NOT EXISTS `test_db_model` ( `inferred` int(1) unsigned NULL DEFAULT 0 COMMENT 'Not explicitly provided by source but inferred from other data', INDEX `fk_col` USING BTREE (`col1`), UNIQUE INDEX `fk_instance` USING BTREE (`instance_id`, `inferred`), - CONSTRAINT `con_col1` FOREIGN KEY (`col1`) REFERENCES `db_test_model2` (`col3`) + CONSTRAINT `con_col1` FOREIGN KEY (`col1`) REFERENCES `db_test_model2` (`col3`) ON DELETE CASCADE ON UPDATE NO ACTION ) ENGINE = MyISAM CHARSET = latin1 COLLATE = latin1_swedish_ci COMMENT = 'Events on an instance'; diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/referencedata/group-to-hierarchy.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/referencedata/group-to-hierarchy.csv new file mode 100644 index 0000000000..51d8f9a165 --- /dev/null +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/referencedata/group-to-hierarchy.csv @@ -0,0 +1,41 @@ +"alpac","dce" +"aytinis","omc" +"balsh","scp" +"bitte","pme" +"blabi","gep" +"blawa","tph" +"buffl","orp" +"calla","pch" +"caste","gas" +"cetwa","drm" +"chaff","bph" +"comye","lss" +"dotte","vmg" +"dunli","spb" +"egrhula","pos" +"field","qwb" +"fulma","cbi" +"glwgu","dtt" +"grswo","eac" +"grtsh","spr" +"grweg","saa" +"henha","cct" +"herth","fph" +"hoowa","exs" +"ibech","ssm" +"jackd","art" +"leske","ant" +"litsh","tec" +"litsw","gpa" +"moorh","spf" +"nutha","sbs" +"ortbu","eti" +"ptefeae","bms" +"rebgo","eco" +"refbl","spr" +"sanma","sis" +"savwa","paa" +"shbdo","mat" +"smew1","mce" +"taifl","soc" +"yelgu","gar" diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/referencedata/hierarchy.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/referencedata/hierarchy.csv new file mode 100644 index 0000000000..38cc27675e --- /dev/null +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/referencedata/hierarchy.csv @@ -0,0 +1,151 @@ +"mps","Mathematical and Physical Sciences","" +"bio","Biological Sciences","" +"cie","Computer and Information Science and Engineering","" +"eng","Engineering","" +"geo","Geosciences","" +"hua","Humanities/Arts","" +"oth","Other","" +"sbe","Social, Behavioral, and Economic Sciences","" +"art","Arts","hua" +"asc","Advanced Scientific Computing","cie" +"ast","Astronomical Sciences","mps" +"atm","Atmospheric Sciences","geo" +"bcs","Biological and Critical Systems","eng" +"bir","Biological Instrumentation and Resources","bio" +"bns","Behavioral and Neural Sciences","sbe" +"ccr","Computer and Computation Research","cie" +"cda","Cross-Disciplinary Activities","cie" +"che","Chemistry","mps" +"cie","Computer and Information Science and Engineering", +"cts","Chemical, Thermal Systems","eng" +"ddm","Design and Manufacturing Systems","eng" +"deb","Environmental Biology","bio" +"dmr","Materials Research","mps" +"dms","Mathematical Sciences","mps" +"dpp","Polar Programs","geo" +"ear","Earth Sciences","geo" +"ecd","Engineering Centers","eng" +"ecs","Electrical and Communication Systems","eng" +"eid","Engineering Infrastructure Development","eng" +"ibn","Integrative Biology and Neuroscience","bio" +"int","International Programs","sbe" +"iri","Information, Robotics, and Intelligent Systems","cie" +"isi","Industrial Science and Technological Innovation","eng" +"mcb","Molecular Biosciences","bio" +"mip","Microelectronic Information Processing Systems","cie" +"mss","Mechanical and Structural Systems","eng" +"ncr","Networking and Communications Research","cie" +"oce","Ocean Sciences","geo" +"phy","Physics","mps" +"ses","Social and Economic Science","sbe" +"srs","Science Resources Studies","sbe" +"ini","Institutional Infrastructure","cda" +"edi","Educational Infrastructure","cda" +"bms","Biochemistry and Molecular Structure and Function","mcb" +"bph","Biophysics","mcb" +"gna","Genetics and Nucleic Acids","mcb" +"cbi","Cell Biology","mcb" +"est","Ecological Studies","deb" +"spb","Systematic and Population Biology","deb" +"dbi","Developmental Biology","ibn" +"nbi","Neuroscience Biology","ibn" +"phb","Physiology and Behavior","ibn" +"ant","Anthropology","bns" +"lcs","Language, Cognition, and Social Behavior","bns" +"eco","Economics","ses" +"grs","Geography and Regional Science","ses" +"soc","Sociology","ses" +"mms","Methodology, Measurement, and Statistics","ses" +"pos","Political Science","ses" +"lss","Law and Social Sciences","ses" +"drm","Decision, Risk, and Management Science","ses" +"met","Meteorology","atm" +"ach","Atmospheric Chemistry","atm" +"cld","Climate Dynamics","atm" +"gar","Global Atmospheric Research","atm" +"aer","Aeronomy","atm" +"str","Solar Terrestrial Research","atm" +"gpa","Geology and Paleontology","ear" +"spr","Surficial Processes","ear" +"tec","Tectonics","ear" +"sis","Seismology","ear" +"gep","Geophysics","ear" +"pmr","Petrogenesis and Mineral Resources","ear" +"vmg","Volcanology and Mantle Geochemistry","ear" +"etg","Experimental and Theoretical Geochemistry","ear" +"boc","Biological Oceanography","oce" +"coc","Chemical Oceanography","oce" +"poc","Physical Oceanography","oce" +"mgg","Marine Geology and Geophysics","oce" +"pgl","Polar Glaciology","dpp" +"paa","Polar Aeronomy and Astrophysics","dpp" +"pbm","Polar Biology and Medicine","dpp" +"pes","Polar Earth Sciences","dpp" +"pme","Polar Meteorology","dpp" +"pos","Polar Ocean and Climate Systems","dpp" +"crp","Chemical and Reaction Processes","cts" +"its","Interfacial, Transport, and Separations Processes","cts" +"ths","Thermal Systems","cts" +"fph","Fluid, Particulate, and Hydraulic Systems","cts" +"dsc","Dynamic Systems and Control","mss" +"sbs","Structures and Building Systems","mss" +"mat","Mechanics and Materials","mss" +"set","Surface Engineering and Tribology","mss" +"qwb","Quantum Electronics, Waves, and Beams","ecs" +"ssm","Solid-State and Microstructures","ecs" +"ccs","Communications and Computational Systems","ecs" +"ens","Engineering Systems","ecs" +"eti","Emerging Technologies Initiation","ecs" +"orp","Operations Research and Production Systems","ddm" +"dce","Design and Computer-Integrated Engineering","ddm" +"mpe","Manufacturing Processes and Equipment","ddm" +"bad","Bioengineering Aiding the Disabled","bcs" +"eos","Environmental and Ocean Systems","bcs" +"ehm","Earthquake Hazard Mitigation","bcs" +"nmh","Natural and Man-Made Hazard Mitigation","bcs" +"oth","Other", +"map","Magnetospheric Physics","atm" +"can","Classical Analysis","dms" +"man","Modern Analysis","dms" +"gan","Geometric Analysis","dms" +"tnf","Topology and Foundations","dms" +"ant","Algebra and Number Theory","dms" +"apm","Applied Mathematics","dms" +"spr","Statistics and Probability","dms" +"cma","Computational Mathematics","dms" +"eac","Extragalactic Astronomy and Cosmology","ast" +"pas","Planetary Astronomy","ast" +"saa","Stellar Astronomy and Astrophysics","ast" +"gas","Galactic Astronomy","ast" +"epp","Elementary Particle Physics","phy" +"nph","Nuclear Physics","phy" +"amo","Atomic, Molecular, and Optical Physics","phy" +"tph","Theoretical Physics","phy" +"gph","Gravitational Physics","phy" +"asc","Analytical and Surface Chemistry","che" +"ibo","Inorganic, Bioinorganic, and Organometallic Chemistry","che" +"omc","Organic and Macromolecular Chemistry","che" +"pch","Physical Chemistry","che" +"scp","Solid State Chemistry and Polymers","dmr" +"cmp","Condensed Matter Physics","dmr" +"mce","Metals, Ceramics, and Electronic Materials","dmr" +"cct","Computer and Computation Theory","ccr" +"nsc","Numeric and Symbolic Computation","ccr" +"csa","Computer Systems Architecture","ccr" +"sys","Software Systems","ccr" +"sen","Software Engineering","ccr" +"kmc","Knowledge Models and Cognitive Systems","iri" +"rmi","Robotics and Machine Intelligence","iri" +"its","Interactive Systems","iri" +"ito","Information Technology and Organizations","iri" +"msa","Microelectronic Systems Architecture","mip" +"csp","Circuits and Signal Processing","mip" +"exs","Experimental Systems","mip" +"spf","Systems Prototyping and Fabrication","mip" +"dtt","Design, Tools, and Test","mip" +"peb","Performance Evaluation and Benchmarking","asc" +"ald","Algorithm Development","asc" +"vgi","Visualization, Graphics, and Image Processing","asc" +"sde","Software Development","asc" +"dpv","Distributed and Parallel Processing, Vectorization","asc" +"ris","Research Instrumentation","cda" diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Day-reference.csv index c7e043bf30..ad19853ff5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Users: Active" -Unknown,66 +"Galactic Astronomy",6 +"Physical Chemistry",4 +"Quantum Electronics, Waves, and Beams",4 +"Stellar Astronomy and Astrophysics",4 +Arts,3 +"Mechanics and Materials",3 +Biophysics,2 +"Cell Biology",2 +"Decision, Risk, and Management Science",2 +"Experimental Systems",2 +"Organic and Macromolecular Chemistry",2 +Sociology,2 +"Solid State Chemistry and Polymers",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +"Computer and Computation Theory",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +Seismology,1 +"Solid-State and Microstructures",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Month-reference.csv index c7e043bf30..ad19853ff5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Users: Active" -Unknown,66 +"Galactic Astronomy",6 +"Physical Chemistry",4 +"Quantum Electronics, Waves, and Beams",4 +"Stellar Astronomy and Astrophysics",4 +Arts,3 +"Mechanics and Materials",3 +Biophysics,2 +"Cell Biology",2 +"Decision, Risk, and Management Science",2 +"Experimental Systems",2 +"Organic and Macromolecular Chemistry",2 +Sociology,2 +"Solid State Chemistry and Polymers",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +"Computer and Computation Theory",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +Seismology,1 +"Solid-State and Microstructures",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Quarter-reference.csv index c7e043bf30..ad19853ff5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Users: Active" -Unknown,66 +"Galactic Astronomy",6 +"Physical Chemistry",4 +"Quantum Electronics, Waves, and Beams",4 +"Stellar Astronomy and Astrophysics",4 +Arts,3 +"Mechanics and Materials",3 +Biophysics,2 +"Cell Biology",2 +"Decision, Risk, and Management Science",2 +"Experimental Systems",2 +"Organic and Macromolecular Chemistry",2 +Sociology,2 +"Solid State Chemistry and Polymers",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +"Computer and Computation Theory",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +Seismology,1 +"Solid-State and Microstructures",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Year-reference.csv index c7e043bf30..ad19853ff5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Users: Active" -Unknown,66 +"Galactic Astronomy",6 +"Physical Chemistry",4 +"Quantum Electronics, Waves, and Beams",4 +"Stellar Astronomy and Astrophysics",4 +Arts,3 +"Mechanics and Materials",3 +Biophysics,2 +"Cell Biology",2 +"Decision, Risk, and Management Science",2 +"Experimental Systems",2 +"Organic and Macromolecular Chemistry",2 +Sociology,2 +"Solid State Chemistry and Polymers",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +"Computer and Computation Theory",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +Seismology,1 +"Solid-State and Microstructures",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Day-reference.csv index 3c45984c87..a9676a61fc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Users: Active" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,4 -2016-12-26,5 -2016-12-27,16 -2016-12-28,25 -2016-12-29,43 -2016-12-30,64 -2016-12-31,55 -2017-01-01,38 +Day,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active" +2016-12-22,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,1,2,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,1,2,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,3,2,1,1,0,0,2,1,0,0,0,1,2,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,3,4,1,1,0,0,2,1,0,1,1,1,2,2,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,1,1 +2016-12-29,4,4,2,3,2,0,2,2,1,2,1,2,2,2,1,1,1,0,0,0,1,0,0,0,0,1,0,1,1,1,0,0,1,1,1,0,1,0,1,1 +2016-12-30,6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1 +2016-12-31,5,4,4,4,3,3,2,1,1,2,2,2,1,1,1,1,1,1,0,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0 +2017-01-01,2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Month-reference.csv index a466714771..ba1ee8da68 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Users: Active" -2016-12,66 -2017-01,38 +Month,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active" +2016-12,6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017-01,2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Quarter-reference.csv index 766ecd2392..164eed44d0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Users: Active" -"2016 Q4",66 -"2017 Q1",38 +Quarter,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active" +"2016 Q4",6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +"2017 Q1",2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Year-reference.csv index 2df286c14b..122dbcd164 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Users: Active" -2016,66 -2017,38 +Year,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active" +2016,6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017,2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Day-reference.csv index 97dffce18c..946556cc20 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of PIs: Active" -Unknown,41 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Galactic Astronomy",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Organic and Macromolecular Chemistry",1 +"Physical Chemistry",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +"Quantum Electronics, Waves, and Beams",1 +Seismology,1 +Sociology,1 +"Solid State Chemistry and Polymers",1 +"Solid-State and Microstructures",1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Month-reference.csv index 97dffce18c..946556cc20 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of PIs: Active" -Unknown,41 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Galactic Astronomy",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Organic and Macromolecular Chemistry",1 +"Physical Chemistry",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +"Quantum Electronics, Waves, and Beams",1 +Seismology,1 +Sociology,1 +"Solid State Chemistry and Polymers",1 +"Solid-State and Microstructures",1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Quarter-reference.csv index 97dffce18c..946556cc20 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of PIs: Active" -Unknown,41 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Galactic Astronomy",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Organic and Macromolecular Chemistry",1 +"Physical Chemistry",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +"Quantum Electronics, Waves, and Beams",1 +Seismology,1 +Sociology,1 +"Solid State Chemistry and Polymers",1 +"Solid-State and Microstructures",1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Year-reference.csv index 97dffce18c..946556cc20 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of PIs: Active" -Unknown,41 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Galactic Astronomy",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Organic and Macromolecular Chemistry",1 +"Physical Chemistry",1 +"Polar Aeronomy and Astrophysics",1 +"Polar Meteorology",1 +"Polar Ocean and Climate Systems",1 +"Quantum Electronics, Waves, and Beams",1 +Seismology,1 +Sociology,1 +"Solid State Chemistry and Polymers",1 +"Solid-State and Microstructures",1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Day-reference.csv index e9947f600a..979190f5a9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of PIs: Active" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,3 -2016-12-26,4 -2016-12-27,11 -2016-12-28,18 -2016-12-29,28 -2016-12-30,39 -2016-12-31,34 -2017-01-01,25 +Day,"[Statistics and Probability] Number of PIs: Active","[Algebra and Number Theory] Number of PIs: Active","[Arts] Number of PIs: Active","[Biochemistry and Molecular Structure and Function] Number of PIs: Active","[Biophysics] Number of PIs: Active","[Cell Biology] Number of PIs: Active","[Computer and Computation Theory] Number of PIs: Active","[Decision, Risk, and Management Science] Number of PIs: Active","[Design and Computer-Integrated Engineering] Number of PIs: Active","[Design, Tools, and Test] Number of PIs: Active","[Economics] Number of PIs: Active","[Emerging Technologies Initiation] Number of PIs: Active","[Experimental Systems] Number of PIs: Active","[Extragalactic Astronomy and Cosmology] Number of PIs: Active","[Fluid, Particulate, and Hydraulic Systems] Number of PIs: Active","[Galactic Astronomy] Number of PIs: Active","[Geology and Paleontology] Number of PIs: Active","[Geophysics] Number of PIs: Active","[Global Atmospheric Research] Number of PIs: Active","[Law and Social Sciences] Number of PIs: Active","[Mechanics and Materials] Number of PIs: Active","[Metals, Ceramics, and Electronic Materials] Number of PIs: Active","[Operations Research and Production Systems] Number of PIs: Active","[Organic and Macromolecular Chemistry] Number of PIs: Active","[Physical Chemistry] Number of PIs: Active","[Polar Aeronomy and Astrophysics] Number of PIs: Active","[Polar Meteorology] Number of PIs: Active","[Polar Ocean and Climate Systems] Number of PIs: Active","[Quantum Electronics, Waves, and Beams] Number of PIs: Active","[Seismology] Number of PIs: Active","[Sociology] Number of PIs: Active","[Solid State Chemistry and Polymers] Number of PIs: Active","[Solid-State and Microstructures] Number of PIs: Active","[Stellar Astronomy and Astrophysics] Number of PIs: Active","[Structures and Building Systems] Number of PIs: Active","[Systematic and Population Biology] Number of PIs: Active","[Systems Prototyping and Fabrication] Number of PIs: Active","[Tectonics] Number of PIs: Active","[Theoretical Physics] Number of PIs: Active","[Volcanology and Mantle Geochemistry] Number of PIs: Active" +2016-12-22,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,1,0,1,1,0,1,0,0,0,0,0,0 +2016-12-28,2,1,0,1,1,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,1,1,1,0,0,0,1,0,1,1,0,1,0,0,1,0,1,1 +2016-12-29,2,1,1,1,1,1,1,1,0,0,0,1,1,0,0,1,0,0,1,0,0,1,1,1,1,1,0,0,1,1,1,1,1,1,1,0,1,0,1,1 +2016-12-30,2,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1 +2016-12-31,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +2017-01-01,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,1,0,1,0,1,0,1,1,1,0,1,1,1,1,1,0,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Month-reference.csv index 53057a2f52..4654d057e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of PIs: Active" -2016-12,41 -2017-01,25 +Month,"[Statistics and Probability] Number of PIs: Active","[Algebra and Number Theory] Number of PIs: Active","[Arts] Number of PIs: Active","[Biochemistry and Molecular Structure and Function] Number of PIs: Active","[Biophysics] Number of PIs: Active","[Cell Biology] Number of PIs: Active","[Computer and Computation Theory] Number of PIs: Active","[Decision, Risk, and Management Science] Number of PIs: Active","[Design and Computer-Integrated Engineering] Number of PIs: Active","[Design, Tools, and Test] Number of PIs: Active","[Economics] Number of PIs: Active","[Emerging Technologies Initiation] Number of PIs: Active","[Experimental Systems] Number of PIs: Active","[Extragalactic Astronomy and Cosmology] Number of PIs: Active","[Fluid, Particulate, and Hydraulic Systems] Number of PIs: Active","[Galactic Astronomy] Number of PIs: Active","[Geology and Paleontology] Number of PIs: Active","[Geophysics] Number of PIs: Active","[Global Atmospheric Research] Number of PIs: Active","[Law and Social Sciences] Number of PIs: Active","[Mechanics and Materials] Number of PIs: Active","[Metals, Ceramics, and Electronic Materials] Number of PIs: Active","[Operations Research and Production Systems] Number of PIs: Active","[Organic and Macromolecular Chemistry] Number of PIs: Active","[Physical Chemistry] Number of PIs: Active","[Polar Aeronomy and Astrophysics] Number of PIs: Active","[Polar Meteorology] Number of PIs: Active","[Polar Ocean and Climate Systems] Number of PIs: Active","[Quantum Electronics, Waves, and Beams] Number of PIs: Active","[Seismology] Number of PIs: Active","[Sociology] Number of PIs: Active","[Solid State Chemistry and Polymers] Number of PIs: Active","[Solid-State and Microstructures] Number of PIs: Active","[Stellar Astronomy and Astrophysics] Number of PIs: Active","[Structures and Building Systems] Number of PIs: Active","[Systematic and Population Biology] Number of PIs: Active","[Systems Prototyping and Fabrication] Number of PIs: Active","[Tectonics] Number of PIs: Active","[Theoretical Physics] Number of PIs: Active","[Volcanology and Mantle Geochemistry] Number of PIs: Active" +2016-12,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017-01,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,1,0,1,0,1,0,1,1,1,0,1,1,1,1,1,0,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Quarter-reference.csv index 89fbf19009..50adc200f9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of PIs: Active" -"2016 Q4",41 -"2017 Q1",25 +Quarter,"[Statistics and Probability] Number of PIs: Active","[Algebra and Number Theory] Number of PIs: Active","[Arts] Number of PIs: Active","[Biochemistry and Molecular Structure and Function] Number of PIs: Active","[Biophysics] Number of PIs: Active","[Cell Biology] Number of PIs: Active","[Computer and Computation Theory] Number of PIs: Active","[Decision, Risk, and Management Science] Number of PIs: Active","[Design and Computer-Integrated Engineering] Number of PIs: Active","[Design, Tools, and Test] Number of PIs: Active","[Economics] Number of PIs: Active","[Emerging Technologies Initiation] Number of PIs: Active","[Experimental Systems] Number of PIs: Active","[Extragalactic Astronomy and Cosmology] Number of PIs: Active","[Fluid, Particulate, and Hydraulic Systems] Number of PIs: Active","[Galactic Astronomy] Number of PIs: Active","[Geology and Paleontology] Number of PIs: Active","[Geophysics] Number of PIs: Active","[Global Atmospheric Research] Number of PIs: Active","[Law and Social Sciences] Number of PIs: Active","[Mechanics and Materials] Number of PIs: Active","[Metals, Ceramics, and Electronic Materials] Number of PIs: Active","[Operations Research and Production Systems] Number of PIs: Active","[Organic and Macromolecular Chemistry] Number of PIs: Active","[Physical Chemistry] Number of PIs: Active","[Polar Aeronomy and Astrophysics] Number of PIs: Active","[Polar Meteorology] Number of PIs: Active","[Polar Ocean and Climate Systems] Number of PIs: Active","[Quantum Electronics, Waves, and Beams] Number of PIs: Active","[Seismology] Number of PIs: Active","[Sociology] Number of PIs: Active","[Solid State Chemistry and Polymers] Number of PIs: Active","[Solid-State and Microstructures] Number of PIs: Active","[Stellar Astronomy and Astrophysics] Number of PIs: Active","[Structures and Building Systems] Number of PIs: Active","[Systematic and Population Biology] Number of PIs: Active","[Systems Prototyping and Fabrication] Number of PIs: Active","[Tectonics] Number of PIs: Active","[Theoretical Physics] Number of PIs: Active","[Volcanology and Mantle Geochemistry] Number of PIs: Active" +"2016 Q4",2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +"2017 Q1",1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,1,0,1,0,1,0,1,1,1,0,1,1,1,1,1,0,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Year-reference.csv index 556e3cf726..05616b3a0b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_pi_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of PIs: Active" -2016,41 -2017,25 +Year,"[Statistics and Probability] Number of PIs: Active","[Algebra and Number Theory] Number of PIs: Active","[Arts] Number of PIs: Active","[Biochemistry and Molecular Structure and Function] Number of PIs: Active","[Biophysics] Number of PIs: Active","[Cell Biology] Number of PIs: Active","[Computer and Computation Theory] Number of PIs: Active","[Decision, Risk, and Management Science] Number of PIs: Active","[Design and Computer-Integrated Engineering] Number of PIs: Active","[Design, Tools, and Test] Number of PIs: Active","[Economics] Number of PIs: Active","[Emerging Technologies Initiation] Number of PIs: Active","[Experimental Systems] Number of PIs: Active","[Extragalactic Astronomy and Cosmology] Number of PIs: Active","[Fluid, Particulate, and Hydraulic Systems] Number of PIs: Active","[Galactic Astronomy] Number of PIs: Active","[Geology and Paleontology] Number of PIs: Active","[Geophysics] Number of PIs: Active","[Global Atmospheric Research] Number of PIs: Active","[Law and Social Sciences] Number of PIs: Active","[Mechanics and Materials] Number of PIs: Active","[Metals, Ceramics, and Electronic Materials] Number of PIs: Active","[Operations Research and Production Systems] Number of PIs: Active","[Organic and Macromolecular Chemistry] Number of PIs: Active","[Physical Chemistry] Number of PIs: Active","[Polar Aeronomy and Astrophysics] Number of PIs: Active","[Polar Meteorology] Number of PIs: Active","[Polar Ocean and Climate Systems] Number of PIs: Active","[Quantum Electronics, Waves, and Beams] Number of PIs: Active","[Seismology] Number of PIs: Active","[Sociology] Number of PIs: Active","[Solid State Chemistry and Polymers] Number of PIs: Active","[Solid-State and Microstructures] Number of PIs: Active","[Stellar Astronomy and Astrophysics] Number of PIs: Active","[Structures and Building Systems] Number of PIs: Active","[Systematic and Population Biology] Number of PIs: Active","[Systems Prototyping and Fabrication] Number of PIs: Active","[Tectonics] Number of PIs: Active","[Theoretical Physics] Number of PIs: Active","[Volcanology and Mantle Geochemistry] Number of PIs: Active" +2016,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,1,0,1,0,1,0,1,1,1,0,1,1,1,1,1,0,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Day-reference.csv index f7b3fe4a72..7c33f50061 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Resources: Active" -Unknown,5 +Sociology,5 +"Galactic Astronomy",3 +"Physical Chemistry",3 +"Solid State Chemistry and Polymers",3 +Arts,2 +"Organic and Macromolecular Chemistry",2 +"Polar Aeronomy and Astrophysics",2 +"Polar Ocean and Climate Systems",2 +"Quantum Electronics, Waves, and Beams",2 +"Solid-State and Microstructures",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +Seismology,1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Month-reference.csv index f7b3fe4a72..7c33f50061 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Resources: Active" -Unknown,5 +Sociology,5 +"Galactic Astronomy",3 +"Physical Chemistry",3 +"Solid State Chemistry and Polymers",3 +Arts,2 +"Organic and Macromolecular Chemistry",2 +"Polar Aeronomy and Astrophysics",2 +"Polar Ocean and Climate Systems",2 +"Quantum Electronics, Waves, and Beams",2 +"Solid-State and Microstructures",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +Seismology,1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Quarter-reference.csv index f7b3fe4a72..7c33f50061 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Resources: Active" -Unknown,5 +Sociology,5 +"Galactic Astronomy",3 +"Physical Chemistry",3 +"Solid State Chemistry and Polymers",3 +Arts,2 +"Organic and Macromolecular Chemistry",2 +"Polar Aeronomy and Astrophysics",2 +"Polar Ocean and Climate Systems",2 +"Quantum Electronics, Waves, and Beams",2 +"Solid-State and Microstructures",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +Seismology,1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Year-reference.csv index f7b3fe4a72..7c33f50061 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Resources: Active" -Unknown,5 +Sociology,5 +"Galactic Astronomy",3 +"Physical Chemistry",3 +"Solid State Chemistry and Polymers",3 +Arts,2 +"Organic and Macromolecular Chemistry",2 +"Polar Aeronomy and Astrophysics",2 +"Polar Ocean and Climate Systems",2 +"Quantum Electronics, Waves, and Beams",2 +"Solid-State and Microstructures",2 +"Statistics and Probability",2 +"Algebra and Number Theory",1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +"Design and Computer-Integrated Engineering",1 +"Design, Tools, and Test",1 +Economics,1 +"Emerging Technologies Initiation",1 +"Experimental Systems",1 +"Extragalactic Astronomy and Cosmology",1 +"Fluid, Particulate, and Hydraulic Systems",1 +"Geology and Paleontology",1 +Geophysics,1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Mechanics and Materials",1 +"Metals, Ceramics, and Electronic Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +Seismology,1 +"Stellar Astronomy and Astrophysics",1 +"Structures and Building Systems",1 +"Systematic and Population Biology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 +"Theoretical Physics",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Day-reference.csv index cfe014c1a1..dc2c3078ee 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Resources: Active" -2016-12-22,2 -2016-12-23,2 -2016-12-24,2 -2016-12-25,2 -2016-12-26,3 -2016-12-27,5 -2016-12-28,5 -2016-12-29,5 -2016-12-30,5 -2016-12-31,5 -2017-01-01,5 +Day,"[Sociology] Number of Resources: Active","[Galactic Astronomy] Number of Resources: Active","[Physical Chemistry] Number of Resources: Active","[Solid State Chemistry and Polymers] Number of Resources: Active","[Arts] Number of Resources: Active","[Organic and Macromolecular Chemistry] Number of Resources: Active","[Polar Aeronomy and Astrophysics] Number of Resources: Active","[Polar Ocean and Climate Systems] Number of Resources: Active","[Quantum Electronics, Waves, and Beams] Number of Resources: Active","[Solid-State and Microstructures] Number of Resources: Active","[Statistics and Probability] Number of Resources: Active","[Algebra and Number Theory] Number of Resources: Active","[Biochemistry and Molecular Structure and Function] Number of Resources: Active","[Biophysics] Number of Resources: Active","[Cell Biology] Number of Resources: Active","[Computer and Computation Theory] Number of Resources: Active","[Decision, Risk, and Management Science] Number of Resources: Active","[Design and Computer-Integrated Engineering] Number of Resources: Active","[Design, Tools, and Test] Number of Resources: Active","[Economics] Number of Resources: Active","[Emerging Technologies Initiation] Number of Resources: Active","[Experimental Systems] Number of Resources: Active","[Extragalactic Astronomy and Cosmology] Number of Resources: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Resources: Active","[Geology and Paleontology] Number of Resources: Active","[Geophysics] Number of Resources: Active","[Global Atmospheric Research] Number of Resources: Active","[Law and Social Sciences] Number of Resources: Active","[Mechanics and Materials] Number of Resources: Active","[Metals, Ceramics, and Electronic Materials] Number of Resources: Active","[Operations Research and Production Systems] Number of Resources: Active","[Polar Meteorology] Number of Resources: Active","[Seismology] Number of Resources: Active","[Stellar Astronomy and Astrophysics] Number of Resources: Active","[Structures and Building Systems] Number of Resources: Active","[Systematic and Population Biology] Number of Resources: Active","[Systems Prototyping and Fabrication] Number of Resources: Active","[Tectonics] Number of Resources: Active","[Theoretical Physics] Number of Resources: Active","[Volcanology and Mantle Geochemistry] Number of Resources: Active" +2016-12-22,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,1,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,1,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,1,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,1,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,1,2,2,1,0,0,0,0,1,0,2,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0 +2016-12-28,1,2,2,2,0,1,0,0,1,0,2,1,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,1,0,1,1 +2016-12-29,4,3,3,3,2,1,1,0,1,1,2,1,1,1,1,1,1,0,0,0,1,1,0,0,0,0,1,0,0,1,1,0,1,1,1,0,1,0,1,1 +2016-12-30,5,3,3,3,2,2,2,0,2,2,2,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2016-12-31,5,1,3,2,2,2,1,1,2,2,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0 +2017-01-01,5,1,3,0,2,1,0,2,2,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,0,1,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Month-reference.csv index 3d78b6d5ed..6d6a4147a3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Resources: Active" -2016-12,5 -2017-01,5 +Month,"[Sociology] Number of Resources: Active","[Galactic Astronomy] Number of Resources: Active","[Physical Chemistry] Number of Resources: Active","[Solid State Chemistry and Polymers] Number of Resources: Active","[Arts] Number of Resources: Active","[Organic and Macromolecular Chemistry] Number of Resources: Active","[Polar Aeronomy and Astrophysics] Number of Resources: Active","[Polar Ocean and Climate Systems] Number of Resources: Active","[Quantum Electronics, Waves, and Beams] Number of Resources: Active","[Solid-State and Microstructures] Number of Resources: Active","[Statistics and Probability] Number of Resources: Active","[Algebra and Number Theory] Number of Resources: Active","[Biochemistry and Molecular Structure and Function] Number of Resources: Active","[Biophysics] Number of Resources: Active","[Cell Biology] Number of Resources: Active","[Computer and Computation Theory] Number of Resources: Active","[Decision, Risk, and Management Science] Number of Resources: Active","[Design and Computer-Integrated Engineering] Number of Resources: Active","[Design, Tools, and Test] Number of Resources: Active","[Economics] Number of Resources: Active","[Emerging Technologies Initiation] Number of Resources: Active","[Experimental Systems] Number of Resources: Active","[Extragalactic Astronomy and Cosmology] Number of Resources: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Resources: Active","[Geology and Paleontology] Number of Resources: Active","[Geophysics] Number of Resources: Active","[Global Atmospheric Research] Number of Resources: Active","[Law and Social Sciences] Number of Resources: Active","[Mechanics and Materials] Number of Resources: Active","[Metals, Ceramics, and Electronic Materials] Number of Resources: Active","[Operations Research and Production Systems] Number of Resources: Active","[Polar Meteorology] Number of Resources: Active","[Seismology] Number of Resources: Active","[Stellar Astronomy and Astrophysics] Number of Resources: Active","[Structures and Building Systems] Number of Resources: Active","[Systematic and Population Biology] Number of Resources: Active","[Systems Prototyping and Fabrication] Number of Resources: Active","[Tectonics] Number of Resources: Active","[Theoretical Physics] Number of Resources: Active","[Volcanology and Mantle Geochemistry] Number of Resources: Active" +2016-12,5,3,3,3,2,2,2,1,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017-01,5,1,3,0,2,1,0,2,2,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,0,1,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Quarter-reference.csv index e730ef9976..707d0df673 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Resources: Active" -"2016 Q4",5 -"2017 Q1",5 +Quarter,"[Sociology] Number of Resources: Active","[Galactic Astronomy] Number of Resources: Active","[Physical Chemistry] Number of Resources: Active","[Solid State Chemistry and Polymers] Number of Resources: Active","[Arts] Number of Resources: Active","[Organic and Macromolecular Chemistry] Number of Resources: Active","[Polar Aeronomy and Astrophysics] Number of Resources: Active","[Polar Ocean and Climate Systems] Number of Resources: Active","[Quantum Electronics, Waves, and Beams] Number of Resources: Active","[Solid-State and Microstructures] Number of Resources: Active","[Statistics and Probability] Number of Resources: Active","[Algebra and Number Theory] Number of Resources: Active","[Biochemistry and Molecular Structure and Function] Number of Resources: Active","[Biophysics] Number of Resources: Active","[Cell Biology] Number of Resources: Active","[Computer and Computation Theory] Number of Resources: Active","[Decision, Risk, and Management Science] Number of Resources: Active","[Design and Computer-Integrated Engineering] Number of Resources: Active","[Design, Tools, and Test] Number of Resources: Active","[Economics] Number of Resources: Active","[Emerging Technologies Initiation] Number of Resources: Active","[Experimental Systems] Number of Resources: Active","[Extragalactic Astronomy and Cosmology] Number of Resources: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Resources: Active","[Geology and Paleontology] Number of Resources: Active","[Geophysics] Number of Resources: Active","[Global Atmospheric Research] Number of Resources: Active","[Law and Social Sciences] Number of Resources: Active","[Mechanics and Materials] Number of Resources: Active","[Metals, Ceramics, and Electronic Materials] Number of Resources: Active","[Operations Research and Production Systems] Number of Resources: Active","[Polar Meteorology] Number of Resources: Active","[Seismology] Number of Resources: Active","[Stellar Astronomy and Astrophysics] Number of Resources: Active","[Structures and Building Systems] Number of Resources: Active","[Systematic and Population Biology] Number of Resources: Active","[Systems Prototyping and Fabrication] Number of Resources: Active","[Tectonics] Number of Resources: Active","[Theoretical Physics] Number of Resources: Active","[Volcanology and Mantle Geochemistry] Number of Resources: Active" +"2016 Q4",5,3,3,3,2,2,2,1,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +"2017 Q1",5,1,3,0,2,1,0,2,2,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,0,1,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Year-reference.csv index cad6448dba..26a3494fe6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/active_resource_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Resources: Active" -2016,5 -2017,5 +Year,"[Sociology] Number of Resources: Active","[Galactic Astronomy] Number of Resources: Active","[Physical Chemistry] Number of Resources: Active","[Solid State Chemistry and Polymers] Number of Resources: Active","[Arts] Number of Resources: Active","[Organic and Macromolecular Chemistry] Number of Resources: Active","[Polar Aeronomy and Astrophysics] Number of Resources: Active","[Polar Ocean and Climate Systems] Number of Resources: Active","[Quantum Electronics, Waves, and Beams] Number of Resources: Active","[Solid-State and Microstructures] Number of Resources: Active","[Statistics and Probability] Number of Resources: Active","[Algebra and Number Theory] Number of Resources: Active","[Biochemistry and Molecular Structure and Function] Number of Resources: Active","[Biophysics] Number of Resources: Active","[Cell Biology] Number of Resources: Active","[Computer and Computation Theory] Number of Resources: Active","[Decision, Risk, and Management Science] Number of Resources: Active","[Design and Computer-Integrated Engineering] Number of Resources: Active","[Design, Tools, and Test] Number of Resources: Active","[Economics] Number of Resources: Active","[Emerging Technologies Initiation] Number of Resources: Active","[Experimental Systems] Number of Resources: Active","[Extragalactic Astronomy and Cosmology] Number of Resources: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Resources: Active","[Geology and Paleontology] Number of Resources: Active","[Geophysics] Number of Resources: Active","[Global Atmospheric Research] Number of Resources: Active","[Law and Social Sciences] Number of Resources: Active","[Mechanics and Materials] Number of Resources: Active","[Metals, Ceramics, and Electronic Materials] Number of Resources: Active","[Operations Research and Production Systems] Number of Resources: Active","[Polar Meteorology] Number of Resources: Active","[Seismology] Number of Resources: Active","[Stellar Astronomy and Astrophysics] Number of Resources: Active","[Structures and Building Systems] Number of Resources: Active","[Systematic and Population Biology] Number of Resources: Active","[Systems Prototyping and Fabrication] Number of Resources: Active","[Tectonics] Number of Resources: Active","[Theoretical Physics] Number of Resources: Active","[Volcanology and Mantle Geochemistry] Number of Resources: Active" +2016,5,3,3,3,2,2,2,1,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017,5,1,3,0,2,1,0,2,2,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,0,1,0,1,0,1,1,1,1,0,1,1,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Day-reference.csv index 71e71c20c5..2ede9b7f42 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Per Job" -2016-12-22,202.12833333 -2016-12-23,194.86787037 -2016-12-24,200.00000000 -2016-12-25,129.71166667 -2016-12-26,205.12121212 -2016-12-27,370.31296958 -2016-12-28,182.19713395 -2016-12-29,98.42631226 -2016-12-30,9.53454400 -2016-12-31,7.50699692 -2017-01-01,4.21223217 +Day,"[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,200.95666667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203.30000000,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.60361111,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,116.56750000,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,288.00000000,43.26666667,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,432.00000000,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,1246.47111111,0,0,0,1487.82000000,0,0,0,0,265.59111111,320.78689815,0,0,1432.93629630,0,0,0,0,111.72266667,238.86666667,0,0,0,0,79.45703704,0,0,163.84000000,0,0,0,0,3.21666667,0,0,0,0,0 +2016-12-28,0,3274.16345679,1462.12800000,0,0,0,1170.67333333,0,0,94.01111111,0,912.00000000,137.33751634,60.47666667,37.38407407,548.99703704,0,0,70.31866667,0,141.10666667,288.00000000,0,0,0,0,324.00000000,13.35268330,5.01598392,497.74155556,0,0,0,0,24.00000000,0,0,0,0,0 +2016-12-29,0,4394.66666667,2154.62270531,831.60857143,410.97777778,611.49333333,1116.60000000,758.98888889,1038.22222222,480.00000000,0,912.00000000,365.14687831,288.00000000,288.00000000,481.66328889,46.91737374,0,84.37166667,52.00416667,35.54762993,288.00000000,0,0,0,7.24000000,107.02983796,16.60273286,13.10756221,291.44944444,0,0,0,2.01966667,7.00547635,0,0,0,0,107.90888889 +2016-12-30,2468.14222222,3044.46700855,1678.34215278,1568.46000000,1151.41444444,765.75000000,691.69761905,480.00444444,402.80000000,386.12222222,0,912.00000000,289.26650794,181.16111111,174.64030303,82.82847222,107.24694444,21.99861111,109.61282407,68.03194444,31.01048203,13.26442593,28.14000000,0,16.32947222,142.16250000,7.46168131,21.71949405,13.31263065,4.35337278,5.80186420,3.48631944,4.25015531,4.10559722,3.23608859,1.60992063,1.04000000,0.97252976,1.58977533,0.62469624 +2016-12-31,5701.54666667,816.89504274,927.25854167,1590.52000000,821.47333333,977.07428571,472.85472222,294.97777778,0,0,385.99851852,304.60111111,245.43360532,0,288.00000000,30.92378849,171.46924897,251.46666667,94.17464646,70.16857143,119.81037037,1.92791667,0,2.35937500,35.16320513,14.57163265,94.71781481,10.83064379,12.53390738,5.37641403,12.54733333,7.65398148,5.54019436,8.63138889,3.90284912,0,0,0.97299603,1.07971065,0.01479010 +2017-01-01,0,7.11888889,144.94972222,0,0,667.68761905,353.78037037,0,3.46666667,0,198.70320988,62.83434156,104.22217494,0,60.55000000,0,59.98977778,21.40555556,68.79111111,5.71666667,141.00285714,0,0,25.37236259,8.24440000,35.25833333,185.80611111,13.34534574,11.50582962,16.76606412,6.26263789,0,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Month-reference.csv index f535cdd7fc..2310ef47ef 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Per Job" -2016-12,13.71267944 -2017-01,4.21223217 +Month,"[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +2016-12,7012.77516340,4368.65777778,4514.85752604,2627.28571429,1767.64000000,1233.33333333,1006.98777778,960.13333333,1254.11377778,1441.02222222,529.63777778,467.04545455,555.54234568,1530.62425926,385.99851852,229.08605023,183.58806397,220.83068966,189.64305556,107.22319830,68.10298148,76.40201389,48.78758939,28.14000000,2.35937500,26.97462560,19.84069307,23.01874399,17.62892461,9.52178441,8.59051583,6.47641111,5.98691667,5.04208333,3.66207287,1.60992063,1.04000000,0.97276290,1.45671498,0.44956007 +2017-01,7.11888889,0,144.94972222,0,0,667.68761905,0,0,353.78037037,3.46666667,0,60.55000000,104.22217494,62.83434156,198.70320988,0,59.98977778,68.79111111,21.40555556,141.00285714,0,5.71666667,13.34534574,0,25.37236259,8.24440000,35.25833333,11.50582962,185.80611111,16.76606412,0,6.26263789,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Quarter-reference.csv index baf6688326..25e4fbff7d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Per Job" -"2016 Q4",13.71267944 -"2017 Q1",4.21223217 +Quarter,"[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +"2016 Q4",7012.77516340,4368.65777778,4514.85752604,2627.28571429,1767.64000000,1233.33333333,1006.98777778,960.13333333,1254.11377778,1441.02222222,529.63777778,467.04545455,555.54234568,1530.62425926,385.99851852,229.08605023,183.58806397,220.83068966,189.64305556,107.22319830,68.10298148,76.40201389,48.78758939,28.14000000,2.35937500,26.97462560,19.84069307,23.01874399,17.62892461,9.52178441,8.59051583,6.47641111,5.98691667,5.04208333,3.66207287,1.60992063,1.04000000,0.97276290,1.45671498,0.44956007 +"2017 Q1",7.11888889,0,144.94972222,0,0,667.68761905,0,0,353.78037037,3.46666667,0,60.55000000,104.22217494,62.83434156,198.70320988,0,59.98977778,68.79111111,21.40555556,141.00285714,0,5.71666667,13.34534574,0,25.37236259,8.24440000,35.25833333,11.50582962,185.80611111,16.76606412,0,6.26263789,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Year-reference.csv index ee9aed3099..4eb0c25eec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Per Job" -2016,13.71267944 -2017,4.21223217 +Year,"[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +2016,7012.77516340,4368.65777778,4514.85752604,2627.28571429,1767.64000000,1233.33333333,1006.98777778,960.13333333,1254.11377778,1441.02222222,529.63777778,467.04545455,555.54234568,1530.62425926,385.99851852,229.08605023,183.58806397,220.83068966,189.64305556,107.22319830,68.10298148,76.40201389,48.78758939,28.14000000,2.35937500,26.97462560,19.84069307,23.01874399,17.62892461,9.52178441,8.59051583,6.47641111,5.98691667,5.04208333,3.66207287,1.60992063,1.04000000,0.97276290,1.45671498,0.44956007 +2017,7.11888889,0,144.94972222,0,0,667.68761905,0,0,353.78037037,3.46666667,0,60.55000000,104.22217494,62.83434156,198.70320988,0,59.98977778,68.79111111,21.40555556,141.00285714,0,5.71666667,13.34534574,0,25.37236259,8.24440000,35.25833333,11.50582962,185.80611111,16.76606412,0,6.26263789,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Day-reference.csv index 71e71c20c5..2ede9b7f42 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Per Job" -2016-12-22,202.12833333 -2016-12-23,194.86787037 -2016-12-24,200.00000000 -2016-12-25,129.71166667 -2016-12-26,205.12121212 -2016-12-27,370.31296958 -2016-12-28,182.19713395 -2016-12-29,98.42631226 -2016-12-30,9.53454400 -2016-12-31,7.50699692 -2017-01-01,4.21223217 +Day,"[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,200.95666667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203.30000000,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.60361111,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,288.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,116.56750000,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,288.00000000,43.26666667,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,432.00000000,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,1246.47111111,0,0,0,1487.82000000,0,0,0,0,265.59111111,320.78689815,0,0,1432.93629630,0,0,0,0,111.72266667,238.86666667,0,0,0,0,79.45703704,0,0,163.84000000,0,0,0,0,3.21666667,0,0,0,0,0 +2016-12-28,0,3274.16345679,1462.12800000,0,0,0,1170.67333333,0,0,94.01111111,0,912.00000000,137.33751634,60.47666667,37.38407407,548.99703704,0,0,70.31866667,0,141.10666667,288.00000000,0,0,0,0,324.00000000,13.35268330,5.01598392,497.74155556,0,0,0,0,24.00000000,0,0,0,0,0 +2016-12-29,0,4394.66666667,2154.62270531,831.60857143,410.97777778,611.49333333,1116.60000000,758.98888889,1038.22222222,480.00000000,0,912.00000000,365.14687831,288.00000000,288.00000000,481.66328889,46.91737374,0,84.37166667,52.00416667,35.54762993,288.00000000,0,0,0,7.24000000,107.02983796,16.60273286,13.10756221,291.44944444,0,0,0,2.01966667,7.00547635,0,0,0,0,107.90888889 +2016-12-30,2468.14222222,3044.46700855,1678.34215278,1568.46000000,1151.41444444,765.75000000,691.69761905,480.00444444,402.80000000,386.12222222,0,912.00000000,289.26650794,181.16111111,174.64030303,82.82847222,107.24694444,21.99861111,109.61282407,68.03194444,31.01048203,13.26442593,28.14000000,0,16.32947222,142.16250000,7.46168131,21.71949405,13.31263065,4.35337278,5.80186420,3.48631944,4.25015531,4.10559722,3.23608859,1.60992063,1.04000000,0.97252976,1.58977533,0.62469624 +2016-12-31,5701.54666667,816.89504274,927.25854167,1590.52000000,821.47333333,977.07428571,472.85472222,294.97777778,0,0,385.99851852,304.60111111,245.43360532,0,288.00000000,30.92378849,171.46924897,251.46666667,94.17464646,70.16857143,119.81037037,1.92791667,0,2.35937500,35.16320513,14.57163265,94.71781481,10.83064379,12.53390738,5.37641403,12.54733333,7.65398148,5.54019436,8.63138889,3.90284912,0,0,0.97299603,1.07971065,0.01479010 +2017-01-01,0,7.11888889,144.94972222,0,0,667.68761905,353.78037037,0,3.46666667,0,198.70320988,62.83434156,104.22217494,0,60.55000000,0,59.98977778,21.40555556,68.79111111,5.71666667,141.00285714,0,0,25.37236259,8.24440000,35.25833333,185.80611111,13.34534574,11.50582962,16.76606412,6.26263789,0,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Month-reference.csv index f535cdd7fc..2310ef47ef 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Per Job" -2016-12,13.71267944 -2017-01,4.21223217 +Month,"[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +2016-12,7012.77516340,4368.65777778,4514.85752604,2627.28571429,1767.64000000,1233.33333333,1006.98777778,960.13333333,1254.11377778,1441.02222222,529.63777778,467.04545455,555.54234568,1530.62425926,385.99851852,229.08605023,183.58806397,220.83068966,189.64305556,107.22319830,68.10298148,76.40201389,48.78758939,28.14000000,2.35937500,26.97462560,19.84069307,23.01874399,17.62892461,9.52178441,8.59051583,6.47641111,5.98691667,5.04208333,3.66207287,1.60992063,1.04000000,0.97276290,1.45671498,0.44956007 +2017-01,7.11888889,0,144.94972222,0,0,667.68761905,0,0,353.78037037,3.46666667,0,60.55000000,104.22217494,62.83434156,198.70320988,0,59.98977778,68.79111111,21.40555556,141.00285714,0,5.71666667,13.34534574,0,25.37236259,8.24440000,35.25833333,11.50582962,185.80611111,16.76606412,0,6.26263789,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Quarter-reference.csv index baf6688326..25e4fbff7d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Per Job" -"2016 Q4",13.71267944 -"2017 Q1",4.21223217 +Quarter,"[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +"2016 Q4",7012.77516340,4368.65777778,4514.85752604,2627.28571429,1767.64000000,1233.33333333,1006.98777778,960.13333333,1254.11377778,1441.02222222,529.63777778,467.04545455,555.54234568,1530.62425926,385.99851852,229.08605023,183.58806397,220.83068966,189.64305556,107.22319830,68.10298148,76.40201389,48.78758939,28.14000000,2.35937500,26.97462560,19.84069307,23.01874399,17.62892461,9.52178441,8.59051583,6.47641111,5.98691667,5.04208333,3.66207287,1.60992063,1.04000000,0.97276290,1.45671498,0.44956007 +"2017 Q1",7.11888889,0,144.94972222,0,0,667.68761905,0,0,353.78037037,3.46666667,0,60.55000000,104.22217494,62.83434156,198.70320988,0,59.98977778,68.79111111,21.40555556,141.00285714,0,5.71666667,13.34534574,0,25.37236259,8.24440000,35.25833333,11.50582962,185.80611111,16.76606412,0,6.26263789,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Year-reference.csv index ee9aed3099..4eb0c25eec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Per Job" -2016,13.71267944 -2017,4.21223217 +Year,"[Organic and Macromolecular Chemistry] CPU Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Per Job","[Quantum Electronics, Waves, and Beams] CPU Hours: Per Job","[Metals, Ceramics, and Electronic Materials] CPU Hours: Per Job","[Structures and Building Systems] CPU Hours: Per Job","[Emerging Technologies Initiation] CPU Hours: Per Job","[Polar Aeronomy and Astrophysics] CPU Hours: Per Job","[Volcanology and Mantle Geochemistry] CPU Hours: Per Job","[Stellar Astronomy and Astrophysics] CPU Hours: Per Job","[Global Atmospheric Research] CPU Hours: Per Job","[Theoretical Physics] CPU Hours: Per Job","[Algebra and Number Theory] CPU Hours: Per Job","[Statistics and Probability] CPU Hours: Per Job","[Biophysics] CPU Hours: Per Job","[Design and Computer-Integrated Engineering] CPU Hours: Per Job","[Solid State Chemistry and Polymers] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Experimental Systems] CPU Hours: Per Job","[Geology and Paleontology] CPU Hours: Per Job","[Cell Biology] CPU Hours: Per Job","[Biochemistry and Molecular Structure and Function] CPU Hours: Per Job","[Seismology] CPU Hours: Per Job","[Operations Research and Production Systems] CPU Hours: Per Job","[Design, Tools, and Test] CPU Hours: Per Job","[Polar Ocean and Climate Systems] CPU Hours: Per Job","[Economics] CPU Hours: Per Job","[Solid-State and Microstructures] CPU Hours: Per Job","[Systems Prototyping and Fabrication] CPU Hours: Per Job","[Galactic Astronomy] CPU Hours: Per Job","[Physical Chemistry] CPU Hours: Per Job","[Tectonics] CPU Hours: Per Job","[Systematic and Population Biology] CPU Hours: Per Job","[Extragalactic Astronomy and Cosmology] CPU Hours: Per Job","[Computer and Computation Theory] CPU Hours: Per Job","[Sociology] CPU Hours: Per Job","[Geophysics] CPU Hours: Per Job","[Law and Social Sciences] CPU Hours: Per Job","[Mechanics and Materials] CPU Hours: Per Job","[Polar Meteorology] CPU Hours: Per Job","[Decision, Risk, and Management Science] CPU Hours: Per Job" +2016,7012.77516340,4368.65777778,4514.85752604,2627.28571429,1767.64000000,1233.33333333,1006.98777778,960.13333333,1254.11377778,1441.02222222,529.63777778,467.04545455,555.54234568,1530.62425926,385.99851852,229.08605023,183.58806397,220.83068966,189.64305556,107.22319830,68.10298148,76.40201389,48.78758939,28.14000000,2.35937500,26.97462560,19.84069307,23.01874399,17.62892461,9.52178441,8.59051583,6.47641111,5.98691667,5.04208333,3.66207287,1.60992063,1.04000000,0.97276290,1.45671498,0.44956007 +2017,7.11888889,0,144.94972222,0,0,667.68761905,0,0,353.78037037,3.46666667,0,60.55000000,104.22217494,62.83434156,198.70320988,0,59.98977778,68.79111111,21.40555556,141.00285714,0,5.71666667,13.34534574,0,25.37236259,8.24440000,35.25833333,11.50582962,185.80611111,16.76606412,0,6.26263789,0,0,0.60766446,0,0,0.96969246,0.02809588,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv index 6fdc805595..ebb6f12075 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Fluid, Particulate, and Hydraulic Systems",326.9898 +"Organic and Macromolecular Chemistry",185.9182 +"Global Atmospheric Research",160.0000 +"Structures and Building Systems",112.0000 +"Design, Tools, and Test",108.0000 +"Emerging Technologies Initiation",96.0000 +"Quantum Electronics, Waves, and Beams",95.4997 +"Metals, Ceramics, and Electronic Materials",72.0000 +"Solid State Chemistry and Polymers",62.2411 +"Stellar Astronomy and Astrophysics",61.4597 +"Systematic and Population Biology",57.7053 +"Geology and Paleontology",55.6816 +"Decision, Risk, and Management Science",53.4612 +Biophysics,48.6577 +"Polar Aeronomy and Astrophysics",39.9999 +Economics,29.2166 +"Physical Chemistry",28.9482 +"Galactic Astronomy",24.5939 +"Design and Computer-Integrated Engineering",23.2563 +Geophysics,20.0000 +"Volcanology and Mantle Geochemistry",20.0000 +"Law and Social Sciences",16.0000 +"Statistics and Probability",13.7795 +"Algebra and Number Theory",12.0000 +"Polar Ocean and Climate Systems",12.0000 +"Theoretical Physics",12.0000 +Arts,11.8252 +Sociology,10.3886 +"Biochemistry and Molecular Structure and Function",10.0459 +Seismology,9.9744 +"Experimental Systems",8.3168 +"Cell Biology",7.5996 +"Solid-State and Microstructures",4.5532 +"Computer and Computation Theory",1.0000 +"Extragalactic Astronomy and Cosmology",1.0000 +"Mechanics and Materials",1.0000 +"Operations Research and Production Systems",1.0000 +"Polar Meteorology",1.0000 +"Systems Prototyping and Fabrication",1.0000 +Tectonics,1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv index 6fdc805595..ebb6f12075 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Fluid, Particulate, and Hydraulic Systems",326.9898 +"Organic and Macromolecular Chemistry",185.9182 +"Global Atmospheric Research",160.0000 +"Structures and Building Systems",112.0000 +"Design, Tools, and Test",108.0000 +"Emerging Technologies Initiation",96.0000 +"Quantum Electronics, Waves, and Beams",95.4997 +"Metals, Ceramics, and Electronic Materials",72.0000 +"Solid State Chemistry and Polymers",62.2411 +"Stellar Astronomy and Astrophysics",61.4597 +"Systematic and Population Biology",57.7053 +"Geology and Paleontology",55.6816 +"Decision, Risk, and Management Science",53.4612 +Biophysics,48.6577 +"Polar Aeronomy and Astrophysics",39.9999 +Economics,29.2166 +"Physical Chemistry",28.9482 +"Galactic Astronomy",24.5939 +"Design and Computer-Integrated Engineering",23.2563 +Geophysics,20.0000 +"Volcanology and Mantle Geochemistry",20.0000 +"Law and Social Sciences",16.0000 +"Statistics and Probability",13.7795 +"Algebra and Number Theory",12.0000 +"Polar Ocean and Climate Systems",12.0000 +"Theoretical Physics",12.0000 +Arts,11.8252 +Sociology,10.3886 +"Biochemistry and Molecular Structure and Function",10.0459 +Seismology,9.9744 +"Experimental Systems",8.3168 +"Cell Biology",7.5996 +"Solid-State and Microstructures",4.5532 +"Computer and Computation Theory",1.0000 +"Extragalactic Astronomy and Cosmology",1.0000 +"Mechanics and Materials",1.0000 +"Operations Research and Production Systems",1.0000 +"Polar Meteorology",1.0000 +"Systems Prototyping and Fabrication",1.0000 +Tectonics,1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv index 6fdc805595..ebb6f12075 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Fluid, Particulate, and Hydraulic Systems",326.9898 +"Organic and Macromolecular Chemistry",185.9182 +"Global Atmospheric Research",160.0000 +"Structures and Building Systems",112.0000 +"Design, Tools, and Test",108.0000 +"Emerging Technologies Initiation",96.0000 +"Quantum Electronics, Waves, and Beams",95.4997 +"Metals, Ceramics, and Electronic Materials",72.0000 +"Solid State Chemistry and Polymers",62.2411 +"Stellar Astronomy and Astrophysics",61.4597 +"Systematic and Population Biology",57.7053 +"Geology and Paleontology",55.6816 +"Decision, Risk, and Management Science",53.4612 +Biophysics,48.6577 +"Polar Aeronomy and Astrophysics",39.9999 +Economics,29.2166 +"Physical Chemistry",28.9482 +"Galactic Astronomy",24.5939 +"Design and Computer-Integrated Engineering",23.2563 +Geophysics,20.0000 +"Volcanology and Mantle Geochemistry",20.0000 +"Law and Social Sciences",16.0000 +"Statistics and Probability",13.7795 +"Algebra and Number Theory",12.0000 +"Polar Ocean and Climate Systems",12.0000 +"Theoretical Physics",12.0000 +Arts,11.8252 +Sociology,10.3886 +"Biochemistry and Molecular Structure and Function",10.0459 +Seismology,9.9744 +"Experimental Systems",8.3168 +"Cell Biology",7.5996 +"Solid-State and Microstructures",4.5532 +"Computer and Computation Theory",1.0000 +"Extragalactic Astronomy and Cosmology",1.0000 +"Mechanics and Materials",1.0000 +"Operations Research and Production Systems",1.0000 +"Polar Meteorology",1.0000 +"Systems Prototyping and Fabrication",1.0000 +Tectonics,1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv index 6fdc805595..ebb6f12075 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Fluid, Particulate, and Hydraulic Systems",326.9898 +"Organic and Macromolecular Chemistry",185.9182 +"Global Atmospheric Research",160.0000 +"Structures and Building Systems",112.0000 +"Design, Tools, and Test",108.0000 +"Emerging Technologies Initiation",96.0000 +"Quantum Electronics, Waves, and Beams",95.4997 +"Metals, Ceramics, and Electronic Materials",72.0000 +"Solid State Chemistry and Polymers",62.2411 +"Stellar Astronomy and Astrophysics",61.4597 +"Systematic and Population Biology",57.7053 +"Geology and Paleontology",55.6816 +"Decision, Risk, and Management Science",53.4612 +Biophysics,48.6577 +"Polar Aeronomy and Astrophysics",39.9999 +Economics,29.2166 +"Physical Chemistry",28.9482 +"Galactic Astronomy",24.5939 +"Design and Computer-Integrated Engineering",23.2563 +Geophysics,20.0000 +"Volcanology and Mantle Geochemistry",20.0000 +"Law and Social Sciences",16.0000 +"Statistics and Probability",13.7795 +"Algebra and Number Theory",12.0000 +"Polar Ocean and Climate Systems",12.0000 +"Theoretical Physics",12.0000 +Arts,11.8252 +Sociology,10.3886 +"Biochemistry and Molecular Structure and Function",10.0459 +Seismology,9.9744 +"Experimental Systems",8.3168 +"Cell Biology",7.5996 +"Solid-State and Microstructures",4.5532 +"Computer and Computation Theory",1.0000 +"Extragalactic Astronomy and Cosmology",1.0000 +"Mechanics and Materials",1.0000 +"Operations Research and Production Systems",1.0000 +"Polar Meteorology",1.0000 +"Systems Prototyping and Fabrication",1.0000 +Tectonics,1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv index 19f0d4bd08..42ed505342 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016-12-22,12.0000 -2016-12-23,11.8381 -2016-12-24,11.5600 -2016-12-25,14.0099 -2016-12-26,18.3933 -2016-12-27,67.8600 -2016-12-28,107.6133 -2016-12-29,87.5874 -2016-12-30,69.1154 -2016-12-31,43.3544 -2017-01-01,22.2755 +Day,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Weighted By CPU Hours (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Global Atmospheric Research] Job Size: Weighted By CPU Hours (Core Count)","[Structures and Building Systems] Job Size: Weighted By CPU Hours (Core Count)","[Design, Tools, and Test] Job Size: Weighted By CPU Hours (Core Count)","[Emerging Technologies Initiation] Job Size: Weighted By CPU Hours (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Weighted By CPU Hours (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Weighted By CPU Hours (Core Count)","[Solid State Chemistry and Polymers] Job Size: Weighted By CPU Hours (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Systematic and Population Biology] Job Size: Weighted By CPU Hours (Core Count)","[Geology and Paleontology] Job Size: Weighted By CPU Hours (Core Count)","[Decision, Risk, and Management Science] Job Size: Weighted By CPU Hours (Core Count)","[Biophysics] Job Size: Weighted By CPU Hours (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Economics] Job Size: Weighted By CPU Hours (Core Count)","[Physical Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Galactic Astronomy] Job Size: Weighted By CPU Hours (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Geophysics] Job Size: Weighted By CPU Hours (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Weighted By CPU Hours (Core Count)","[Law and Social Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Statistics and Probability] Job Size: Weighted By CPU Hours (Core Count)","[Algebra and Number Theory] Job Size: Weighted By CPU Hours (Core Count)","[Polar Ocean and Climate Systems] Job Size: Weighted By CPU Hours (Core Count)","[Theoretical Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Sociology] Job Size: Weighted By CPU Hours (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Weighted By CPU Hours (Core Count)","[Seismology] Job Size: Weighted By CPU Hours (Core Count)","[Experimental Systems] Job Size: Weighted By CPU Hours (Core Count)","[Cell Biology] Job Size: Weighted By CPU Hours (Core Count)","[Solid-State and Microstructures] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Theory] Job Size: Weighted By CPU Hours (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Weighted By CPU Hours (Core Count)","[Mechanics and Materials] Job Size: Weighted By CPU Hours (Core Count)","[Operations Research and Production Systems] Job Size: Weighted By CPU Hours (Core Count)","[Polar Meteorology] Job Size: Weighted By CPU Hours (Core Count)","[Systems Prototyping and Fabrication] Job Size: Weighted By CPU Hours (Core Count)","[Tectonics] Job Size: Weighted By CPU Hours (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,12.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,12.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,12.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,15.9210,1.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,20.0000,1.0000,0,0,0,0,16.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,96.0000,0,110.0862,72.0000,0,0,0,35.8063,0,0,22.5565,15.2449,0,0,0,0,15.9632,0,0,0,0,1.0000,12.0000,0,0,8.0000,0,0,0,0,0,0,0,0 +2016-12-28,0,186.6783,0,0,0,0,96.0000,0,87.9948,65.7129,0,0,0,55.7895,0,0,28.6309,15.8148,0,0,20.0000,0,15.8458,12.0000,0,12.0000,0,1.0000,12.0000,0,8.0000,8.0000,0,0,0,0,1.0000,0,1.0000,0 +2016-12-29,0,186.5631,160.0000,112.0000,0,96.0000,95.9574,72.0000,62.0528,61.5476,0,0,56.0000,55.7895,40.0000,0,29.2190,23.6626,0,0,20.0000,0,15.9531,12.0000,0,12.0000,11.5552,7.4478,12.0000,5.0000,8.0000,7.2600,2.0000,1.0000,0,0,1.0000,0,1.0000,0 +2016-12-30,320.0517,186.4757,160.0000,112.0000,108.0000,96.0000,95.8117,72.0000,30.0833,59.0825,65.8038,45.1553,53.8849,55.7895,39.9998,41.1565,27.0648,25.1498,0,20.0000,20.0000,16.0000,15.9524,12.0000,0,12.0000,11.8713,10.0119,2.3934,5.0000,8.2497,7.1202,11.1559,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2016-12-31,336.0000,180.1552,0,112.0000,0,96.0000,95.0483,72.0000,16.5130,59.5816,95.7214,59.2199,1.0000,55.7250,40.0000,24.3207,41.0622,33.7236,23.4747,0,0,0,11.9114,12.0000,12.0000,0,11.8540,10.7516,1.0000,11.1429,8.8093,8.0000,2.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017-01-01,0,32.0000,160.0000,0,0,96.0000,81.6536,0,0,60.2453,47.3679,5.0000,0,51.2991,0,32.0142,14.3317,15.9990,22.8322,0,0,0,10.2343,12.0000,12.0000,0,10.7741,10.0543,0,12.0000,8.0000,8.0000,2.0000,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv index 5b7b5893bc..95bd1a8dd4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016-12,69.5398 -2017-01,22.2755 +Month,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Weighted By CPU Hours (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Global Atmospheric Research] Job Size: Weighted By CPU Hours (Core Count)","[Structures and Building Systems] Job Size: Weighted By CPU Hours (Core Count)","[Design, Tools, and Test] Job Size: Weighted By CPU Hours (Core Count)","[Emerging Technologies Initiation] Job Size: Weighted By CPU Hours (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Weighted By CPU Hours (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Weighted By CPU Hours (Core Count)","[Solid State Chemistry and Polymers] Job Size: Weighted By CPU Hours (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Systematic and Population Biology] Job Size: Weighted By CPU Hours (Core Count)","[Geology and Paleontology] Job Size: Weighted By CPU Hours (Core Count)","[Decision, Risk, and Management Science] Job Size: Weighted By CPU Hours (Core Count)","[Biophysics] Job Size: Weighted By CPU Hours (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Economics] Job Size: Weighted By CPU Hours (Core Count)","[Physical Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Galactic Astronomy] Job Size: Weighted By CPU Hours (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Geophysics] Job Size: Weighted By CPU Hours (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Weighted By CPU Hours (Core Count)","[Law and Social Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Statistics and Probability] Job Size: Weighted By CPU Hours (Core Count)","[Algebra and Number Theory] Job Size: Weighted By CPU Hours (Core Count)","[Polar Ocean and Climate Systems] Job Size: Weighted By CPU Hours (Core Count)","[Theoretical Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Sociology] Job Size: Weighted By CPU Hours (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Weighted By CPU Hours (Core Count)","[Seismology] Job Size: Weighted By CPU Hours (Core Count)","[Experimental Systems] Job Size: Weighted By CPU Hours (Core Count)","[Cell Biology] Job Size: Weighted By CPU Hours (Core Count)","[Solid-State and Microstructures] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Theory] Job Size: Weighted By CPU Hours (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Weighted By CPU Hours (Core Count)","[Mechanics and Materials] Job Size: Weighted By CPU Hours (Core Count)","[Operations Research and Production Systems] Job Size: Weighted By CPU Hours (Core Count)","[Polar Meteorology] Job Size: Weighted By CPU Hours (Core Count)","[Systems Prototyping and Fabrication] Job Size: Weighted By CPU Hours (Core Count)","[Tectonics] Job Size: Weighted By CPU Hours (Core Count)" +2016-12,326.9898,185.9918,160.0000,112.0000,108.0000,96.0000,95.7775,72.0000,62.2411,61.6652,71.6000,57.5884,53.4612,48.1697,39.9999,28.7519,30.5247,24.8317,23.4747,20.0000,20.0000,16.0000,14.3584,12.0000,12.0000,12.0000,11.8512,10.4072,10.0459,9.9365,8.3644,7.5484,4.5982,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017-01,0,32.0000,160.0000,0,0,96.0000,81.6536,0,0,60.2453,47.3679,5.0000,0,51.2991,0,32.0142,14.3317,15.9990,22.8322,0,0,0,10.2343,12.0000,12.0000,0,10.7741,10.0543,0,12.0000,8.0000,8.0000,2.0000,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv index d9870a7165..9d49d04694 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -"2016 Q4",69.5398 -"2017 Q1",22.2755 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Weighted By CPU Hours (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Global Atmospheric Research] Job Size: Weighted By CPU Hours (Core Count)","[Structures and Building Systems] Job Size: Weighted By CPU Hours (Core Count)","[Design, Tools, and Test] Job Size: Weighted By CPU Hours (Core Count)","[Emerging Technologies Initiation] Job Size: Weighted By CPU Hours (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Weighted By CPU Hours (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Weighted By CPU Hours (Core Count)","[Solid State Chemistry and Polymers] Job Size: Weighted By CPU Hours (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Systematic and Population Biology] Job Size: Weighted By CPU Hours (Core Count)","[Geology and Paleontology] Job Size: Weighted By CPU Hours (Core Count)","[Decision, Risk, and Management Science] Job Size: Weighted By CPU Hours (Core Count)","[Biophysics] Job Size: Weighted By CPU Hours (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Economics] Job Size: Weighted By CPU Hours (Core Count)","[Physical Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Galactic Astronomy] Job Size: Weighted By CPU Hours (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Geophysics] Job Size: Weighted By CPU Hours (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Weighted By CPU Hours (Core Count)","[Law and Social Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Statistics and Probability] Job Size: Weighted By CPU Hours (Core Count)","[Algebra and Number Theory] Job Size: Weighted By CPU Hours (Core Count)","[Polar Ocean and Climate Systems] Job Size: Weighted By CPU Hours (Core Count)","[Theoretical Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Sociology] Job Size: Weighted By CPU Hours (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Weighted By CPU Hours (Core Count)","[Seismology] Job Size: Weighted By CPU Hours (Core Count)","[Experimental Systems] Job Size: Weighted By CPU Hours (Core Count)","[Cell Biology] Job Size: Weighted By CPU Hours (Core Count)","[Solid-State and Microstructures] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Theory] Job Size: Weighted By CPU Hours (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Weighted By CPU Hours (Core Count)","[Mechanics and Materials] Job Size: Weighted By CPU Hours (Core Count)","[Operations Research and Production Systems] Job Size: Weighted By CPU Hours (Core Count)","[Polar Meteorology] Job Size: Weighted By CPU Hours (Core Count)","[Systems Prototyping and Fabrication] Job Size: Weighted By CPU Hours (Core Count)","[Tectonics] Job Size: Weighted By CPU Hours (Core Count)" +"2016 Q4",326.9898,185.9918,160.0000,112.0000,108.0000,96.0000,95.7775,72.0000,62.2411,61.6652,71.6000,57.5884,53.4612,48.1697,39.9999,28.7519,30.5247,24.8317,23.4747,20.0000,20.0000,16.0000,14.3584,12.0000,12.0000,12.0000,11.8512,10.4072,10.0459,9.9365,8.3644,7.5484,4.5982,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +"2017 Q1",0,32.0000,160.0000,0,0,96.0000,81.6536,0,0,60.2453,47.3679,5.0000,0,51.2991,0,32.0142,14.3317,15.9990,22.8322,0,0,0,10.2343,12.0000,12.0000,0,10.7741,10.0543,0,12.0000,8.0000,8.0000,2.0000,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv index acdf7e5ada..db5c33548a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016,69.5398 -2017,22.2755 +Year,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Weighted By CPU Hours (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Global Atmospheric Research] Job Size: Weighted By CPU Hours (Core Count)","[Structures and Building Systems] Job Size: Weighted By CPU Hours (Core Count)","[Design, Tools, and Test] Job Size: Weighted By CPU Hours (Core Count)","[Emerging Technologies Initiation] Job Size: Weighted By CPU Hours (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Weighted By CPU Hours (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Weighted By CPU Hours (Core Count)","[Solid State Chemistry and Polymers] Job Size: Weighted By CPU Hours (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Systematic and Population Biology] Job Size: Weighted By CPU Hours (Core Count)","[Geology and Paleontology] Job Size: Weighted By CPU Hours (Core Count)","[Decision, Risk, and Management Science] Job Size: Weighted By CPU Hours (Core Count)","[Biophysics] Job Size: Weighted By CPU Hours (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Weighted By CPU Hours (Core Count)","[Economics] Job Size: Weighted By CPU Hours (Core Count)","[Physical Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Galactic Astronomy] Job Size: Weighted By CPU Hours (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Geophysics] Job Size: Weighted By CPU Hours (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Weighted By CPU Hours (Core Count)","[Law and Social Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Statistics and Probability] Job Size: Weighted By CPU Hours (Core Count)","[Algebra and Number Theory] Job Size: Weighted By CPU Hours (Core Count)","[Polar Ocean and Climate Systems] Job Size: Weighted By CPU Hours (Core Count)","[Theoretical Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Sociology] Job Size: Weighted By CPU Hours (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Weighted By CPU Hours (Core Count)","[Seismology] Job Size: Weighted By CPU Hours (Core Count)","[Experimental Systems] Job Size: Weighted By CPU Hours (Core Count)","[Cell Biology] Job Size: Weighted By CPU Hours (Core Count)","[Solid-State and Microstructures] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Theory] Job Size: Weighted By CPU Hours (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Weighted By CPU Hours (Core Count)","[Mechanics and Materials] Job Size: Weighted By CPU Hours (Core Count)","[Operations Research and Production Systems] Job Size: Weighted By CPU Hours (Core Count)","[Polar Meteorology] Job Size: Weighted By CPU Hours (Core Count)","[Systems Prototyping and Fabrication] Job Size: Weighted By CPU Hours (Core Count)","[Tectonics] Job Size: Weighted By CPU Hours (Core Count)" +2016,326.9898,185.9918,160.0000,112.0000,108.0000,96.0000,95.7775,72.0000,62.2411,61.6652,71.6000,57.5884,53.4612,48.1697,39.9999,28.7519,30.5247,24.8317,23.4747,20.0000,20.0000,16.0000,14.3584,12.0000,12.0000,12.0000,11.8512,10.4072,10.0459,9.9365,8.3644,7.5484,4.5982,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017,0,32.0000,160.0000,0,0,96.0000,81.6536,0,0,60.2453,47.3679,5.0000,0,51.2991,0,32.0142,14.3317,15.9990,22.8322,0,0,0,10.2343,12.0000,12.0000,0,10.7741,10.0543,0,12.0000,8.0000,8.0000,2.0000,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Day-reference.csv index 4e2443a53a..2efe51668a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,28.72362434 -2016-12-28,19.14359259 -2016-12-29,16.39568790 -2016-12-30,1.81280749 -2016-12-31,1.60081062 -2017-01-01,1.07790443 +Day,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,16.74638889,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16.94166667,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.60361111,0,0,24.00000000,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,24.00000000,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,8.12694444,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,24.00000000,0,0,2.70416667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,24.00000000,0,0,0,0,0 +2016-12-27,0,0,103.87259259,0,0,0,123.98500000,0,27.19888889,0,0,20.78689815,0,0,0,0,0,19.90555556,0,110.37185185,0,13.96533333,0,0,0,0,0,0,0,0,0,8.71606481,0,0,8.23638889,0,3.21666667,0,0,0 +2016-12-28,0,204.63521605,121.84400000,0,0,0,110.33416667,0,108.00000000,0,0,9.90712418,4.70055556,13.35268330,5.03972222,3.11533951,5.01598392,24.00000000,8.78983333,41.89046296,0,17.63833333,0,0,0,0,0,0,0,0,0,24.00000000,0,0,23.06965278,0,24.00000000,0,0,0 +2016-12-29,0,274.66666667,180.43835749,69.30071429,50.95777778,129.77777778,105.05000000,25.68611111,108.00000000,0,37.94944444,23.89310847,24.00000000,16.60273286,24.00000000,24.00000000,13.10756221,24.00000000,10.54645833,33.92898889,4.34454545,7.73178763,0,3.62000000,10.40083333,0,0,2.01966667,0,0,0,8.69373843,0,0,17.28543724,0,1.17898003,26.97722222,0,0 +2016-12-30,205.67851852,190.40452991,141.05838294,130.70500000,63.81250000,50.35000000,64.49861111,71.96340278,108.00000000,0,24.00027778,18.94011905,19.30611111,21.71949405,15.09675926,14.55335859,13.31263065,11.72422222,13.41648148,5.43139178,9.68358547,7.32493056,2.52592593,16.84687500,13.60638889,3.48631944,4.25015531,4.10559722,2.34500000,0,1.36229167,0.89853754,0.97252976,1.58977533,0.37156165,0.56942901,0.34371670,0.17419134,0.08049603,0.06500000 +2016-12-31,475.12888889,53.59320513,77.97748843,132.54333333,81.42285714,0,40.94743056,51.34208333,36.07513889,33.22259259,14.74888889,23.17923611,0,10.83064379,0,24.00000000,12.53390738,1.92791667,10.97790404,1.97834003,15.93161523,14.97629630,21.37166667,7.28581633,6.47384921,7.65398148,5.54019436,8.63138889,0,0.19661458,2.93026709,6.74688889,0.97299603,1.07971065,0.59342052,1.04561111,0.38194742,0.01479010,0,0 +2017-01-01,0,0.88986111,11.65923611,0,55.64063492,0.43333333,29.48169753,0,7.49293210,17.76722222,0,11.20848700,0,13.34534574,0,5.04583333,11.50582962,0,8.59888889,0,6.53122222,17.62535714,4.28111111,17.62916667,0.47638889,0,0,0,0,2.11436355,0.68703333,11.62486111,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Month-reference.csv index 1d9b342802..81cb006bf1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Per Job" -2016-12,2.46307856 -2017-01,1.07790443 +Month,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +2016-12,364.05481481,440.33455882,378.45170139,218.94047619,110.47750000,180.12777778,102.77777778,113.84751852,50.34944444,48.00666667,44.13648148,48.78758939,171.93250000,38.92045455,42.94008230,33.22259259,26.76558429,23.01874399,19.49155093,16.76537037,16.21672374,16.77843434,16.77370370,8.59051583,7.77245050,8.66552083,5.98691667,5.04208333,2.34500000,0.19661458,1.77542542,2.24853865,0.97276290,1.45671498,0.72579524,0.61704722,0.37457084,0.12795354,0.08049603,0.06500000 +2017-01,0,0.88986111,11.65923611,0,0,0.43333333,55.64063492,29.48169753,0,0,0,13.34534574,7.49293210,5.04583333,11.20848700,17.76722222,8.59888889,11.50582962,17.62535714,0,0,6.53122222,4.28111111,0,17.62916667,0.47638889,0,0,0,2.11436355,11.62486111,0.68703333,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Quarter-reference.csv index a85a4b71d2..f94e8e5462 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Per Job" -"2016 Q4",2.46307856 -"2017 Q1",1.07790443 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +"2016 Q4",364.05481481,440.33455882,378.45170139,218.94047619,110.47750000,180.12777778,102.77777778,113.84751852,50.34944444,48.00666667,44.13648148,48.78758939,171.93250000,38.92045455,42.94008230,33.22259259,26.76558429,23.01874399,19.49155093,16.76537037,16.21672374,16.77843434,16.77370370,8.59051583,7.77245050,8.66552083,5.98691667,5.04208333,2.34500000,0.19661458,1.77542542,2.24853865,0.97276290,1.45671498,0.72579524,0.61704722,0.37457084,0.12795354,0.08049603,0.06500000 +"2017 Q1",0,0.88986111,11.65923611,0,0,0.43333333,55.64063492,29.48169753,0,0,0,13.34534574,7.49293210,5.04583333,11.20848700,17.76722222,8.59888889,11.50582962,17.62535714,0,0,6.53122222,4.28111111,0,17.62916667,0.47638889,0,0,0,2.11436355,11.62486111,0.68703333,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Year-reference.csv index 001c02de2b..aa815019cb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Per Job" -2016,2.46307856 -2017,1.07790443 +Year,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +2016,364.05481481,440.33455882,378.45170139,218.94047619,110.47750000,180.12777778,102.77777778,113.84751852,50.34944444,48.00666667,44.13648148,48.78758939,171.93250000,38.92045455,42.94008230,33.22259259,26.76558429,23.01874399,19.49155093,16.76537037,16.21672374,16.77843434,16.77370370,8.59051583,7.77245050,8.66552083,5.98691667,5.04208333,2.34500000,0.19661458,1.77542542,2.24853865,0.97276290,1.45671498,0.72579524,0.61704722,0.37457084,0.12795354,0.08049603,0.06500000 +2017,0,0.88986111,11.65923611,0,0,0.43333333,55.64063492,29.48169753,0,0,0,13.34534574,7.49293210,5.04583333,11.20848700,17.76722222,8.59888889,11.50582962,17.62535714,0,0,6.53122222,4.28111111,0,17.62916667,0.47638889,0,0,0,2.11436355,11.62486111,0.68703333,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Day-reference.csv index 4e2443a53a..2efe51668a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,28.72362434 -2016-12-28,19.14359259 -2016-12-29,16.39568790 -2016-12-30,1.81280749 -2016-12-31,1.60081062 -2017-01-01,1.07790443 +Day,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,16.74638889,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16.94166667,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.60361111,0,0,24.00000000,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,24.00000000,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,8.12694444,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,24.00000000,0,0,2.70416667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,24.00000000,0,0,0,0,0 +2016-12-27,0,0,103.87259259,0,0,0,123.98500000,0,27.19888889,0,0,20.78689815,0,0,0,0,0,19.90555556,0,110.37185185,0,13.96533333,0,0,0,0,0,0,0,0,0,8.71606481,0,0,8.23638889,0,3.21666667,0,0,0 +2016-12-28,0,204.63521605,121.84400000,0,0,0,110.33416667,0,108.00000000,0,0,9.90712418,4.70055556,13.35268330,5.03972222,3.11533951,5.01598392,24.00000000,8.78983333,41.89046296,0,17.63833333,0,0,0,0,0,0,0,0,0,24.00000000,0,0,23.06965278,0,24.00000000,0,0,0 +2016-12-29,0,274.66666667,180.43835749,69.30071429,50.95777778,129.77777778,105.05000000,25.68611111,108.00000000,0,37.94944444,23.89310847,24.00000000,16.60273286,24.00000000,24.00000000,13.10756221,24.00000000,10.54645833,33.92898889,4.34454545,7.73178763,0,3.62000000,10.40083333,0,0,2.01966667,0,0,0,8.69373843,0,0,17.28543724,0,1.17898003,26.97722222,0,0 +2016-12-30,205.67851852,190.40452991,141.05838294,130.70500000,63.81250000,50.35000000,64.49861111,71.96340278,108.00000000,0,24.00027778,18.94011905,19.30611111,21.71949405,15.09675926,14.55335859,13.31263065,11.72422222,13.41648148,5.43139178,9.68358547,7.32493056,2.52592593,16.84687500,13.60638889,3.48631944,4.25015531,4.10559722,2.34500000,0,1.36229167,0.89853754,0.97252976,1.58977533,0.37156165,0.56942901,0.34371670,0.17419134,0.08049603,0.06500000 +2016-12-31,475.12888889,53.59320513,77.97748843,132.54333333,81.42285714,0,40.94743056,51.34208333,36.07513889,33.22259259,14.74888889,23.17923611,0,10.83064379,0,24.00000000,12.53390738,1.92791667,10.97790404,1.97834003,15.93161523,14.97629630,21.37166667,7.28581633,6.47384921,7.65398148,5.54019436,8.63138889,0,0.19661458,2.93026709,6.74688889,0.97299603,1.07971065,0.59342052,1.04561111,0.38194742,0.01479010,0,0 +2017-01-01,0,0.88986111,11.65923611,0,55.64063492,0.43333333,29.48169753,0,7.49293210,17.76722222,0,11.20848700,0,13.34534574,0,5.04583333,11.50582962,0,8.59888889,0,6.53122222,17.62535714,4.28111111,17.62916667,0.47638889,0,0,0,0,2.11436355,0.68703333,11.62486111,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Month-reference.csv index 1d9b342802..81cb006bf1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Per Job" -2016-12,2.46307856 -2017-01,1.07790443 +Month,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +2016-12,364.05481481,440.33455882,378.45170139,218.94047619,110.47750000,180.12777778,102.77777778,113.84751852,50.34944444,48.00666667,44.13648148,48.78758939,171.93250000,38.92045455,42.94008230,33.22259259,26.76558429,23.01874399,19.49155093,16.76537037,16.21672374,16.77843434,16.77370370,8.59051583,7.77245050,8.66552083,5.98691667,5.04208333,2.34500000,0.19661458,1.77542542,2.24853865,0.97276290,1.45671498,0.72579524,0.61704722,0.37457084,0.12795354,0.08049603,0.06500000 +2017-01,0,0.88986111,11.65923611,0,0,0.43333333,55.64063492,29.48169753,0,0,0,13.34534574,7.49293210,5.04583333,11.20848700,17.76722222,8.59888889,11.50582962,17.62535714,0,0,6.53122222,4.28111111,0,17.62916667,0.47638889,0,0,0,2.11436355,11.62486111,0.68703333,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Quarter-reference.csv index a85a4b71d2..f94e8e5462 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Per Job" -"2016 Q4",2.46307856 -"2017 Q1",1.07790443 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +"2016 Q4",364.05481481,440.33455882,378.45170139,218.94047619,110.47750000,180.12777778,102.77777778,113.84751852,50.34944444,48.00666667,44.13648148,48.78758939,171.93250000,38.92045455,42.94008230,33.22259259,26.76558429,23.01874399,19.49155093,16.76537037,16.21672374,16.77843434,16.77370370,8.59051583,7.77245050,8.66552083,5.98691667,5.04208333,2.34500000,0.19661458,1.77542542,2.24853865,0.97276290,1.45671498,0.72579524,0.61704722,0.37457084,0.12795354,0.08049603,0.06500000 +"2017 Q1",0,0.88986111,11.65923611,0,0,0.43333333,55.64063492,29.48169753,0,0,0,13.34534574,7.49293210,5.04583333,11.20848700,17.76722222,8.59888889,11.50582962,17.62535714,0,0,6.53122222,4.28111111,0,17.62916667,0.47638889,0,0,0,2.11436355,11.62486111,0.68703333,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Year-reference.csv index 001c02de2b..aa815019cb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_node_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Per Job" -2016,2.46307856 -2017,1.07790443 +Year,"[Fluid, Particulate, and Hydraulic Systems] Node Hours: Per Job","[Organic and Macromolecular Chemistry] Node Hours: Per Job","[Quantum Electronics, Waves, and Beams] Node Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Node Hours: Per Job","[Structures and Building Systems] Node Hours: Per Job","[Global Atmospheric Research] Node Hours: Per Job","[Emerging Technologies Initiation] Node Hours: Per Job","[Stellar Astronomy and Astrophysics] Node Hours: Per Job","[Polar Aeronomy and Astrophysics] Node Hours: Per Job","[Volcanology and Mantle Geochemistry] Node Hours: Per Job","[Theoretical Physics] Node Hours: Per Job","[Operations Research and Production Systems] Node Hours: Per Job","[Biophysics] Node Hours: Per Job","[Algebra and Number Theory] Node Hours: Per Job","[Statistics and Probability] Node Hours: Per Job","[Design and Computer-Integrated Engineering] Node Hours: Per Job","[Experimental Systems] Node Hours: Per Job","[Systems Prototyping and Fabrication] Node Hours: Per Job","[Cell Biology] Node Hours: Per Job","[Biochemistry and Molecular Structure and Function] Node Hours: Per Job","[Solid State Chemistry and Polymers] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Geology and Paleontology] Node Hours: Per Job","[Tectonics] Node Hours: Per Job","[Solid-State and Microstructures] Node Hours: Per Job","[Seismology] Node Hours: Per Job","[Extragalactic Astronomy and Cosmology] Node Hours: Per Job","[Computer and Computation Theory] Node Hours: Per Job","[Design, Tools, and Test] Node Hours: Per Job","[Polar Ocean and Climate Systems] Node Hours: Per Job","[Galactic Astronomy] Node Hours: Per Job","[Economics] Node Hours: Per Job","[Mechanics and Materials] Node Hours: Per Job","[Polar Meteorology] Node Hours: Per Job","[Physical Chemistry] Node Hours: Per Job","[Systematic and Population Biology] Node Hours: Per Job","[Sociology] Node Hours: Per Job","[Decision, Risk, and Management Science] Node Hours: Per Job","[Geophysics] Node Hours: Per Job","[Law and Social Sciences] Node Hours: Per Job" +2016,364.05481481,440.33455882,378.45170139,218.94047619,110.47750000,180.12777778,102.77777778,113.84751852,50.34944444,48.00666667,44.13648148,48.78758939,171.93250000,38.92045455,42.94008230,33.22259259,26.76558429,23.01874399,19.49155093,16.76537037,16.21672374,16.77843434,16.77370370,8.59051583,7.77245050,8.66552083,5.98691667,5.04208333,2.34500000,0.19661458,1.77542542,2.24853865,0.97276290,1.45671498,0.72579524,0.61704722,0.37457084,0.12795354,0.08049603,0.06500000 +2017,0,0.88986111,11.65923611,0,0,0.43333333,55.64063492,29.48169753,0,0,0,13.34534574,7.49293210,5.04583333,11.20848700,17.76722222,8.59888889,11.50582962,17.62535714,0,0,6.53122222,4.28111111,0,17.62916667,0.47638889,0,0,0,2.11436355,11.62486111,0.68703333,0.96969246,0.02809588,1.61531716,0.63905875,0.06690347,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Day-reference.csv index 233b33fdbb..333762ee8f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Per Job (Core Count)" -2016-12-22,12.0000 -2016-12-23,8.3333 -2016-12-24,8.3333 -2016-12-25,14.1667 -2016-12-26,15.0000 -2016-12-27,29.0238 -2016-12-28,11.5644 -2016-12-29,6.8638 -2016-12-30,8.0163 -2016-12-31,8.7857 -2017-01-01,9.1326 +Day,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,12.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,12.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,18.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,16.0000,0,0,0,0,0,0,0,18.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,96.0000,0,72.0000,0,0,0,0,0,69.3333,0,0,38.0000,0,13.5000,0,0,0,0,0,1.0000,0,25.7143,13.5000,8.0000,12.0000,0,0,0,0,0,0,0,0,0 +2016-12-28,0,0,183.1111,0,0,0,96.0000,0,60.0000,0,0,0,0,0,34.6667,0,20.0000,38.0000,0,15.1176,12.0000,0,12.0000,0,0,1.0000,8.0000,26.6000,13.5000,8.0000,12.0000,0,0,0,0,0,1.0000,0,1.0000,0 +2016-12-29,0,160.0000,183.1111,112.0000,0,96.0000,91.8696,72.0000,60.0000,0,40.0000,0,0,0,27.0400,0,20.0000,38.0000,0,15.2857,12.0000,0,12.0000,11.2727,5.0000,9.3672,8.0000,17.9259,9.4167,2.3548,12.0000,2.0000,56.0000,1.0000,0,0,1.0000,0,1.0000,0 +2016-12-30,224.0000,160.0000,141.5385,112.0000,108.0000,96.0000,77.9286,72.0000,61.7143,44.0444,28.0000,24.6500,23.3333,0,20.1250,20.0000,20.0000,38.0000,16.0000,15.2857,12.0000,0,12.0000,11.2000,5.0000,9.0887,9.0000,8.2788,4.2351,2.7941,1.7333,9.5000,1.0647,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2016-12-31,336.0000,0,146.4615,112.0000,0,96.0000,78.0833,72.0000,53.0000,92.4000,40.0000,24.4615,32.5000,23.1111,16.4337,0,0,30.0000,0,10.3542,12.0000,12.0000,0,10.8889,11.4286,9.8789,10.0000,8.2365,8.3000,8.0000,1.0000,2.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017-01-01,0,160.0000,32.0000,0,0,96.0000,53.0000,0,49.3333,37.8993,0,24.0000,5.0000,23.1111,0,0,0,8.1852,0,10.5532,12.0000,12.0000,0,10.4000,12.0000,9.1352,8.0000,10.4080,8.5000,8.0000,0,2.0000,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Month-reference.csv index 52378ca45f..1c8b3490db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Per Job (Core Count)" -2016-12,8.5390 -2017-01,9.1326 +Month,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +2016-12,224.0000,160.0000,112.0000,108.0000,96.0000,123.2941,72.0000,69.7188,55.2000,48.8800,28.0000,24.5435,23.1111,20.0000,20.0000,18.9315,23.3333,16.0000,30.0000,12.0000,12.0000,12.0000,11.0909,10.6250,10.7037,9.5143,9.5172,8.2151,4.2402,3.0833,2.2970,1.7333,1.0418,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017-01,0,160.0000,0,0,96.0000,32.0000,0,53.0000,49.3333,37.8993,0,24.0000,23.1111,0,0,0,5.0000,0,8.1852,12.0000,12.0000,0,10.4000,12.0000,10.5532,9.1352,8.0000,10.4080,8.5000,8.0000,2.0000,0,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Quarter-reference.csv index e89748c392..a697c726b9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Per Job (Core Count)" -"2016 Q4",8.5390 -"2017 Q1",9.1326 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +"2016 Q4",224.0000,160.0000,112.0000,108.0000,96.0000,123.2941,72.0000,69.7188,55.2000,48.8800,28.0000,24.5435,23.1111,20.0000,20.0000,18.9315,23.3333,16.0000,30.0000,12.0000,12.0000,12.0000,11.0909,10.6250,10.7037,9.5143,9.5172,8.2151,4.2402,3.0833,2.2970,1.7333,1.0418,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +"2017 Q1",0,160.0000,0,0,96.0000,32.0000,0,53.0000,49.3333,37.8993,0,24.0000,23.1111,0,0,0,5.0000,0,8.1852,12.0000,12.0000,0,10.4000,12.0000,10.5532,9.1352,8.0000,10.4080,8.5000,8.0000,2.0000,0,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Year-reference.csv index 71f289ae9a..3078453c98 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Per Job (Core Count)" -2016,8.5390 -2017,9.1326 +Year,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +2016,224.0000,160.0000,112.0000,108.0000,96.0000,123.2941,72.0000,69.7188,55.2000,48.8800,28.0000,24.5435,23.1111,20.0000,20.0000,18.9315,23.3333,16.0000,30.0000,12.0000,12.0000,12.0000,11.0909,10.6250,10.7037,9.5143,9.5172,8.2151,4.2402,3.0833,2.2970,1.7333,1.0418,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017,0,160.0000,0,0,96.0000,32.0000,0,53.0000,49.3333,37.8993,0,24.0000,23.1111,0,0,0,5.0000,0,8.1852,12.0000,12.0000,0,10.4000,12.0000,10.5532,9.1352,8.0000,10.4080,8.5000,8.0000,2.0000,0,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Day-reference.csv index 233b33fdbb..333762ee8f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Per Job (Core Count)" -2016-12-22,12.0000 -2016-12-23,8.3333 -2016-12-24,8.3333 -2016-12-25,14.1667 -2016-12-26,15.0000 -2016-12-27,29.0238 -2016-12-28,11.5644 -2016-12-29,6.8638 -2016-12-30,8.0163 -2016-12-31,8.7857 -2017-01-01,9.1326 +Day,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,12.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,12.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0,18.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.0000,0,16.0000,0,0,0,0,0,0,0,18.0000,1.0000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,96.0000,0,72.0000,0,0,0,0,0,69.3333,0,0,38.0000,0,13.5000,0,0,0,0,0,1.0000,0,25.7143,13.5000,8.0000,12.0000,0,0,0,0,0,0,0,0,0 +2016-12-28,0,0,183.1111,0,0,0,96.0000,0,60.0000,0,0,0,0,0,34.6667,0,20.0000,38.0000,0,15.1176,12.0000,0,12.0000,0,0,1.0000,8.0000,26.6000,13.5000,8.0000,12.0000,0,0,0,0,0,1.0000,0,1.0000,0 +2016-12-29,0,160.0000,183.1111,112.0000,0,96.0000,91.8696,72.0000,60.0000,0,40.0000,0,0,0,27.0400,0,20.0000,38.0000,0,15.2857,12.0000,0,12.0000,11.2727,5.0000,9.3672,8.0000,17.9259,9.4167,2.3548,12.0000,2.0000,56.0000,1.0000,0,0,1.0000,0,1.0000,0 +2016-12-30,224.0000,160.0000,141.5385,112.0000,108.0000,96.0000,77.9286,72.0000,61.7143,44.0444,28.0000,24.6500,23.3333,0,20.1250,20.0000,20.0000,38.0000,16.0000,15.2857,12.0000,0,12.0000,11.2000,5.0000,9.0887,9.0000,8.2788,4.2351,2.7941,1.7333,9.5000,1.0647,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2016-12-31,336.0000,0,146.4615,112.0000,0,96.0000,78.0833,72.0000,53.0000,92.4000,40.0000,24.4615,32.5000,23.1111,16.4337,0,0,30.0000,0,10.3542,12.0000,12.0000,0,10.8889,11.4286,9.8789,10.0000,8.2365,8.3000,8.0000,1.0000,2.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017-01-01,0,160.0000,32.0000,0,0,96.0000,53.0000,0,49.3333,37.8993,0,24.0000,5.0000,23.1111,0,0,0,8.1852,0,10.5532,12.0000,12.0000,0,10.4000,12.0000,9.1352,8.0000,10.4080,8.5000,8.0000,0,2.0000,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Month-reference.csv index 52378ca45f..1c8b3490db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Per Job (Core Count)" -2016-12,8.5390 -2017-01,9.1326 +Month,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +2016-12,224.0000,160.0000,112.0000,108.0000,96.0000,123.2941,72.0000,69.7188,55.2000,48.8800,28.0000,24.5435,23.1111,20.0000,20.0000,18.9315,23.3333,16.0000,30.0000,12.0000,12.0000,12.0000,11.0909,10.6250,10.7037,9.5143,9.5172,8.2151,4.2402,3.0833,2.2970,1.7333,1.0418,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017-01,0,160.0000,0,0,96.0000,32.0000,0,53.0000,49.3333,37.8993,0,24.0000,23.1111,0,0,0,5.0000,0,8.1852,12.0000,12.0000,0,10.4000,12.0000,10.5532,9.1352,8.0000,10.4080,8.5000,8.0000,2.0000,0,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Quarter-reference.csv index e89748c392..a697c726b9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Per Job (Core Count)" -"2016 Q4",8.5390 -"2017 Q1",9.1326 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +"2016 Q4",224.0000,160.0000,112.0000,108.0000,96.0000,123.2941,72.0000,69.7188,55.2000,48.8800,28.0000,24.5435,23.1111,20.0000,20.0000,18.9315,23.3333,16.0000,30.0000,12.0000,12.0000,12.0000,11.0909,10.6250,10.7037,9.5143,9.5172,8.2151,4.2402,3.0833,2.2970,1.7333,1.0418,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +"2017 Q1",0,160.0000,0,0,96.0000,32.0000,0,53.0000,49.3333,37.8993,0,24.0000,23.1111,0,0,0,5.0000,0,8.1852,12.0000,12.0000,0,10.4000,12.0000,10.5532,9.1352,8.0000,10.4080,8.5000,8.0000,2.0000,0,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Year-reference.csv index 71f289ae9a..3078453c98 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Per Job (Core Count)" -2016,8.5390 -2017,9.1326 +Year,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Per Job (Core Count)","[Global Atmospheric Research] Job Size: Per Job (Core Count)","[Structures and Building Systems] Job Size: Per Job (Core Count)","[Design, Tools, and Test] Job Size: Per Job (Core Count)","[Emerging Technologies Initiation] Job Size: Per Job (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Per Job (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Per Job (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Per Job (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Per Job (Core Count)","[Systematic and Population Biology] Job Size: Per Job (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Per Job (Core Count)","[Economics] Job Size: Per Job (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Per Job (Core Count)","[Geophysics] Job Size: Per Job (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Per Job (Core Count)","[Solid State Chemistry and Polymers] Job Size: Per Job (Core Count)","[Geology and Paleontology] Job Size: Per Job (Core Count)","[Law and Social Sciences] Job Size: Per Job (Core Count)","[Biophysics] Job Size: Per Job (Core Count)","[Algebra and Number Theory] Job Size: Per Job (Core Count)","[Polar Ocean and Climate Systems] Job Size: Per Job (Core Count)","[Theoretical Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Seismology] Job Size: Per Job (Core Count)","[Statistics and Probability] Job Size: Per Job (Core Count)","[Sociology] Job Size: Per Job (Core Count)","[Experimental Systems] Job Size: Per Job (Core Count)","[Physical Chemistry] Job Size: Per Job (Core Count)","[Galactic Astronomy] Job Size: Per Job (Core Count)","[Cell Biology] Job Size: Per Job (Core Count)","[Solid-State and Microstructures] Job Size: Per Job (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Per Job (Core Count)","[Decision, Risk, and Management Science] Job Size: Per Job (Core Count)","[Computer and Computation Theory] Job Size: Per Job (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Per Job (Core Count)","[Mechanics and Materials] Job Size: Per Job (Core Count)","[Operations Research and Production Systems] Job Size: Per Job (Core Count)","[Polar Meteorology] Job Size: Per Job (Core Count)","[Systems Prototyping and Fabrication] Job Size: Per Job (Core Count)","[Tectonics] Job Size: Per Job (Core Count)" +2016,224.0000,160.0000,112.0000,108.0000,96.0000,123.2941,72.0000,69.7188,55.2000,48.8800,28.0000,24.5435,23.1111,20.0000,20.0000,18.9315,23.3333,16.0000,30.0000,12.0000,12.0000,12.0000,11.0909,10.6250,10.7037,9.5143,9.5172,8.2151,4.2402,3.0833,2.2970,1.7333,1.0418,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000,1.0000 +2017,0,160.0000,0,0,96.0000,32.0000,0,53.0000,49.3333,37.8993,0,24.0000,23.1111,0,0,0,5.0000,0,8.1852,12.0000,12.0000,0,10.4000,12.0000,10.5532,9.1352,8.0000,10.4080,8.5000,8.0000,2.0000,0,0,0,0,1.0000,1.0000,1.0000,1.0000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Day-reference.csv index 3dbe5e8853..f6e1d34f4e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Galactic Astronomy",214.25581950,2.0529931333004057 +"Cell Biology",71.34538580,15.241596218036447 +"Polar Aeronomy and Astrophysics",52.74111111,37.29241880267786 +"Quantum Electronics, Waves, and Beams",44.54427399,7.275316793106799 +"Solid State Chemistry and Polymers",35.12637367,1.715055012550036 +"Global Atmospheric Research",31.02180556,3.7428536858056267 +"Solid-State and Microstructures",26.77900440,0.3093136712992847 +"Systematic and Population Biology",12.67979893,0.790292910753799 +"Stellar Astronomy and Astrophysics",9.21498611,3.9691829026306045 +"Biochemistry and Molecular Structure and Function",8.19083333,2.9697909176657884 +"Fluid, Particulate, and Hydraulic Systems",6.67768519,0.98851049021015 +"Polar Ocean and Climate Systems",5.36508929,0.1678514684969954 +Arts,4.87037458,0.44747381160758987 +"Algebra and Number Theory",4.41189394,0.6571458545780616 +Tectonics,3.92752472,0.08635320372070841 +"Theoretical Physics",3.72481481,0.0007211928415468717 +"Design and Computer-Integrated Engineering",2.15222222,0.6988290975119311 +Sociology,2.05341236,0.02664920179778262 +"Metals, Ceramics, and Electronic Materials",1.98928571,0.9136179906052265 +"Emerging Technologies Initiation",1.88463542,0.5086144929601321 +"Decision, Risk, and Management Science",0.74204509,0.007451042072537693 +"Statistics and Probability",0.67655350,0.18487368040866786 +"Computer and Computation Theory",0.32390278,0.2312398274998169 +Economics,0.29952899,0.12719098377944033 +"Experimental Systems",0.20924174,0.04281469020992288 +"Systems Prototyping and Fabrication",0.20714974,0.015675479418422043 +"Design, Tools, and Test",0.09777778,0 +"Polar Meteorology",0.08220238,0.011574714004551338 +"Physical Chemistry",0.06381908,0.014079147600380438 +"Operations Research and Production Systems",0.05740350,0.004593062258338075 +"Geology and Paleontology",0.04034722,0.034861577990454876 +Biophysics,0.03987455,0.015476567200768681 +Seismology,0.01747222,0.00747562396751627 +"Extragalactic Astronomy and Cosmology",0.01408333,0.0026920235401535287 +Geophysics,0.00105159,0.00005735857833479565 +"Structures and Building Systems",0.00059028,0.000142636082683637 +"Volcanology and Mantle Geochemistry",0.00027778,0 +"Organic and Macromolecular Chemistry",0.00016667,0.00003513641844631532 +"Mechanics and Materials",0.00012566,0.000016471282949086855 +"Law and Social Sciences",0.00000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Month-reference.csv index 3dbe5e8853..f6e1d34f4e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Galactic Astronomy",214.25581950,2.0529931333004057 +"Cell Biology",71.34538580,15.241596218036447 +"Polar Aeronomy and Astrophysics",52.74111111,37.29241880267786 +"Quantum Electronics, Waves, and Beams",44.54427399,7.275316793106799 +"Solid State Chemistry and Polymers",35.12637367,1.715055012550036 +"Global Atmospheric Research",31.02180556,3.7428536858056267 +"Solid-State and Microstructures",26.77900440,0.3093136712992847 +"Systematic and Population Biology",12.67979893,0.790292910753799 +"Stellar Astronomy and Astrophysics",9.21498611,3.9691829026306045 +"Biochemistry and Molecular Structure and Function",8.19083333,2.9697909176657884 +"Fluid, Particulate, and Hydraulic Systems",6.67768519,0.98851049021015 +"Polar Ocean and Climate Systems",5.36508929,0.1678514684969954 +Arts,4.87037458,0.44747381160758987 +"Algebra and Number Theory",4.41189394,0.6571458545780616 +Tectonics,3.92752472,0.08635320372070841 +"Theoretical Physics",3.72481481,0.0007211928415468717 +"Design and Computer-Integrated Engineering",2.15222222,0.6988290975119311 +Sociology,2.05341236,0.02664920179778262 +"Metals, Ceramics, and Electronic Materials",1.98928571,0.9136179906052265 +"Emerging Technologies Initiation",1.88463542,0.5086144929601321 +"Decision, Risk, and Management Science",0.74204509,0.007451042072537693 +"Statistics and Probability",0.67655350,0.18487368040866786 +"Computer and Computation Theory",0.32390278,0.2312398274998169 +Economics,0.29952899,0.12719098377944033 +"Experimental Systems",0.20924174,0.04281469020992288 +"Systems Prototyping and Fabrication",0.20714974,0.015675479418422043 +"Design, Tools, and Test",0.09777778,0 +"Polar Meteorology",0.08220238,0.011574714004551338 +"Physical Chemistry",0.06381908,0.014079147600380438 +"Operations Research and Production Systems",0.05740350,0.004593062258338075 +"Geology and Paleontology",0.04034722,0.034861577990454876 +Biophysics,0.03987455,0.015476567200768681 +Seismology,0.01747222,0.00747562396751627 +"Extragalactic Astronomy and Cosmology",0.01408333,0.0026920235401535287 +Geophysics,0.00105159,0.00005735857833479565 +"Structures and Building Systems",0.00059028,0.000142636082683637 +"Volcanology and Mantle Geochemistry",0.00027778,0 +"Organic and Macromolecular Chemistry",0.00016667,0.00003513641844631532 +"Mechanics and Materials",0.00012566,0.000016471282949086855 +"Law and Social Sciences",0.00000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Quarter-reference.csv index 3dbe5e8853..f6e1d34f4e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Galactic Astronomy",214.25581950,2.0529931333004057 +"Cell Biology",71.34538580,15.241596218036447 +"Polar Aeronomy and Astrophysics",52.74111111,37.29241880267786 +"Quantum Electronics, Waves, and Beams",44.54427399,7.275316793106799 +"Solid State Chemistry and Polymers",35.12637367,1.715055012550036 +"Global Atmospheric Research",31.02180556,3.7428536858056267 +"Solid-State and Microstructures",26.77900440,0.3093136712992847 +"Systematic and Population Biology",12.67979893,0.790292910753799 +"Stellar Astronomy and Astrophysics",9.21498611,3.9691829026306045 +"Biochemistry and Molecular Structure and Function",8.19083333,2.9697909176657884 +"Fluid, Particulate, and Hydraulic Systems",6.67768519,0.98851049021015 +"Polar Ocean and Climate Systems",5.36508929,0.1678514684969954 +Arts,4.87037458,0.44747381160758987 +"Algebra and Number Theory",4.41189394,0.6571458545780616 +Tectonics,3.92752472,0.08635320372070841 +"Theoretical Physics",3.72481481,0.0007211928415468717 +"Design and Computer-Integrated Engineering",2.15222222,0.6988290975119311 +Sociology,2.05341236,0.02664920179778262 +"Metals, Ceramics, and Electronic Materials",1.98928571,0.9136179906052265 +"Emerging Technologies Initiation",1.88463542,0.5086144929601321 +"Decision, Risk, and Management Science",0.74204509,0.007451042072537693 +"Statistics and Probability",0.67655350,0.18487368040866786 +"Computer and Computation Theory",0.32390278,0.2312398274998169 +Economics,0.29952899,0.12719098377944033 +"Experimental Systems",0.20924174,0.04281469020992288 +"Systems Prototyping and Fabrication",0.20714974,0.015675479418422043 +"Design, Tools, and Test",0.09777778,0 +"Polar Meteorology",0.08220238,0.011574714004551338 +"Physical Chemistry",0.06381908,0.014079147600380438 +"Operations Research and Production Systems",0.05740350,0.004593062258338075 +"Geology and Paleontology",0.04034722,0.034861577990454876 +Biophysics,0.03987455,0.015476567200768681 +Seismology,0.01747222,0.00747562396751627 +"Extragalactic Astronomy and Cosmology",0.01408333,0.0026920235401535287 +Geophysics,0.00105159,0.00005735857833479565 +"Structures and Building Systems",0.00059028,0.000142636082683637 +"Volcanology and Mantle Geochemistry",0.00027778,0 +"Organic and Macromolecular Chemistry",0.00016667,0.00003513641844631532 +"Mechanics and Materials",0.00012566,0.000016471282949086855 +"Law and Social Sciences",0.00000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Year-reference.csv index 3dbe5e8853..f6e1d34f4e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Galactic Astronomy",214.25581950,2.0529931333004057 +"Cell Biology",71.34538580,15.241596218036447 +"Polar Aeronomy and Astrophysics",52.74111111,37.29241880267786 +"Quantum Electronics, Waves, and Beams",44.54427399,7.275316793106799 +"Solid State Chemistry and Polymers",35.12637367,1.715055012550036 +"Global Atmospheric Research",31.02180556,3.7428536858056267 +"Solid-State and Microstructures",26.77900440,0.3093136712992847 +"Systematic and Population Biology",12.67979893,0.790292910753799 +"Stellar Astronomy and Astrophysics",9.21498611,3.9691829026306045 +"Biochemistry and Molecular Structure and Function",8.19083333,2.9697909176657884 +"Fluid, Particulate, and Hydraulic Systems",6.67768519,0.98851049021015 +"Polar Ocean and Climate Systems",5.36508929,0.1678514684969954 +Arts,4.87037458,0.44747381160758987 +"Algebra and Number Theory",4.41189394,0.6571458545780616 +Tectonics,3.92752472,0.08635320372070841 +"Theoretical Physics",3.72481481,0.0007211928415468717 +"Design and Computer-Integrated Engineering",2.15222222,0.6988290975119311 +Sociology,2.05341236,0.02664920179778262 +"Metals, Ceramics, and Electronic Materials",1.98928571,0.9136179906052265 +"Emerging Technologies Initiation",1.88463542,0.5086144929601321 +"Decision, Risk, and Management Science",0.74204509,0.007451042072537693 +"Statistics and Probability",0.67655350,0.18487368040866786 +"Computer and Computation Theory",0.32390278,0.2312398274998169 +Economics,0.29952899,0.12719098377944033 +"Experimental Systems",0.20924174,0.04281469020992288 +"Systems Prototyping and Fabrication",0.20714974,0.015675479418422043 +"Design, Tools, and Test",0.09777778,0 +"Polar Meteorology",0.08220238,0.011574714004551338 +"Physical Chemistry",0.06381908,0.014079147600380438 +"Operations Research and Production Systems",0.05740350,0.004593062258338075 +"Geology and Paleontology",0.04034722,0.034861577990454876 +Biophysics,0.03987455,0.015476567200768681 +Seismology,0.01747222,0.00747562396751627 +"Extragalactic Astronomy and Cosmology",0.01408333,0.0026920235401535287 +Geophysics,0.00105159,0.00005735857833479565 +"Structures and Building Systems",0.00059028,0.000142636082683637 +"Volcanology and Mantle Geochemistry",0.00027778,0 +"Organic and Macromolecular Chemistry",0.00016667,0.00003513641844631532 +"Mechanics and Materials",0.00012566,0.000016471282949086855 +"Law and Social Sciences",0.00000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Day-reference.csv index 0b816a8716..e6c4cbc2e5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wait Hours: Per Job" -2016-12-22,4.66625000 -2016-12-23,9.59638889 -2016-12-24,0.00000000 -2016-12-25,36.96185185 -2016-12-26,0.00066667 -2016-12-27,63.81457885 -2016-12-28,8.81944104 -2016-12-29,4.73013286 -2016-12-30,7.20200027 -2016-12-31,2.68411411 -2017-01-01,1.71038090 +Day,"[Galactic Astronomy] Wait Hours: Per Job","[Cell Biology] Wait Hours: Per Job","[Polar Aeronomy and Astrophysics] Wait Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wait Hours: Per Job","[Solid State Chemistry and Polymers] Wait Hours: Per Job","[Global Atmospheric Research] Wait Hours: Per Job","[Solid-State and Microstructures] Wait Hours: Per Job","[Systematic and Population Biology] Wait Hours: Per Job","[Stellar Astronomy and Astrophysics] Wait Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wait Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Per Job","[Polar Ocean and Climate Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Algebra and Number Theory] Wait Hours: Per Job","[Tectonics] Wait Hours: Per Job","[Theoretical Physics] Wait Hours: Per Job","[Design and Computer-Integrated Engineering] Wait Hours: Per Job","[Sociology] Wait Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wait Hours: Per Job","[Emerging Technologies Initiation] Wait Hours: Per Job","[Decision, Risk, and Management Science] Wait Hours: Per Job","[Statistics and Probability] Wait Hours: Per Job","[Computer and Computation Theory] Wait Hours: Per Job","[Economics] Wait Hours: Per Job","[Experimental Systems] Wait Hours: Per Job","[Systems Prototyping and Fabrication] Wait Hours: Per Job","[Design, Tools, and Test] Wait Hours: Per Job","[Polar Meteorology] Wait Hours: Per Job","[Physical Chemistry] Wait Hours: Per Job","[Operations Research and Production Systems] Wait Hours: Per Job","[Geology and Paleontology] Wait Hours: Per Job","[Biophysics] Wait Hours: Per Job","[Seismology] Wait Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wait Hours: Per Job","[Geophysics] Wait Hours: Per Job","[Structures and Building Systems] Wait Hours: Per Job","[Volcanology and Mantle Geochemistry] Wait Hours: Per Job","[Organic and Macromolecular Chemistry] Wait Hours: Per Job","[Mechanics and Materials] Wait Hours: Per Job","[Law and Social Sciences] Wait Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9.33222222,0,0,0.00027778,0,0,0,0,0,0,0,0 +2016-12-23,9.59638889,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00000000,0,0,0.00000000,0,0,0,0,0,0,0,0 +2016-12-24,0.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00000000,0,0,0.00000000,0,0,0,0,0,0,0,0 +2016-12-25,0.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36.96185185,0,0,0.00000000,0,0,0,0,0,0,0,0 +2016-12-26,0.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00066667,0,0,0,0,0,0,0.00000000,0,0,0.00000000,0,0,0,0,0,0,0,0 +2016-12-27,0.00055556,273.48105556,0,103.71148148,57.59064815,0,0,0,76.08611111,50.82250000,0,0,0,0,0,0,0,0.00000000,0,0,0,0.00000000,0,0,0,0,0,0,0.00288889,0,0,0.00000000,0,0,0,0,0,0,0,0 +2016-12-28,0.00000000,280.72700000,0,108.01750000,80.35419753,0,0,0,36.87611111,0.00000000,0,0,0,5.30577160,0,3.72481481,0,0.00000000,0,0,0,1.68000000,0,0,0.46633333,0.02977924,0,0,7.07458333,0.07195578,0,0.00000000,0,0,0,0,0.00027778,0.00018519,0,0 +2016-12-29,150.26646605,12.05893162,0.00166667,41.77958333,22.19675214,25.72861111,0.00444444,0,5.85819444,0.00000000,0,0,0.87133838,0.00000000,0,0.00000000,0,7.73980283,1.98928571,3.47907407,0.79222222,4.46097222,0.01788889,0,0.13063131,0.04237662,0,0,1.33660948,0.04464331,0,0.00000000,0.00000000,0,0,0.00062500,0.00000000,0.00000000,0,0 +2016-12-30,224.39559552,55.29648148,105.48055556,0.00222222,31.96192488,0.00000000,18.02518519,13.00438580,14.90583333,5.14571429,6.67768519,0,5.77518519,0.38944444,2.58369031,0.00000000,0,1.39468892,0.00000000,1.47605556,0.84532650,0.00000000,0.42590741,0.59636111,0.31423611,0.32754774,0.09777778,0.17850082,0.02575712,0.13344771,0.05370370,0.00000000,0.00000000,0.01437500,0.00105159,0.00055556,0.00000000,0.00020833,0.00009921,0.00000000 +2016-12-31,4.34280303,351.74604167,0.00000000,0.00076389,33.49272778,0,27.32576747,3.35838889,0.95052083,0.00000000,0.00000000,0.02019097,0.00000000,0.00000000,7.36601918,0,2.15222222,2.90176261,0.00000000,0.07819444,0.55391509,0.00626263,0.00000000,0.33598291,0.26094444,0.35169374,0,0.02144676,0.03724051,0.01543544,0.00000000,0.00027778,0.02496032,0.01388889,0,0.00000000,0,0.00013889,0.00010913,0 +2017-01-01,0.00666667,0.00000000,0,1.52939815,0,36.31500000,0.00000000,13.14023981,1.45988889,0,0,5.48065465,0.00000000,0.00000000,0,0,0.00000000,1.47548426,0,3.00597222,0,0.00000000,0,0.00020531,0.01934028,0.03615605,0,0.00010305,0.09531934,0.01760234,0.00027778,0.04938889,0.00000000,0,0,0,0,0.00013889,0.00016865,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Month-reference.csv index 21a8cd03f9..ff4c62a9d5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wait Hours: Per Job" -2016-12,4.99051340 -2017-01,1.71038090 +Month,"[Galactic Astronomy] Wait Hours: Per Job","[Cell Biology] Wait Hours: Per Job","[Polar Aeronomy and Astrophysics] Wait Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wait Hours: Per Job","[Solid State Chemistry and Polymers] Wait Hours: Per Job","[Global Atmospheric Research] Wait Hours: Per Job","[Solid-State and Microstructures] Wait Hours: Per Job","[Systematic and Population Biology] Wait Hours: Per Job","[Stellar Astronomy and Astrophysics] Wait Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wait Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Per Job","[Polar Ocean and Climate Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Algebra and Number Theory] Wait Hours: Per Job","[Tectonics] Wait Hours: Per Job","[Theoretical Physics] Wait Hours: Per Job","[Design and Computer-Integrated Engineering] Wait Hours: Per Job","[Sociology] Wait Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wait Hours: Per Job","[Emerging Technologies Initiation] Wait Hours: Per Job","[Decision, Risk, and Management Science] Wait Hours: Per Job","[Statistics and Probability] Wait Hours: Per Job","[Computer and Computation Theory] Wait Hours: Per Job","[Economics] Wait Hours: Per Job","[Experimental Systems] Wait Hours: Per Job","[Systems Prototyping and Fabrication] Wait Hours: Per Job","[Design, Tools, and Test] Wait Hours: Per Job","[Polar Meteorology] Wait Hours: Per Job","[Physical Chemistry] Wait Hours: Per Job","[Operations Research and Production Systems] Wait Hours: Per Job","[Geology and Paleontology] Wait Hours: Per Job","[Biophysics] Wait Hours: Per Job","[Seismology] Wait Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wait Hours: Per Job","[Geophysics] Wait Hours: Per Job","[Structures and Building Systems] Wait Hours: Per Job","[Volcanology and Mantle Geochemistry] Wait Hours: Per Job","[Organic and Macromolecular Chemistry] Wait Hours: Per Job","[Mechanics and Materials] Wait Hours: Per Job","[Law and Social Sciences] Wait Hours: Per Job" +2016-12,214.53698637,71.34538580,52.74111111,60.67485243,35.12637367,25.72861111,26.77900440,12.03978611,11.80001852,8.19083333,6.67768519,0.02019097,4.87037458,4.41189394,3.92752472,3.72481481,2.15222222,2.24032120,1.98928571,1.51085648,0.74204509,0.67655350,0.32390278,0.44919082,0.26162835,0.22153436,0.09777778,0.13753019,0.06199041,0.06002018,0.05370370,0.00023148,0.02184028,0.01408333,0.00105159,0.00059028,0.00027778,0.00017974,0.00010417,0.00000000 +2017-01,0.00666667,0.00000000,0,1.52939815,0,36.31500000,0.00000000,13.14023981,1.45988889,0,0,5.48065465,0.00000000,0.00000000,0,0,0.00000000,1.47548426,0,3.00597222,0,0.00000000,0,0.00020531,0.01934028,0.03615605,0,0.00010305,0.09531934,0.01760234,0.00027778,0.04938889,0.00000000,0,0,0,0,0.00013889,0.00016865,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Quarter-reference.csv index f20792faac..11db26b645 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wait Hours: Per Job" -"2016 Q4",4.99051340 -"2017 Q1",1.71038090 +Quarter,"[Galactic Astronomy] Wait Hours: Per Job","[Cell Biology] Wait Hours: Per Job","[Polar Aeronomy and Astrophysics] Wait Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wait Hours: Per Job","[Solid State Chemistry and Polymers] Wait Hours: Per Job","[Global Atmospheric Research] Wait Hours: Per Job","[Solid-State and Microstructures] Wait Hours: Per Job","[Systematic and Population Biology] Wait Hours: Per Job","[Stellar Astronomy and Astrophysics] Wait Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wait Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Per Job","[Polar Ocean and Climate Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Algebra and Number Theory] Wait Hours: Per Job","[Tectonics] Wait Hours: Per Job","[Theoretical Physics] Wait Hours: Per Job","[Design and Computer-Integrated Engineering] Wait Hours: Per Job","[Sociology] Wait Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wait Hours: Per Job","[Emerging Technologies Initiation] Wait Hours: Per Job","[Decision, Risk, and Management Science] Wait Hours: Per Job","[Statistics and Probability] Wait Hours: Per Job","[Computer and Computation Theory] Wait Hours: Per Job","[Economics] Wait Hours: Per Job","[Experimental Systems] Wait Hours: Per Job","[Systems Prototyping and Fabrication] Wait Hours: Per Job","[Design, Tools, and Test] Wait Hours: Per Job","[Polar Meteorology] Wait Hours: Per Job","[Physical Chemistry] Wait Hours: Per Job","[Operations Research and Production Systems] Wait Hours: Per Job","[Geology and Paleontology] Wait Hours: Per Job","[Biophysics] Wait Hours: Per Job","[Seismology] Wait Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wait Hours: Per Job","[Geophysics] Wait Hours: Per Job","[Structures and Building Systems] Wait Hours: Per Job","[Volcanology and Mantle Geochemistry] Wait Hours: Per Job","[Organic and Macromolecular Chemistry] Wait Hours: Per Job","[Mechanics and Materials] Wait Hours: Per Job","[Law and Social Sciences] Wait Hours: Per Job" +"2016 Q4",214.53698637,71.34538580,52.74111111,60.67485243,35.12637367,25.72861111,26.77900440,12.03978611,11.80001852,8.19083333,6.67768519,0.02019097,4.87037458,4.41189394,3.92752472,3.72481481,2.15222222,2.24032120,1.98928571,1.51085648,0.74204509,0.67655350,0.32390278,0.44919082,0.26162835,0.22153436,0.09777778,0.13753019,0.06199041,0.06002018,0.05370370,0.00023148,0.02184028,0.01408333,0.00105159,0.00059028,0.00027778,0.00017974,0.00010417,0.00000000 +"2017 Q1",0.00666667,0.00000000,0,1.52939815,0,36.31500000,0.00000000,13.14023981,1.45988889,0,0,5.48065465,0.00000000,0.00000000,0,0,0.00000000,1.47548426,0,3.00597222,0,0.00000000,0,0.00020531,0.01934028,0.03615605,0,0.00010305,0.09531934,0.01760234,0.00027778,0.04938889,0.00000000,0,0,0,0,0.00013889,0.00016865,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Year-reference.csv index 22d8bce00d..6274353f6c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_waitduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wait Hours: Per Job" -2016,4.99051340 -2017,1.71038090 +Year,"[Galactic Astronomy] Wait Hours: Per Job","[Cell Biology] Wait Hours: Per Job","[Polar Aeronomy and Astrophysics] Wait Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wait Hours: Per Job","[Solid State Chemistry and Polymers] Wait Hours: Per Job","[Global Atmospheric Research] Wait Hours: Per Job","[Solid-State and Microstructures] Wait Hours: Per Job","[Systematic and Population Biology] Wait Hours: Per Job","[Stellar Astronomy and Astrophysics] Wait Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wait Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Per Job","[Polar Ocean and Climate Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Algebra and Number Theory] Wait Hours: Per Job","[Tectonics] Wait Hours: Per Job","[Theoretical Physics] Wait Hours: Per Job","[Design and Computer-Integrated Engineering] Wait Hours: Per Job","[Sociology] Wait Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wait Hours: Per Job","[Emerging Technologies Initiation] Wait Hours: Per Job","[Decision, Risk, and Management Science] Wait Hours: Per Job","[Statistics and Probability] Wait Hours: Per Job","[Computer and Computation Theory] Wait Hours: Per Job","[Economics] Wait Hours: Per Job","[Experimental Systems] Wait Hours: Per Job","[Systems Prototyping and Fabrication] Wait Hours: Per Job","[Design, Tools, and Test] Wait Hours: Per Job","[Polar Meteorology] Wait Hours: Per Job","[Physical Chemistry] Wait Hours: Per Job","[Operations Research and Production Systems] Wait Hours: Per Job","[Geology and Paleontology] Wait Hours: Per Job","[Biophysics] Wait Hours: Per Job","[Seismology] Wait Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wait Hours: Per Job","[Geophysics] Wait Hours: Per Job","[Structures and Building Systems] Wait Hours: Per Job","[Volcanology and Mantle Geochemistry] Wait Hours: Per Job","[Organic and Macromolecular Chemistry] Wait Hours: Per Job","[Mechanics and Materials] Wait Hours: Per Job","[Law and Social Sciences] Wait Hours: Per Job" +2016,214.53698637,71.34538580,52.74111111,60.67485243,35.12637367,25.72861111,26.77900440,12.03978611,11.80001852,8.19083333,6.67768519,0.02019097,4.87037458,4.41189394,3.92752472,3.72481481,2.15222222,2.24032120,1.98928571,1.51085648,0.74204509,0.67655350,0.32390278,0.44919082,0.26162835,0.22153436,0.09777778,0.13753019,0.06199041,0.06002018,0.05370370,0.00023148,0.02184028,0.01408333,0.00105159,0.00059028,0.00027778,0.00017974,0.00010417,0.00000000 +2017,0.00666667,0.00000000,0,1.52939815,0,36.31500000,0.00000000,13.14023981,1.45988889,0,0,5.48065465,0.00000000,0.00000000,0,0,0.00000000,1.47548426,0,3.00597222,0,0.00000000,0,0.00020531,0.01934028,0.03615605,0,0.00010305,0.09531934,0.01760234,0.00027778,0.04938889,0.00000000,0,0,0,0,0.00013889,0.00016865,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Day-reference.csv index 4f5a3052ad..487ea851c3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.017929611668507588 +"Statistics and Probability",52.69561728, +"Operations Research and Production Systems",49.85089556, +"Volcanology and Mantle Geochemistry",48.00666667, +"Theoretical Physics",44.13648148, +"Algebra and Number Theory",39.37916667, +"Quantum Electronics, Waves, and Beams",37.79727273, +"Metals, Ceramics, and Electronic Materials",36.49007937, +"Organic and Macromolecular Chemistry",26.34404444, +"Design and Computer-Integrated Engineering",25.49490741, +"Systems Prototyping and Fabrication",25.48654262, +"Polar Aeronomy and Astrophysics",25.17486111, +"Experimental Systems",24.23206456, +"Cell Biology",21.20474151, +"Stellar Astronomy and Astrophysics",18.55493056, +Arts,17.27322391, +"Biochemistry and Molecular Structure and Function",16.76537037, +"Structures and Building Systems",15.78250000, +"Fluid, Particulate, and Hydraulic Systems",15.43750000,2.949516142225878 +Biophysics,12.69807348,1.9501880028878633 +"Emerging Technologies Initiation",12.67826389, +Tectonics,8.59051583, +"Solid-State and Microstructures",7.94699670,0.252707620848999 +"Solid State Chemistry and Polymers",7.84637557,0.6422820715080719 +Seismology,7.02769444,1.7557857088278381 +"Extragalactic Astronomy and Cosmology",5.98691667,0.9781127830854605 +"Computer and Computation Theory",5.04208333,1.412736659063767 +"Geology and Paleontology",4.58416667,1.0571325984155044 +"Global Atmospheric Research",4.51402778,1.3866381241776238 +"Polar Ocean and Climate Systems",2.10733760,0.04730850999433886 +"Galactic Astronomy",1.61309706,0.16764615169441738 +"Mechanics and Materials",0.97173942,0.00025764463006399947 +"Polar Meteorology",0.88155664,0.09909785167735996 +Economics,0.81574879,0.33900408606509713 +"Physical Chemistry",0.55186616,0.029985935034615736 +Sociology,0.29997993,0.003221245083552797 +"Design, Tools, and Test",0.26055556,0 +"Systematic and Population Biology",0.18926081,0.027954377835160745 +Geophysics,0.08049603,0.022331879009996006 +"Law and Social Sciences",0.06500000,0 +"Decision, Risk, and Management Science",0.02840866,0.006969739306507408 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Month-reference.csv index 1ec25ce2c1..c2a4b06bb9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +"Statistics and Probability",52.69561728, +"Operations Research and Production Systems",49.85089556,1.1100595034642202 +"Volcanology and Mantle Geochemistry",48.00666667,0 +"Theoretical Physics",44.13648148,3.8863777173028686 +"Algebra and Number Theory",39.37916667,3.5074678840012607 +"Quantum Electronics, Waves, and Beams",37.79727273,4.7120666811720895 +"Metals, Ceramics, and Electronic Materials",36.49007937,2.407916402194818 +"Organic and Macromolecular Chemistry",26.34404444,6.8507338965077675 +"Design and Computer-Integrated Engineering",25.49490741, +"Systems Prototyping and Fabrication",25.48654262,0.09521527865289223 +"Polar Aeronomy and Astrophysics",25.17486111,17.80092216999551 +"Experimental Systems",24.23206456,3.046402847031802 +"Cell Biology",21.20474151,2.519140001248213 +"Stellar Astronomy and Astrophysics",18.55493056,4.578065909633193 +Arts,17.27322391,1.2812633375632778 +"Biochemistry and Molecular Structure and Function",16.76537037,3.911305555603074 +"Structures and Building Systems",15.78250000,1.4182317241819407 +"Fluid, Particulate, and Hydraulic Systems",15.43750000,9.334819660458281 +Biophysics,12.69807348,7.9017703608261565 +"Emerging Technologies Initiation",12.67826389,0.43082354975761517 +Tectonics,8.59051583,0.027937647321332644 +"Solid-State and Microstructures",7.94699670,0.4591933087881705 +"Solid State Chemistry and Polymers",7.84637557,1.3319104362573686 +Seismology,7.02769444,2.431694700689441 +"Extragalactic Astronomy and Cosmology",5.98691667,0.9781127830854605 +"Computer and Computation Theory",5.04208333,1.9381499596292342 +"Geology and Paleontology",4.58416667,1.606624250847252 +"Global Atmospheric Research",4.51402778,3.1765790052054 +"Polar Ocean and Climate Systems",2.10733760,0.04730850999433886 +"Galactic Astronomy",1.61309706,0.3572919275210631 +"Mechanics and Materials",0.97173942,0.00025764463006399947 +"Polar Meteorology",0.88155664,0.09909785167735996 +Economics,0.81574879,0.33900408606509713 +"Physical Chemistry",0.55186616,0.0548134687339129 +Sociology,0.29997993,0.00460726351698731 +"Design, Tools, and Test",0.26055556,0 +"Systematic and Population Biology",0.18926081,0.027954377835160745 +Geophysics,0.08049603,0.022331879009996006 +"Law and Social Sciences",0.06500000,0 +"Decision, Risk, and Management Science",0.02840866,0.007661173777721356 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Quarter-reference.csv index 1ec25ce2c1..c2a4b06bb9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +"Statistics and Probability",52.69561728, +"Operations Research and Production Systems",49.85089556,1.1100595034642202 +"Volcanology and Mantle Geochemistry",48.00666667,0 +"Theoretical Physics",44.13648148,3.8863777173028686 +"Algebra and Number Theory",39.37916667,3.5074678840012607 +"Quantum Electronics, Waves, and Beams",37.79727273,4.7120666811720895 +"Metals, Ceramics, and Electronic Materials",36.49007937,2.407916402194818 +"Organic and Macromolecular Chemistry",26.34404444,6.8507338965077675 +"Design and Computer-Integrated Engineering",25.49490741, +"Systems Prototyping and Fabrication",25.48654262,0.09521527865289223 +"Polar Aeronomy and Astrophysics",25.17486111,17.80092216999551 +"Experimental Systems",24.23206456,3.046402847031802 +"Cell Biology",21.20474151,2.519140001248213 +"Stellar Astronomy and Astrophysics",18.55493056,4.578065909633193 +Arts,17.27322391,1.2812633375632778 +"Biochemistry and Molecular Structure and Function",16.76537037,3.911305555603074 +"Structures and Building Systems",15.78250000,1.4182317241819407 +"Fluid, Particulate, and Hydraulic Systems",15.43750000,9.334819660458281 +Biophysics,12.69807348,7.9017703608261565 +"Emerging Technologies Initiation",12.67826389,0.43082354975761517 +Tectonics,8.59051583,0.027937647321332644 +"Solid-State and Microstructures",7.94699670,0.4591933087881705 +"Solid State Chemistry and Polymers",7.84637557,1.3319104362573686 +Seismology,7.02769444,2.431694700689441 +"Extragalactic Astronomy and Cosmology",5.98691667,0.9781127830854605 +"Computer and Computation Theory",5.04208333,1.9381499596292342 +"Geology and Paleontology",4.58416667,1.606624250847252 +"Global Atmospheric Research",4.51402778,3.1765790052054 +"Polar Ocean and Climate Systems",2.10733760,0.04730850999433886 +"Galactic Astronomy",1.61309706,0.3572919275210631 +"Mechanics and Materials",0.97173942,0.00025764463006399947 +"Polar Meteorology",0.88155664,0.09909785167735996 +Economics,0.81574879,0.33900408606509713 +"Physical Chemistry",0.55186616,0.0548134687339129 +Sociology,0.29997993,0.00460726351698731 +"Design, Tools, and Test",0.26055556,0 +"Systematic and Population Biology",0.18926081,0.027954377835160745 +Geophysics,0.08049603,0.022331879009996006 +"Law and Social Sciences",0.06500000,0 +"Decision, Risk, and Management Science",0.02840866,0.007661173777721356 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Year-reference.csv index 1ec25ce2c1..c2a4b06bb9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +"Statistics and Probability",52.69561728, +"Operations Research and Production Systems",49.85089556,1.1100595034642202 +"Volcanology and Mantle Geochemistry",48.00666667,0 +"Theoretical Physics",44.13648148,3.8863777173028686 +"Algebra and Number Theory",39.37916667,3.5074678840012607 +"Quantum Electronics, Waves, and Beams",37.79727273,4.7120666811720895 +"Metals, Ceramics, and Electronic Materials",36.49007937,2.407916402194818 +"Organic and Macromolecular Chemistry",26.34404444,6.8507338965077675 +"Design and Computer-Integrated Engineering",25.49490741, +"Systems Prototyping and Fabrication",25.48654262,0.09521527865289223 +"Polar Aeronomy and Astrophysics",25.17486111,17.80092216999551 +"Experimental Systems",24.23206456,3.046402847031802 +"Cell Biology",21.20474151,2.519140001248213 +"Stellar Astronomy and Astrophysics",18.55493056,4.578065909633193 +Arts,17.27322391,1.2812633375632778 +"Biochemistry and Molecular Structure and Function",16.76537037,3.911305555603074 +"Structures and Building Systems",15.78250000,1.4182317241819407 +"Fluid, Particulate, and Hydraulic Systems",15.43750000,9.334819660458281 +Biophysics,12.69807348,7.9017703608261565 +"Emerging Technologies Initiation",12.67826389,0.43082354975761517 +Tectonics,8.59051583,0.027937647321332644 +"Solid-State and Microstructures",7.94699670,0.4591933087881705 +"Solid State Chemistry and Polymers",7.84637557,1.3319104362573686 +Seismology,7.02769444,2.431694700689441 +"Extragalactic Astronomy and Cosmology",5.98691667,0.9781127830854605 +"Computer and Computation Theory",5.04208333,1.9381499596292342 +"Geology and Paleontology",4.58416667,1.606624250847252 +"Global Atmospheric Research",4.51402778,3.1765790052054 +"Polar Ocean and Climate Systems",2.10733760,0.04730850999433886 +"Galactic Astronomy",1.61309706,0.3572919275210631 +"Mechanics and Materials",0.97173942,0.00025764463006399947 +"Polar Meteorology",0.88155664,0.09909785167735996 +Economics,0.81574879,0.33900408606509713 +"Physical Chemistry",0.55186616,0.0548134687339129 +Sociology,0.29997993,0.00460726351698731 +"Design, Tools, and Test",0.26055556,0 +"Systematic and Population Biology",0.18926081,0.027954377835160745 +Geophysics,0.08049603,0.022331879009996006 +"Law and Social Sciences",0.06500000,0 +"Decision, Risk, and Management Science",0.02840866,0.007661173777721356 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Day-reference.csv index 1206cccb39..2678eba1ed 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wall Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,12.71865079 -2016-12-28,10.16476358 -2016-12-29,11.78420083 -2016-12-30,1.48544495 -2016-12-31,1.42967081 -2017-01-01,1.01283296 +Day,"[Statistics and Probability] Wall Hours: Per Job","[Operations Research and Production Systems] Wall Hours: Per Job","[Volcanology and Mantle Geochemistry] Wall Hours: Per Job","[Theoretical Physics] Wall Hours: Per Job","[Algebra and Number Theory] Wall Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wall Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wall Hours: Per Job","[Organic and Macromolecular Chemistry] Wall Hours: Per Job","[Design and Computer-Integrated Engineering] Wall Hours: Per Job","[Systems Prototyping and Fabrication] Wall Hours: Per Job","[Polar Aeronomy and Astrophysics] Wall Hours: Per Job","[Experimental Systems] Wall Hours: Per Job","[Cell Biology] Wall Hours: Per Job","[Stellar Astronomy and Astrophysics] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wall Hours: Per Job","[Structures and Building Systems] Wall Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Per Job","[Biophysics] Wall Hours: Per Job","[Emerging Technologies Initiation] Wall Hours: Per Job","[Tectonics] Wall Hours: Per Job","[Solid-State and Microstructures] Wall Hours: Per Job","[Solid State Chemistry and Polymers] Wall Hours: Per Job","[Seismology] Wall Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wall Hours: Per Job","[Computer and Computation Theory] Wall Hours: Per Job","[Geology and Paleontology] Wall Hours: Per Job","[Global Atmospheric Research] Wall Hours: Per Job","[Polar Ocean and Climate Systems] Wall Hours: Per Job","[Galactic Astronomy] Wall Hours: Per Job","[Mechanics and Materials] Wall Hours: Per Job","[Polar Meteorology] Wall Hours: Per Job","[Economics] Wall Hours: Per Job","[Physical Chemistry] Wall Hours: Per Job","[Sociology] Wall Hours: Per Job","[Design, Tools, and Test] Wall Hours: Per Job","[Systematic and Population Biology] Wall Hours: Per Job","[Geophysics] Wall Hours: Per Job","[Law and Social Sciences] Wall Hours: Per Job","[Decision, Risk, and Management Science] Wall Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16.74638889,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16.94166667,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,8.60361111,0,0,0,24.00000000,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,24.00000000,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,8.12694444,0,0,0,0,0,0 +2016-12-26,2.70416667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,0,0,24.00000000,0,0,0,24.00000000,0,0,0,0,0,0 +2016-12-27,20.78689815,0,0,0,0,12.98407407,0,0,0,0,0,0,13.96533333,20.66416667,0,19.90555556,0,0,13.89986111,0,0,0,20.49703704,0,0,0,0,0,0,8.71606481,0,0,0,8.23638889,3.21666667,0,0,0,0,0 +2016-12-28,9.90712418,13.35268330,4.70055556,5.03972222,3.11533951,15.23050000,0,17.86320988,0,5.01598392,0,8.78983333,17.63833333,18.38902778,0,24.00000000,0,0,24.00000000,0,0,0,14.10152778,0,0,0,0,0,0,24.00000000,0,0,0,19.32140278,24.00000000,0,0,0,0,0 +2016-12-29,23.89310847,16.60273286,24.00000000,24.00000000,24.00000000,23.40096618,11.55011905,24.00000000,0,13.10756221,18.97472222,10.54645833,7.73178763,18.61000000,4.34454545,24.00000000,3.66944444,0,24.00000000,6.36972222,0,3.62000000,14.25424444,10.40083333,0,2.01966667,0,6.48888889,0,7.81509259,0,0,0,11.06298354,1.17898003,0,0,0,0,1.92694444 +2016-12-30,18.94011905,21.71949405,19.30611111,15.09675926,14.55335859,18.93428571,21.78416667,16.65664530,0,13.31263065,12.00027778,13.41648148,7.32452206,11.90376984,9.68358547,11.72422222,10.28048611,9.78120370,24.00000000,7.97656250,4.25015531,16.84687500,4.10732350,13.60638889,3.48631944,4.10559722,1.45518519,2.51750000,0,0.80124024,0.97252976,1.58977533,0.48461111,0.27513871,0.34371670,0.26055556,0.14245370,0.08049603,0.06500000,0.03474935 +2016-12-31,23.17923611,10.83064379,0,0,24.00000000,11.12489583,22.09055556,4.88585470,16.61129630,12.53390738,7.37444444,10.97790404,14.97629630,8.30273148,15.93161523,1.92791667,7.33458333,16.96888889,8.03958333,10.17785714,5.54019436,7.28581633,1.97834003,6.47384921,7.65398148,8.63138889,4.84500000,0,0.19661458,5.00544444,0.97299603,1.07971065,1.49565171,0.32450010,0.38194742,0,0.14844444,0,0,0.01479010 +2017-01-01,11.20848700,13.34534574,0,0,5.04583333,3.01452778,0,0.22246528,8.88361111,11.50582962,0,8.59888889,17.62535714,6.25080247,6.53122222,0,0,0,2.25395062,6.95507937,0,17.62916667,0,0.47638889,0,0,4.28111111,0.02166667,2.11436355,11.62486111,0.96969246,0.02809588,0.30830000,1.46437811,0.06690347,0,0.22250400,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Month-reference.csv index 25f3a1eb9c..11a3fd075a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wall Hours: Per Job" -2016-12,1.97829913 -2017-01,1.01283296 +Month,"[Statistics and Probability] Wall Hours: Per Job","[Operations Research and Production Systems] Wall Hours: Per Job","[Volcanology and Mantle Geochemistry] Wall Hours: Per Job","[Theoretical Physics] Wall Hours: Per Job","[Algebra and Number Theory] Wall Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wall Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wall Hours: Per Job","[Organic and Macromolecular Chemistry] Wall Hours: Per Job","[Design and Computer-Integrated Engineering] Wall Hours: Per Job","[Systems Prototyping and Fabrication] Wall Hours: Per Job","[Polar Aeronomy and Astrophysics] Wall Hours: Per Job","[Experimental Systems] Wall Hours: Per Job","[Cell Biology] Wall Hours: Per Job","[Stellar Astronomy and Astrophysics] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wall Hours: Per Job","[Structures and Building Systems] Wall Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Per Job","[Biophysics] Wall Hours: Per Job","[Emerging Technologies Initiation] Wall Hours: Per Job","[Tectonics] Wall Hours: Per Job","[Solid-State and Microstructures] Wall Hours: Per Job","[Solid State Chemistry and Polymers] Wall Hours: Per Job","[Seismology] Wall Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wall Hours: Per Job","[Computer and Computation Theory] Wall Hours: Per Job","[Geology and Paleontology] Wall Hours: Per Job","[Global Atmospheric Research] Wall Hours: Per Job","[Polar Ocean and Climate Systems] Wall Hours: Per Job","[Galactic Astronomy] Wall Hours: Per Job","[Mechanics and Materials] Wall Hours: Per Job","[Polar Meteorology] Wall Hours: Per Job","[Economics] Wall Hours: Per Job","[Physical Chemistry] Wall Hours: Per Job","[Sociology] Wall Hours: Per Job","[Design, Tools, and Test] Wall Hours: Per Job","[Systematic and Population Biology] Wall Hours: Per Job","[Geophysics] Wall Hours: Per Job","[Law and Social Sciences] Wall Hours: Per Job","[Decision, Risk, and Management Science] Wall Hours: Per Job" +2016-12,42.94008230,48.78758939,48.00666667,44.13648148,38.92045455,50.08717014,36.49007937,38.63655229,16.61129630,23.01874399,25.17486111,26.76558429,19.49116512,20.98942593,16.77843434,16.76537037,15.78250000,15.43750000,55.46393519,12.84722222,8.59051583,7.77245050,7.84637557,8.66552083,5.98691667,5.04208333,4.68518519,9.00638889,0.19661458,1.58470254,0.97276290,1.45671498,1.05606884,0.49420671,0.37457084,0.26055556,0.14305278,0.08049603,0.06500000,0.02840866 +2017-01,11.20848700,13.34534574,0,0,5.04583333,3.01452778,0,0.22246528,8.88361111,11.50582962,0,8.59888889,17.62535714,6.25080247,6.53122222,0,0,0,2.25395062,6.95507937,0,17.62916667,0,0.47638889,0,0,4.28111111,0.02166667,2.11436355,11.62486111,0.96969246,0.02809588,0.30830000,1.46437811,0.06690347,0,0.22250400,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Quarter-reference.csv index 3763abc8ad..aeb1a6f80e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wall Hours: Per Job" -"2016 Q4",1.97829913 -"2017 Q1",1.01283296 +Quarter,"[Statistics and Probability] Wall Hours: Per Job","[Operations Research and Production Systems] Wall Hours: Per Job","[Volcanology and Mantle Geochemistry] Wall Hours: Per Job","[Theoretical Physics] Wall Hours: Per Job","[Algebra and Number Theory] Wall Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wall Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wall Hours: Per Job","[Organic and Macromolecular Chemistry] Wall Hours: Per Job","[Design and Computer-Integrated Engineering] Wall Hours: Per Job","[Systems Prototyping and Fabrication] Wall Hours: Per Job","[Polar Aeronomy and Astrophysics] Wall Hours: Per Job","[Experimental Systems] Wall Hours: Per Job","[Cell Biology] Wall Hours: Per Job","[Stellar Astronomy and Astrophysics] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wall Hours: Per Job","[Structures and Building Systems] Wall Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Per Job","[Biophysics] Wall Hours: Per Job","[Emerging Technologies Initiation] Wall Hours: Per Job","[Tectonics] Wall Hours: Per Job","[Solid-State and Microstructures] Wall Hours: Per Job","[Solid State Chemistry and Polymers] Wall Hours: Per Job","[Seismology] Wall Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wall Hours: Per Job","[Computer and Computation Theory] Wall Hours: Per Job","[Geology and Paleontology] Wall Hours: Per Job","[Global Atmospheric Research] Wall Hours: Per Job","[Polar Ocean and Climate Systems] Wall Hours: Per Job","[Galactic Astronomy] Wall Hours: Per Job","[Mechanics and Materials] Wall Hours: Per Job","[Polar Meteorology] Wall Hours: Per Job","[Economics] Wall Hours: Per Job","[Physical Chemistry] Wall Hours: Per Job","[Sociology] Wall Hours: Per Job","[Design, Tools, and Test] Wall Hours: Per Job","[Systematic and Population Biology] Wall Hours: Per Job","[Geophysics] Wall Hours: Per Job","[Law and Social Sciences] Wall Hours: Per Job","[Decision, Risk, and Management Science] Wall Hours: Per Job" +"2016 Q4",42.94008230,48.78758939,48.00666667,44.13648148,38.92045455,50.08717014,36.49007937,38.63655229,16.61129630,23.01874399,25.17486111,26.76558429,19.49116512,20.98942593,16.77843434,16.76537037,15.78250000,15.43750000,55.46393519,12.84722222,8.59051583,7.77245050,7.84637557,8.66552083,5.98691667,5.04208333,4.68518519,9.00638889,0.19661458,1.58470254,0.97276290,1.45671498,1.05606884,0.49420671,0.37457084,0.26055556,0.14305278,0.08049603,0.06500000,0.02840866 +"2017 Q1",11.20848700,13.34534574,0,0,5.04583333,3.01452778,0,0.22246528,8.88361111,11.50582962,0,8.59888889,17.62535714,6.25080247,6.53122222,0,0,0,2.25395062,6.95507937,0,17.62916667,0,0.47638889,0,0,4.28111111,0.02166667,2.11436355,11.62486111,0.96969246,0.02809588,0.30830000,1.46437811,0.06690347,0,0.22250400,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Year-reference.csv index 3f73baf1cc..519830b4c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/avg_wallduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wall Hours: Per Job" -2016,1.97829913 -2017,1.01283296 +Year,"[Statistics and Probability] Wall Hours: Per Job","[Operations Research and Production Systems] Wall Hours: Per Job","[Volcanology and Mantle Geochemistry] Wall Hours: Per Job","[Theoretical Physics] Wall Hours: Per Job","[Algebra and Number Theory] Wall Hours: Per Job","[Quantum Electronics, Waves, and Beams] Wall Hours: Per Job","[Metals, Ceramics, and Electronic Materials] Wall Hours: Per Job","[Organic and Macromolecular Chemistry] Wall Hours: Per Job","[Design and Computer-Integrated Engineering] Wall Hours: Per Job","[Systems Prototyping and Fabrication] Wall Hours: Per Job","[Polar Aeronomy and Astrophysics] Wall Hours: Per Job","[Experimental Systems] Wall Hours: Per Job","[Cell Biology] Wall Hours: Per Job","[Stellar Astronomy and Astrophysics] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Biochemistry and Molecular Structure and Function] Wall Hours: Per Job","[Structures and Building Systems] Wall Hours: Per Job","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Per Job","[Biophysics] Wall Hours: Per Job","[Emerging Technologies Initiation] Wall Hours: Per Job","[Tectonics] Wall Hours: Per Job","[Solid-State and Microstructures] Wall Hours: Per Job","[Solid State Chemistry and Polymers] Wall Hours: Per Job","[Seismology] Wall Hours: Per Job","[Extragalactic Astronomy and Cosmology] Wall Hours: Per Job","[Computer and Computation Theory] Wall Hours: Per Job","[Geology and Paleontology] Wall Hours: Per Job","[Global Atmospheric Research] Wall Hours: Per Job","[Polar Ocean and Climate Systems] Wall Hours: Per Job","[Galactic Astronomy] Wall Hours: Per Job","[Mechanics and Materials] Wall Hours: Per Job","[Polar Meteorology] Wall Hours: Per Job","[Economics] Wall Hours: Per Job","[Physical Chemistry] Wall Hours: Per Job","[Sociology] Wall Hours: Per Job","[Design, Tools, and Test] Wall Hours: Per Job","[Systematic and Population Biology] Wall Hours: Per Job","[Geophysics] Wall Hours: Per Job","[Law and Social Sciences] Wall Hours: Per Job","[Decision, Risk, and Management Science] Wall Hours: Per Job" +2016,42.94008230,48.78758939,48.00666667,44.13648148,38.92045455,50.08717014,36.49007937,38.63655229,16.61129630,23.01874399,25.17486111,26.76558429,19.49116512,20.98942593,16.77843434,16.76537037,15.78250000,15.43750000,55.46393519,12.84722222,8.59051583,7.77245050,7.84637557,8.66552083,5.98691667,5.04208333,4.68518519,9.00638889,0.19661458,1.58470254,0.97276290,1.45671498,1.05606884,0.49420671,0.37457084,0.26055556,0.14305278,0.08049603,0.06500000,0.02840866 +2017,11.20848700,13.34534574,0,0,5.04583333,3.01452778,0,0.22246528,8.88361111,11.50582962,0,8.59888889,17.62535714,6.25080247,6.53122222,0,0,0,2.25395062,6.95507937,0,17.62916667,0,0.47638889,0,0,4.28111111,0.02166667,2.11436355,11.62486111,0.96969246,0.02809588,0.30830000,1.46437811,0.06690347,0,0.22250400,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Day-reference.csv index 24dd6b6f8f..8b3fda3098 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","User Expansion Factor" -Unknown,3.1031 +"Galactic Astronomy",119.8923 +"Systematic and Population Biology",69.2703 +"Global Atmospheric Research",7.8723 +Sociology,7.6469 +"Decision, Risk, and Management Science",6.8756 +"Solid-State and Microstructures",4.3697 +"Cell Biology",4.3693 +"Solid State Chemistry and Polymers",3.8702 +"Polar Ocean and Climate Systems",3.5459 +"Quantum Electronics, Waves, and Beams",2.2702 +"Polar Aeronomy and Astrophysics",2.0475 +"Stellar Astronomy and Astrophysics",1.5228 +"Biochemistry and Molecular Structure and Function",1.4886 +Tectonics,1.4572 +Economics,1.4161 +"Design, Tools, and Test",1.3753 +"Fluid, Particulate, and Hydraulic Systems",1.3348 +Arts,1.2820 +"Emerging Technologies Initiation",1.1487 +"Algebra and Number Theory",1.1120 +"Physical Chemistry",1.1103 +"Polar Meteorology",1.0932 +"Design and Computer-Integrated Engineering",1.0844 +"Theoretical Physics",1.0844 +"Computer and Computation Theory",1.0642 +"Metals, Ceramics, and Electronic Materials",1.0545 +"Geology and Paleontology",1.0148 +Geophysics,1.0131 +"Statistics and Probability",1.0128 +"Experimental Systems",1.0086 +"Systems Prototyping and Fabrication",1.0081 +Seismology,1.0025 +"Extragalactic Astronomy and Cosmology",1.0024 +"Operations Research and Production Systems",1.0012 +Biophysics,1.0010 +"Mechanics and Materials",1.0001 +"Law and Social Sciences",1.0000 +"Organic and Macromolecular Chemistry",1.0000 +"Structures and Building Systems",1.0000 +"Volcanology and Mantle Geochemistry",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Month-reference.csv index 24dd6b6f8f..8b3fda3098 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","User Expansion Factor" -Unknown,3.1031 +"Galactic Astronomy",119.8923 +"Systematic and Population Biology",69.2703 +"Global Atmospheric Research",7.8723 +Sociology,7.6469 +"Decision, Risk, and Management Science",6.8756 +"Solid-State and Microstructures",4.3697 +"Cell Biology",4.3693 +"Solid State Chemistry and Polymers",3.8702 +"Polar Ocean and Climate Systems",3.5459 +"Quantum Electronics, Waves, and Beams",2.2702 +"Polar Aeronomy and Astrophysics",2.0475 +"Stellar Astronomy and Astrophysics",1.5228 +"Biochemistry and Molecular Structure and Function",1.4886 +Tectonics,1.4572 +Economics,1.4161 +"Design, Tools, and Test",1.3753 +"Fluid, Particulate, and Hydraulic Systems",1.3348 +Arts,1.2820 +"Emerging Technologies Initiation",1.1487 +"Algebra and Number Theory",1.1120 +"Physical Chemistry",1.1103 +"Polar Meteorology",1.0932 +"Design and Computer-Integrated Engineering",1.0844 +"Theoretical Physics",1.0844 +"Computer and Computation Theory",1.0642 +"Metals, Ceramics, and Electronic Materials",1.0545 +"Geology and Paleontology",1.0148 +Geophysics,1.0131 +"Statistics and Probability",1.0128 +"Experimental Systems",1.0086 +"Systems Prototyping and Fabrication",1.0081 +Seismology,1.0025 +"Extragalactic Astronomy and Cosmology",1.0024 +"Operations Research and Production Systems",1.0012 +Biophysics,1.0010 +"Mechanics and Materials",1.0001 +"Law and Social Sciences",1.0000 +"Organic and Macromolecular Chemistry",1.0000 +"Structures and Building Systems",1.0000 +"Volcanology and Mantle Geochemistry",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Quarter-reference.csv index 24dd6b6f8f..8b3fda3098 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","User Expansion Factor" -Unknown,3.1031 +"Galactic Astronomy",119.8923 +"Systematic and Population Biology",69.2703 +"Global Atmospheric Research",7.8723 +Sociology,7.6469 +"Decision, Risk, and Management Science",6.8756 +"Solid-State and Microstructures",4.3697 +"Cell Biology",4.3693 +"Solid State Chemistry and Polymers",3.8702 +"Polar Ocean and Climate Systems",3.5459 +"Quantum Electronics, Waves, and Beams",2.2702 +"Polar Aeronomy and Astrophysics",2.0475 +"Stellar Astronomy and Astrophysics",1.5228 +"Biochemistry and Molecular Structure and Function",1.4886 +Tectonics,1.4572 +Economics,1.4161 +"Design, Tools, and Test",1.3753 +"Fluid, Particulate, and Hydraulic Systems",1.3348 +Arts,1.2820 +"Emerging Technologies Initiation",1.1487 +"Algebra and Number Theory",1.1120 +"Physical Chemistry",1.1103 +"Polar Meteorology",1.0932 +"Design and Computer-Integrated Engineering",1.0844 +"Theoretical Physics",1.0844 +"Computer and Computation Theory",1.0642 +"Metals, Ceramics, and Electronic Materials",1.0545 +"Geology and Paleontology",1.0148 +Geophysics,1.0131 +"Statistics and Probability",1.0128 +"Experimental Systems",1.0086 +"Systems Prototyping and Fabrication",1.0081 +Seismology,1.0025 +"Extragalactic Astronomy and Cosmology",1.0024 +"Operations Research and Production Systems",1.0012 +Biophysics,1.0010 +"Mechanics and Materials",1.0001 +"Law and Social Sciences",1.0000 +"Organic and Macromolecular Chemistry",1.0000 +"Structures and Building Systems",1.0000 +"Volcanology and Mantle Geochemistry",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Year-reference.csv index 24dd6b6f8f..8b3fda3098 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","User Expansion Factor" -Unknown,3.1031 +"Galactic Astronomy",119.8923 +"Systematic and Population Biology",69.2703 +"Global Atmospheric Research",7.8723 +Sociology,7.6469 +"Decision, Risk, and Management Science",6.8756 +"Solid-State and Microstructures",4.3697 +"Cell Biology",4.3693 +"Solid State Chemistry and Polymers",3.8702 +"Polar Ocean and Climate Systems",3.5459 +"Quantum Electronics, Waves, and Beams",2.2702 +"Polar Aeronomy and Astrophysics",2.0475 +"Stellar Astronomy and Astrophysics",1.5228 +"Biochemistry and Molecular Structure and Function",1.4886 +Tectonics,1.4572 +Economics,1.4161 +"Design, Tools, and Test",1.3753 +"Fluid, Particulate, and Hydraulic Systems",1.3348 +Arts,1.2820 +"Emerging Technologies Initiation",1.1487 +"Algebra and Number Theory",1.1120 +"Physical Chemistry",1.1103 +"Polar Meteorology",1.0932 +"Design and Computer-Integrated Engineering",1.0844 +"Theoretical Physics",1.0844 +"Computer and Computation Theory",1.0642 +"Metals, Ceramics, and Electronic Materials",1.0545 +"Geology and Paleontology",1.0148 +Geophysics,1.0131 +"Statistics and Probability",1.0128 +"Experimental Systems",1.0086 +"Systems Prototyping and Fabrication",1.0081 +Seismology,1.0025 +"Extragalactic Astronomy and Cosmology",1.0024 +"Operations Research and Production Systems",1.0012 +Biophysics,1.0010 +"Mechanics and Materials",1.0001 +"Law and Social Sciences",1.0000 +"Organic and Macromolecular Chemistry",1.0000 +"Structures and Building Systems",1.0000 +"Volcanology and Mantle Geochemistry",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Day-reference.csv index 07432bae8e..b2c303c331 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] User Expansion Factor" -2016-12-22,1.0249 -2016-12-23,1.0302 -2016-12-24,1.0368 -2016-12-25,1.0813 -2016-12-26,1.1760 -2016-12-27,2.0450 -2016-12-28,1.5085 -2016-12-29,1.3802 -2016-12-30,4.9345 -2016-12-31,2.5839 -2017-01-01,2.7546 +Day,"[Galactic Astronomy] User Expansion Factor","[Systematic and Population Biology] User Expansion Factor","[Global Atmospheric Research] User Expansion Factor","[Sociology] User Expansion Factor","[Decision, Risk, and Management Science] User Expansion Factor","[Solid-State and Microstructures] User Expansion Factor","[Cell Biology] User Expansion Factor","[Solid State Chemistry and Polymers] User Expansion Factor","[Polar Ocean and Climate Systems] User Expansion Factor","[Quantum Electronics, Waves, and Beams] User Expansion Factor","[Polar Aeronomy and Astrophysics] User Expansion Factor","[Stellar Astronomy and Astrophysics] User Expansion Factor","[Biochemistry and Molecular Structure and Function] User Expansion Factor","[Tectonics] User Expansion Factor","[Economics] User Expansion Factor","[Design, Tools, and Test] User Expansion Factor","[Fluid, Particulate, and Hydraulic Systems] User Expansion Factor","[Arts] User Expansion Factor","[Emerging Technologies Initiation] User Expansion Factor","[Algebra and Number Theory] User Expansion Factor","[Physical Chemistry] User Expansion Factor","[Polar Meteorology] User Expansion Factor","[Design and Computer-Integrated Engineering] User Expansion Factor","[Theoretical Physics] User Expansion Factor","[Computer and Computation Theory] User Expansion Factor","[Metals, Ceramics, and Electronic Materials] User Expansion Factor","[Geology and Paleontology] User Expansion Factor","[Geophysics] User Expansion Factor","[Statistics and Probability] User Expansion Factor","[Experimental Systems] User Expansion Factor","[Systems Prototyping and Fabrication] User Expansion Factor","[Seismology] User Expansion Factor","[Extragalactic Astronomy and Cosmology] User Expansion Factor","[Operations Research and Production Systems] User Expansion Factor","[Biophysics] User Expansion Factor","[Mechanics and Materials] User Expansion Factor","[Law and Social Sciences] User Expansion Factor","[Organic and Macromolecular Chemistry] User Expansion Factor","[Structures and Building Systems] User Expansion Factor","[Volcanology and Mantle Geochemistry] User Expansion Factor" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0495,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0000,0,0,0,0,0 +2016-12-23,1.0610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0495,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0000,0,0,0,0,0 +2016-12-24,1.0610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0495,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0000,0,0,0,0,0 +2016-12-25,1.0610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.1562,0,0,0,0,0,0,0,0,0,0,0,0,0,1.0000,0,0,0,0,0 +2016-12-26,1.0610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.2735,0,0,0,0,0,0,0,1.0000,0,0,0,0,0,1.0000,0,0,0,0,0 +2016-12-27,1.0280,0,0,1.0000,0,0,4.9152,1.9856,0,2.5533,0,2.0864,1.7260,0,0,0,0,0,0,0,1.2277,0,0,0,0,0,0,0,1.0000,0,0,0,0,0,1.0000,0,0,0,0,0 +2016-12-28,1.0102,0,0,1.0000,0,0,4.8768,2.1159,0,2.5716,0,1.8919,1.7260,0,0,0,0,0,0,1.1095,1.0845,0,0,1.0866,0,0,0,0,1.0021,1.0107,1.0010,0,0,1.0013,1.0000,0,0,1.0000,0,1.0000 +2016-12-29,7.2405,0,3.8567,3.7347,1.0394,1.0001,3.0140,2.7029,0,2.3072,1.0000,1.6613,1.7260,0,0,0,0,1.0436,1.2430,1.1207,1.1039,0,0,1.0866,1.0011,1.0379,0,0,1.0217,1.0095,1.0011,1.0000,0,1.0011,1.0000,0,0,1.0000,1.0000,1.0000 +2016-12-30,244.8450,82.2879,3.8567,5.1450,5.9358,1.8025,2.9767,5.5485,0,2.2649,3.1975,1.5996,1.4078,1.1806,2.1933,1.3753,1.4992,1.4225,1.1539,1.1173,1.0974,1.1123,0,1.0801,1.0787,1.0500,1.0094,1.0131,1.0277,1.0076,1.0022,1.0000,1.0041,1.0011,1.0000,1.0001,1.0000,1.0000,1.0000,1.0000 +2016-12-31,1.4459,30.3841,0,8.2387,38.4517,4.7123,7.3737,13.7412,1.0162,1.9038,1.0000,1.2381,1.2386,1.6099,1.2202,0,1.1213,1.1163,1.0513,1.0205,1.1361,1.0199,1.0760,0,1.0006,1.1462,1.0172,0,1.0100,1.0119,1.0187,1.0039,1.0018,1.0012,1.0000,1.0001,0,1.0000,1.0000,0 +2017-01-01,4.1617,66.3373,1677.0769,21.4660,0,1.0001,9.8468,0,3.5509,1.9022,0,1.1298,0,0,1.0524,0,0,1.1040,1.2473,1.0205,1.0606,1.0037,1.1002,0,0,0,1.0001,0,1.0058,1.0029,1.0088,1.0000,0,1.0013,1.0061,1.0002,0,1.0006,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Month-reference.csv index 55dc5db7b3..eecc5f8709 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] User Expansion Factor" -2016-12,3.1481 -2017-01,2.7546 +Month,"[Galactic Astronomy] User Expansion Factor","[Systematic and Population Biology] User Expansion Factor","[Global Atmospheric Research] User Expansion Factor","[Sociology] User Expansion Factor","[Decision, Risk, and Management Science] User Expansion Factor","[Solid-State and Microstructures] User Expansion Factor","[Cell Biology] User Expansion Factor","[Solid State Chemistry and Polymers] User Expansion Factor","[Polar Ocean and Climate Systems] User Expansion Factor","[Quantum Electronics, Waves, and Beams] User Expansion Factor","[Polar Aeronomy and Astrophysics] User Expansion Factor","[Stellar Astronomy and Astrophysics] User Expansion Factor","[Biochemistry and Molecular Structure and Function] User Expansion Factor","[Tectonics] User Expansion Factor","[Economics] User Expansion Factor","[Design, Tools, and Test] User Expansion Factor","[Fluid, Particulate, and Hydraulic Systems] User Expansion Factor","[Arts] User Expansion Factor","[Emerging Technologies Initiation] User Expansion Factor","[Algebra and Number Theory] User Expansion Factor","[Physical Chemistry] User Expansion Factor","[Polar Meteorology] User Expansion Factor","[Design and Computer-Integrated Engineering] User Expansion Factor","[Theoretical Physics] User Expansion Factor","[Computer and Computation Theory] User Expansion Factor","[Metals, Ceramics, and Electronic Materials] User Expansion Factor","[Geology and Paleontology] User Expansion Factor","[Geophysics] User Expansion Factor","[Statistics and Probability] User Expansion Factor","[Experimental Systems] User Expansion Factor","[Systems Prototyping and Fabrication] User Expansion Factor","[Seismology] User Expansion Factor","[Extragalactic Astronomy and Cosmology] User Expansion Factor","[Operations Research and Production Systems] User Expansion Factor","[Biophysics] User Expansion Factor","[Mechanics and Materials] User Expansion Factor","[Law and Social Sciences] User Expansion Factor","[Organic and Macromolecular Chemistry] User Expansion Factor","[Structures and Building Systems] User Expansion Factor","[Volcanology and Mantle Geochemistry] User Expansion Factor" +2016-12,121.8812,73.4926,3.8567,6.8195,6.8756,4.4454,3.8878,3.8702,1.0162,2.2773,2.0475,1.5839,1.4886,1.4572,1.4765,1.3753,1.3348,1.2872,1.1175,1.1131,1.1171,1.0944,1.0760,1.0844,1.0642,1.0545,1.0160,1.0131,1.0144,1.0095,1.0080,1.0025,1.0024,1.0011,1.0000,1.0001,1.0000,1.0000,1.0000,1.0000 +2017-01,4.1617,66.3373,1677.0769,21.4660,0,1.0001,9.8468,0,3.5509,1.9022,0,1.1298,0,0,1.0524,0,0,1.1040,1.2473,1.0205,1.0606,1.0037,1.1002,0,0,0,1.0001,0,1.0058,1.0029,1.0088,1.0000,0,1.0013,1.0061,1.0002,0,1.0006,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Quarter-reference.csv index de643f7b3e..7a2f5ec2c0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] User Expansion Factor" -"2016 Q4",3.1481 -"2017 Q1",2.7546 +Quarter,"[Galactic Astronomy] User Expansion Factor","[Systematic and Population Biology] User Expansion Factor","[Global Atmospheric Research] User Expansion Factor","[Sociology] User Expansion Factor","[Decision, Risk, and Management Science] User Expansion Factor","[Solid-State and Microstructures] User Expansion Factor","[Cell Biology] User Expansion Factor","[Solid State Chemistry and Polymers] User Expansion Factor","[Polar Ocean and Climate Systems] User Expansion Factor","[Quantum Electronics, Waves, and Beams] User Expansion Factor","[Polar Aeronomy and Astrophysics] User Expansion Factor","[Stellar Astronomy and Astrophysics] User Expansion Factor","[Biochemistry and Molecular Structure and Function] User Expansion Factor","[Tectonics] User Expansion Factor","[Economics] User Expansion Factor","[Design, Tools, and Test] User Expansion Factor","[Fluid, Particulate, and Hydraulic Systems] User Expansion Factor","[Arts] User Expansion Factor","[Emerging Technologies Initiation] User Expansion Factor","[Algebra and Number Theory] User Expansion Factor","[Physical Chemistry] User Expansion Factor","[Polar Meteorology] User Expansion Factor","[Design and Computer-Integrated Engineering] User Expansion Factor","[Theoretical Physics] User Expansion Factor","[Computer and Computation Theory] User Expansion Factor","[Metals, Ceramics, and Electronic Materials] User Expansion Factor","[Geology and Paleontology] User Expansion Factor","[Geophysics] User Expansion Factor","[Statistics and Probability] User Expansion Factor","[Experimental Systems] User Expansion Factor","[Systems Prototyping and Fabrication] User Expansion Factor","[Seismology] User Expansion Factor","[Extragalactic Astronomy and Cosmology] User Expansion Factor","[Operations Research and Production Systems] User Expansion Factor","[Biophysics] User Expansion Factor","[Mechanics and Materials] User Expansion Factor","[Law and Social Sciences] User Expansion Factor","[Organic and Macromolecular Chemistry] User Expansion Factor","[Structures and Building Systems] User Expansion Factor","[Volcanology and Mantle Geochemistry] User Expansion Factor" +"2016 Q4",121.8812,73.4926,3.8567,6.8195,6.8756,4.4454,3.8878,3.8702,1.0162,2.2773,2.0475,1.5839,1.4886,1.4572,1.4765,1.3753,1.3348,1.2872,1.1175,1.1131,1.1171,1.0944,1.0760,1.0844,1.0642,1.0545,1.0160,1.0131,1.0144,1.0095,1.0080,1.0025,1.0024,1.0011,1.0000,1.0001,1.0000,1.0000,1.0000,1.0000 +"2017 Q1",4.1617,66.3373,1677.0769,21.4660,0,1.0001,9.8468,0,3.5509,1.9022,0,1.1298,0,0,1.0524,0,0,1.1040,1.2473,1.0205,1.0606,1.0037,1.1002,0,0,0,1.0001,0,1.0058,1.0029,1.0088,1.0000,0,1.0013,1.0061,1.0002,0,1.0006,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Year-reference.csv index f2163ebfaa..69f3edaf63 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/expansion_factor/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] User Expansion Factor" -2016,3.1481 -2017,2.7546 +Year,"[Galactic Astronomy] User Expansion Factor","[Systematic and Population Biology] User Expansion Factor","[Global Atmospheric Research] User Expansion Factor","[Sociology] User Expansion Factor","[Decision, Risk, and Management Science] User Expansion Factor","[Solid-State and Microstructures] User Expansion Factor","[Cell Biology] User Expansion Factor","[Solid State Chemistry and Polymers] User Expansion Factor","[Polar Ocean and Climate Systems] User Expansion Factor","[Quantum Electronics, Waves, and Beams] User Expansion Factor","[Polar Aeronomy and Astrophysics] User Expansion Factor","[Stellar Astronomy and Astrophysics] User Expansion Factor","[Biochemistry and Molecular Structure and Function] User Expansion Factor","[Tectonics] User Expansion Factor","[Economics] User Expansion Factor","[Design, Tools, and Test] User Expansion Factor","[Fluid, Particulate, and Hydraulic Systems] User Expansion Factor","[Arts] User Expansion Factor","[Emerging Technologies Initiation] User Expansion Factor","[Algebra and Number Theory] User Expansion Factor","[Physical Chemistry] User Expansion Factor","[Polar Meteorology] User Expansion Factor","[Design and Computer-Integrated Engineering] User Expansion Factor","[Theoretical Physics] User Expansion Factor","[Computer and Computation Theory] User Expansion Factor","[Metals, Ceramics, and Electronic Materials] User Expansion Factor","[Geology and Paleontology] User Expansion Factor","[Geophysics] User Expansion Factor","[Statistics and Probability] User Expansion Factor","[Experimental Systems] User Expansion Factor","[Systems Prototyping and Fabrication] User Expansion Factor","[Seismology] User Expansion Factor","[Extragalactic Astronomy and Cosmology] User Expansion Factor","[Operations Research and Production Systems] User Expansion Factor","[Biophysics] User Expansion Factor","[Mechanics and Materials] User Expansion Factor","[Law and Social Sciences] User Expansion Factor","[Organic and Macromolecular Chemistry] User Expansion Factor","[Structures and Building Systems] User Expansion Factor","[Volcanology and Mantle Geochemistry] User Expansion Factor" +2016,121.8812,73.4926,3.8567,6.8195,6.8756,4.4454,3.8878,3.8702,1.0162,2.2773,2.0475,1.5839,1.4886,1.4572,1.4765,1.3753,1.3348,1.2872,1.1175,1.1131,1.1171,1.0944,1.0760,1.0844,1.0642,1.0545,1.0160,1.0131,1.0144,1.0095,1.0080,1.0025,1.0024,1.0011,1.0000,1.0001,1.0000,1.0000,1.0000,1.0000 +2017,4.1617,66.3373,1677.0769,21.4660,0,1.0001,9.8468,0,3.5509,1.9022,0,1.1298,0,0,1.0524,0,0,1.1040,1.2473,1.0205,1.0606,1.0037,1.1002,0,0,0,1.0001,0,1.0058,1.0029,1.0088,1.0000,0,1.0013,1.0061,1.0002,0,1.0006,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Day-reference.csv index 3371cac74e..59464b9877 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Ended" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Month-reference.csv index 3371cac74e..59464b9877 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Ended" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Quarter-reference.csv index 3371cac74e..59464b9877 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Ended" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Year-reference.csv index 3371cac74e..59464b9877 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Ended" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Day-reference.csv index 0dacae21c6..0382aae0fe 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Ended" -2016-12-22,0 -2016-12-23,0 -2016-12-24,0 -2016-12-25,0 -2016-12-26,0 -2016-12-27,0 -2016-12-28,0 -2016-12-29,0 -2016-12-30,26606 -2016-12-31,28141 -2017-01-01,16566 +Day,"[Sociology] Number of Jobs Ended","[Physical Chemistry] Number of Jobs Ended","[Decision, Risk, and Management Science] Number of Jobs Ended","[Systems Prototyping and Fabrication] Number of Jobs Ended","[Tectonics] Number of Jobs Ended","[Galactic Astronomy] Number of Jobs Ended","[Polar Ocean and Climate Systems] Number of Jobs Ended","[Operations Research and Production Systems] Number of Jobs Ended","[Systematic and Population Biology] Number of Jobs Ended","[Polar Meteorology] Number of Jobs Ended","[Solid State Chemistry and Polymers] Number of Jobs Ended","[Solid-State and Microstructures] Number of Jobs Ended","[Mechanics and Materials] Number of Jobs Ended","[Cell Biology] Number of Jobs Ended","[Economics] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Statistics and Probability] Number of Jobs Ended","[Quantum Electronics, Waves, and Beams] Number of Jobs Ended","[Experimental Systems] Number of Jobs Ended","[Biophysics] Number of Jobs Ended","[Organic and Macromolecular Chemistry] Number of Jobs Ended","[Computer and Computation Theory] Number of Jobs Ended","[Stellar Astronomy and Astrophysics] Number of Jobs Ended","[Emerging Technologies Initiation] Number of Jobs Ended","[Biochemistry and Molecular Structure and Function] Number of Jobs Ended","[Geophysics] Number of Jobs Ended","[Algebra and Number Theory] Number of Jobs Ended","[Extragalactic Astronomy and Cosmology] Number of Jobs Ended","[Seismology] Number of Jobs Ended","[Design and Computer-Integrated Engineering] Number of Jobs Ended","[Structures and Building Systems] Number of Jobs Ended","[Metals, Ceramics, and Electronic Materials] Number of Jobs Ended","[Geology and Paleontology] Number of Jobs Ended","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Ended","[Theoretical Physics] Number of Jobs Ended","[Global Atmospheric Research] Number of Jobs Ended","[Polar Aeronomy and Astrophysics] Number of Jobs Ended","[Design, Tools, and Test] Number of Jobs Ended","[Law and Social Sciences] Number of Jobs Ended","[Volcanology and Mantle Geochemistry] Number of Jobs Ended" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-30,19044,3823,1700,788,1,732,0,34,90,68,63,3,28,60,20,39,6,8,7,0,4,19,3,5,11,14,10,4,1,0,4,6,1,2,3,1,1,1,1,1 +2016-12-31,22026,2719,933,869,999,29,4,180,10,24,83,97,28,5,24,22,1,16,16,4,13,1,8,4,4,0,0,6,7,0,4,1,2,1,0,0,1,0,0,0 +2017-01-01,13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Month-reference.csv index 6abac1f2c2..b916df7881 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Ended" -2016-12,54747 -2017-01,16566 +Month,"[Sociology] Number of Jobs Ended","[Physical Chemistry] Number of Jobs Ended","[Decision, Risk, and Management Science] Number of Jobs Ended","[Systems Prototyping and Fabrication] Number of Jobs Ended","[Tectonics] Number of Jobs Ended","[Galactic Astronomy] Number of Jobs Ended","[Polar Ocean and Climate Systems] Number of Jobs Ended","[Operations Research and Production Systems] Number of Jobs Ended","[Systematic and Population Biology] Number of Jobs Ended","[Polar Meteorology] Number of Jobs Ended","[Solid State Chemistry and Polymers] Number of Jobs Ended","[Solid-State and Microstructures] Number of Jobs Ended","[Mechanics and Materials] Number of Jobs Ended","[Cell Biology] Number of Jobs Ended","[Economics] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Statistics and Probability] Number of Jobs Ended","[Quantum Electronics, Waves, and Beams] Number of Jobs Ended","[Experimental Systems] Number of Jobs Ended","[Biophysics] Number of Jobs Ended","[Organic and Macromolecular Chemistry] Number of Jobs Ended","[Computer and Computation Theory] Number of Jobs Ended","[Stellar Astronomy and Astrophysics] Number of Jobs Ended","[Emerging Technologies Initiation] Number of Jobs Ended","[Biochemistry and Molecular Structure and Function] Number of Jobs Ended","[Geophysics] Number of Jobs Ended","[Algebra and Number Theory] Number of Jobs Ended","[Extragalactic Astronomy and Cosmology] Number of Jobs Ended","[Seismology] Number of Jobs Ended","[Design and Computer-Integrated Engineering] Number of Jobs Ended","[Structures and Building Systems] Number of Jobs Ended","[Metals, Ceramics, and Electronic Materials] Number of Jobs Ended","[Geology and Paleontology] Number of Jobs Ended","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Ended","[Theoretical Physics] Number of Jobs Ended","[Global Atmospheric Research] Number of Jobs Ended","[Polar Aeronomy and Astrophysics] Number of Jobs Ended","[Design, Tools, and Test] Number of Jobs Ended","[Law and Social Sciences] Number of Jobs Ended","[Volcanology and Mantle Geochemistry] Number of Jobs Ended" +2016-12,41070,6542,2633,1657,1000,761,4,214,100,92,146,100,56,65,44,61,7,24,23,4,17,20,11,9,15,14,10,10,8,0,8,7,3,3,3,1,2,1,1,1 +2017-01,13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Quarter-reference.csv index 3fc38fd4a7..ae53ebaa4a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Ended" -"2016 Q4",54747 -"2017 Q1",16566 +Quarter,"[Sociology] Number of Jobs Ended","[Physical Chemistry] Number of Jobs Ended","[Decision, Risk, and Management Science] Number of Jobs Ended","[Systems Prototyping and Fabrication] Number of Jobs Ended","[Tectonics] Number of Jobs Ended","[Galactic Astronomy] Number of Jobs Ended","[Polar Ocean and Climate Systems] Number of Jobs Ended","[Operations Research and Production Systems] Number of Jobs Ended","[Systematic and Population Biology] Number of Jobs Ended","[Polar Meteorology] Number of Jobs Ended","[Solid State Chemistry and Polymers] Number of Jobs Ended","[Solid-State and Microstructures] Number of Jobs Ended","[Mechanics and Materials] Number of Jobs Ended","[Cell Biology] Number of Jobs Ended","[Economics] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Statistics and Probability] Number of Jobs Ended","[Quantum Electronics, Waves, and Beams] Number of Jobs Ended","[Experimental Systems] Number of Jobs Ended","[Biophysics] Number of Jobs Ended","[Organic and Macromolecular Chemistry] Number of Jobs Ended","[Computer and Computation Theory] Number of Jobs Ended","[Stellar Astronomy and Astrophysics] Number of Jobs Ended","[Emerging Technologies Initiation] Number of Jobs Ended","[Biochemistry and Molecular Structure and Function] Number of Jobs Ended","[Geophysics] Number of Jobs Ended","[Algebra and Number Theory] Number of Jobs Ended","[Extragalactic Astronomy and Cosmology] Number of Jobs Ended","[Seismology] Number of Jobs Ended","[Design and Computer-Integrated Engineering] Number of Jobs Ended","[Structures and Building Systems] Number of Jobs Ended","[Metals, Ceramics, and Electronic Materials] Number of Jobs Ended","[Geology and Paleontology] Number of Jobs Ended","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Ended","[Theoretical Physics] Number of Jobs Ended","[Global Atmospheric Research] Number of Jobs Ended","[Polar Aeronomy and Astrophysics] Number of Jobs Ended","[Design, Tools, and Test] Number of Jobs Ended","[Law and Social Sciences] Number of Jobs Ended","[Volcanology and Mantle Geochemistry] Number of Jobs Ended" +"2016 Q4",41070,6542,2633,1657,1000,761,4,214,100,92,146,100,56,65,44,61,7,24,23,4,17,20,11,9,15,14,10,10,8,0,8,7,3,3,3,1,2,1,1,1 +"2017 Q1",13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Year-reference.csv index 534eb71a3b..cd4df7eea6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Ended" -2016,54747 -2017,16566 +Year,"[Sociology] Number of Jobs Ended","[Physical Chemistry] Number of Jobs Ended","[Decision, Risk, and Management Science] Number of Jobs Ended","[Systems Prototyping and Fabrication] Number of Jobs Ended","[Tectonics] Number of Jobs Ended","[Galactic Astronomy] Number of Jobs Ended","[Polar Ocean and Climate Systems] Number of Jobs Ended","[Operations Research and Production Systems] Number of Jobs Ended","[Systematic and Population Biology] Number of Jobs Ended","[Polar Meteorology] Number of Jobs Ended","[Solid State Chemistry and Polymers] Number of Jobs Ended","[Solid-State and Microstructures] Number of Jobs Ended","[Mechanics and Materials] Number of Jobs Ended","[Cell Biology] Number of Jobs Ended","[Economics] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Statistics and Probability] Number of Jobs Ended","[Quantum Electronics, Waves, and Beams] Number of Jobs Ended","[Experimental Systems] Number of Jobs Ended","[Biophysics] Number of Jobs Ended","[Organic and Macromolecular Chemistry] Number of Jobs Ended","[Computer and Computation Theory] Number of Jobs Ended","[Stellar Astronomy and Astrophysics] Number of Jobs Ended","[Emerging Technologies Initiation] Number of Jobs Ended","[Biochemistry and Molecular Structure and Function] Number of Jobs Ended","[Geophysics] Number of Jobs Ended","[Algebra and Number Theory] Number of Jobs Ended","[Extragalactic Astronomy and Cosmology] Number of Jobs Ended","[Seismology] Number of Jobs Ended","[Design and Computer-Integrated Engineering] Number of Jobs Ended","[Structures and Building Systems] Number of Jobs Ended","[Metals, Ceramics, and Electronic Materials] Number of Jobs Ended","[Geology and Paleontology] Number of Jobs Ended","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Ended","[Theoretical Physics] Number of Jobs Ended","[Global Atmospheric Research] Number of Jobs Ended","[Polar Aeronomy and Astrophysics] Number of Jobs Ended","[Design, Tools, and Test] Number of Jobs Ended","[Law and Social Sciences] Number of Jobs Ended","[Volcanology and Mantle Geochemistry] Number of Jobs Ended" +2016,41070,6542,2633,1657,1000,761,4,214,100,92,146,100,56,65,44,61,7,24,23,4,17,20,11,9,15,14,10,10,8,0,8,7,3,3,3,1,2,1,1,1 +2017,13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Day-reference.csv index d3c3c20125..4e254f1104 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Max (Core Count)" -Unknown,336 +"Fluid, Particulate, and Hydraulic Systems",336 +"Organic and Macromolecular Chemistry",192 +"Systematic and Population Biology",192 +"Global Atmospheric Research",160 +"Solid State Chemistry and Polymers",144 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Physical Chemistry",96 +"Quantum Electronics, Waves, and Beams",96 +"Metals, Ceramics, and Electronic Materials",72 +"Stellar Astronomy and Astrophysics",72 +Biophysics,64 +"Galactic Astronomy",64 +"Geology and Paleontology",60 +"Decision, Risk, and Management Science",56 +Economics,48 +"Polar Aeronomy and Astrophysics",40 +"Cell Biology",32 +"Design and Computer-Integrated Engineering",24 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Law and Social Sciences",16 +"Statistics and Probability",16 +"Algebra and Number Theory",12 +Arts,12 +"Biochemistry and Molecular Structure and Function",12 +"Experimental Systems",12 +"Polar Ocean and Climate Systems",12 +Seismology,12 +Sociology,12 +"Solid-State and Microstructures",12 +"Theoretical Physics",12 +"Computer and Computation Theory",1 +"Extragalactic Astronomy and Cosmology",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Month-reference.csv index d3c3c20125..4e254f1104 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Max (Core Count)" -Unknown,336 +"Fluid, Particulate, and Hydraulic Systems",336 +"Organic and Macromolecular Chemistry",192 +"Systematic and Population Biology",192 +"Global Atmospheric Research",160 +"Solid State Chemistry and Polymers",144 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Physical Chemistry",96 +"Quantum Electronics, Waves, and Beams",96 +"Metals, Ceramics, and Electronic Materials",72 +"Stellar Astronomy and Astrophysics",72 +Biophysics,64 +"Galactic Astronomy",64 +"Geology and Paleontology",60 +"Decision, Risk, and Management Science",56 +Economics,48 +"Polar Aeronomy and Astrophysics",40 +"Cell Biology",32 +"Design and Computer-Integrated Engineering",24 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Law and Social Sciences",16 +"Statistics and Probability",16 +"Algebra and Number Theory",12 +Arts,12 +"Biochemistry and Molecular Structure and Function",12 +"Experimental Systems",12 +"Polar Ocean and Climate Systems",12 +Seismology,12 +Sociology,12 +"Solid-State and Microstructures",12 +"Theoretical Physics",12 +"Computer and Computation Theory",1 +"Extragalactic Astronomy and Cosmology",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Quarter-reference.csv index d3c3c20125..4e254f1104 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Max (Core Count)" -Unknown,336 +"Fluid, Particulate, and Hydraulic Systems",336 +"Organic and Macromolecular Chemistry",192 +"Systematic and Population Biology",192 +"Global Atmospheric Research",160 +"Solid State Chemistry and Polymers",144 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Physical Chemistry",96 +"Quantum Electronics, Waves, and Beams",96 +"Metals, Ceramics, and Electronic Materials",72 +"Stellar Astronomy and Astrophysics",72 +Biophysics,64 +"Galactic Astronomy",64 +"Geology and Paleontology",60 +"Decision, Risk, and Management Science",56 +Economics,48 +"Polar Aeronomy and Astrophysics",40 +"Cell Biology",32 +"Design and Computer-Integrated Engineering",24 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Law and Social Sciences",16 +"Statistics and Probability",16 +"Algebra and Number Theory",12 +Arts,12 +"Biochemistry and Molecular Structure and Function",12 +"Experimental Systems",12 +"Polar Ocean and Climate Systems",12 +Seismology,12 +Sociology,12 +"Solid-State and Microstructures",12 +"Theoretical Physics",12 +"Computer and Computation Theory",1 +"Extragalactic Astronomy and Cosmology",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Year-reference.csv index d3c3c20125..4e254f1104 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Max (Core Count)" -Unknown,336 +"Fluid, Particulate, and Hydraulic Systems",336 +"Organic and Macromolecular Chemistry",192 +"Systematic and Population Biology",192 +"Global Atmospheric Research",160 +"Solid State Chemistry and Polymers",144 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Physical Chemistry",96 +"Quantum Electronics, Waves, and Beams",96 +"Metals, Ceramics, and Electronic Materials",72 +"Stellar Astronomy and Astrophysics",72 +Biophysics,64 +"Galactic Astronomy",64 +"Geology and Paleontology",60 +"Decision, Risk, and Management Science",56 +Economics,48 +"Polar Aeronomy and Astrophysics",40 +"Cell Biology",32 +"Design and Computer-Integrated Engineering",24 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Law and Social Sciences",16 +"Statistics and Probability",16 +"Algebra and Number Theory",12 +Arts,12 +"Biochemistry and Molecular Structure and Function",12 +"Experimental Systems",12 +"Polar Ocean and Climate Systems",12 +Seismology,12 +Sociology,12 +"Solid-State and Microstructures",12 +"Theoretical Physics",12 +"Computer and Computation Theory",1 +"Extragalactic Astronomy and Cosmology",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Day-reference.csv index b39a1fa4f1..57d5dfe7ba 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Max (Core Count)" -2016-12-22,12 -2016-12-23,12 -2016-12-24,12 -2016-12-25,24 -2016-12-26,24 -2016-12-27,144 -2016-12-28,192 -2016-12-29,192 -2016-12-30,336 -2016-12-31,336 -2017-01-01,192 +Day,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Max (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Max (Core Count)","[Systematic and Population Biology] Job Size: Max (Core Count)","[Global Atmospheric Research] Job Size: Max (Core Count)","[Solid State Chemistry and Polymers] Job Size: Max (Core Count)","[Structures and Building Systems] Job Size: Max (Core Count)","[Design, Tools, and Test] Job Size: Max (Core Count)","[Emerging Technologies Initiation] Job Size: Max (Core Count)","[Physical Chemistry] Job Size: Max (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Max (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Max (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Max (Core Count)","[Biophysics] Job Size: Max (Core Count)","[Galactic Astronomy] Job Size: Max (Core Count)","[Geology and Paleontology] Job Size: Max (Core Count)","[Decision, Risk, and Management Science] Job Size: Max (Core Count)","[Economics] Job Size: Max (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Max (Core Count)","[Cell Biology] Job Size: Max (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Max (Core Count)","[Geophysics] Job Size: Max (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Max (Core Count)","[Law and Social Sciences] Job Size: Max (Core Count)","[Statistics and Probability] Job Size: Max (Core Count)","[Algebra and Number Theory] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Max (Core Count)","[Experimental Systems] Job Size: Max (Core Count)","[Polar Ocean and Climate Systems] Job Size: Max (Core Count)","[Seismology] Job Size: Max (Core Count)","[Sociology] Job Size: Max (Core Count)","[Solid-State and Microstructures] Job Size: Max (Core Count)","[Theoretical Physics] Job Size: Max (Core Count)","[Computer and Computation Theory] Job Size: Max (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Max (Core Count)","[Mechanics and Materials] Job Size: Max (Core Count)","[Operations Research and Production Systems] Job Size: Max (Core Count)","[Polar Meteorology] Job Size: Max (Core Count)","[Systems Prototyping and Fabrication] Job Size: Max (Core Count)","[Tectonics] Job Size: Max (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,12,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,12,0,0,0,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,12,0,0,0,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,24,0,0,0,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,24,0,0,0,12,1,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,144,0,0,0,32,96,0,72,64,16,0,0,0,0,8,0,0,0,0,16,0,0,12,0,0,0,1,0,0,0,0,0,0,0,0,0 +2016-12-28,0,192,0,0,144,0,0,0,32,96,0,72,64,16,0,0,0,0,8,0,0,20,0,16,12,0,12,8,0,0,1,0,12,0,0,0,1,0,1,0 +2016-12-29,0,192,0,160,144,112,0,96,32,96,72,72,64,64,0,56,0,40,8,0,0,20,0,16,12,12,12,8,0,5,12,2,12,1,0,0,1,0,1,0 +2016-12-30,336,192,192,160,144,112,108,96,96,96,72,72,64,64,60,56,48,40,32,0,20,20,16,16,12,12,12,12,0,5,12,12,12,1,1,1,1,1,1,1 +2016-12-31,336,192,192,0,20,112,0,96,96,96,72,72,64,64,60,1,48,40,8,24,0,0,0,16,12,12,1,12,12,12,12,2,0,1,1,1,1,1,1,1 +2017-01-01,0,32,192,160,0,0,0,96,48,96,0,72,64,16,5,0,48,0,8,24,0,0,0,16,12,12,0,8,12,12,12,2,0,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Month-reference.csv index d7ce102d74..db2acd75f7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Max (Core Count)" -2016-12,336 -2017-01,192 +Month,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Max (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Max (Core Count)","[Systematic and Population Biology] Job Size: Max (Core Count)","[Global Atmospheric Research] Job Size: Max (Core Count)","[Solid State Chemistry and Polymers] Job Size: Max (Core Count)","[Structures and Building Systems] Job Size: Max (Core Count)","[Design, Tools, and Test] Job Size: Max (Core Count)","[Emerging Technologies Initiation] Job Size: Max (Core Count)","[Physical Chemistry] Job Size: Max (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Max (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Max (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Max (Core Count)","[Biophysics] Job Size: Max (Core Count)","[Galactic Astronomy] Job Size: Max (Core Count)","[Geology and Paleontology] Job Size: Max (Core Count)","[Decision, Risk, and Management Science] Job Size: Max (Core Count)","[Economics] Job Size: Max (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Max (Core Count)","[Cell Biology] Job Size: Max (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Max (Core Count)","[Geophysics] Job Size: Max (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Max (Core Count)","[Law and Social Sciences] Job Size: Max (Core Count)","[Statistics and Probability] Job Size: Max (Core Count)","[Algebra and Number Theory] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Max (Core Count)","[Experimental Systems] Job Size: Max (Core Count)","[Polar Ocean and Climate Systems] Job Size: Max (Core Count)","[Seismology] Job Size: Max (Core Count)","[Sociology] Job Size: Max (Core Count)","[Solid-State and Microstructures] Job Size: Max (Core Count)","[Theoretical Physics] Job Size: Max (Core Count)","[Computer and Computation Theory] Job Size: Max (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Max (Core Count)","[Mechanics and Materials] Job Size: Max (Core Count)","[Operations Research and Production Systems] Job Size: Max (Core Count)","[Polar Meteorology] Job Size: Max (Core Count)","[Systems Prototyping and Fabrication] Job Size: Max (Core Count)","[Tectonics] Job Size: Max (Core Count)" +2016-12,336,192,192,160,144,112,108,96,96,96,72,72,64,64,60,56,48,40,32,24,20,20,16,16,12,12,12,12,12,12,12,12,12,1,1,1,1,1,1,1 +2017-01,0,32,192,160,0,0,0,96,48,96,0,72,64,16,5,0,48,0,8,24,0,0,0,16,12,12,0,8,12,12,12,2,0,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Quarter-reference.csv index 6eeef0df3a..77c072a4f2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Max (Core Count)" -"2016 Q4",336 -"2017 Q1",192 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Max (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Max (Core Count)","[Systematic and Population Biology] Job Size: Max (Core Count)","[Global Atmospheric Research] Job Size: Max (Core Count)","[Solid State Chemistry and Polymers] Job Size: Max (Core Count)","[Structures and Building Systems] Job Size: Max (Core Count)","[Design, Tools, and Test] Job Size: Max (Core Count)","[Emerging Technologies Initiation] Job Size: Max (Core Count)","[Physical Chemistry] Job Size: Max (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Max (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Max (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Max (Core Count)","[Biophysics] Job Size: Max (Core Count)","[Galactic Astronomy] Job Size: Max (Core Count)","[Geology and Paleontology] Job Size: Max (Core Count)","[Decision, Risk, and Management Science] Job Size: Max (Core Count)","[Economics] Job Size: Max (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Max (Core Count)","[Cell Biology] Job Size: Max (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Max (Core Count)","[Geophysics] Job Size: Max (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Max (Core Count)","[Law and Social Sciences] Job Size: Max (Core Count)","[Statistics and Probability] Job Size: Max (Core Count)","[Algebra and Number Theory] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Max (Core Count)","[Experimental Systems] Job Size: Max (Core Count)","[Polar Ocean and Climate Systems] Job Size: Max (Core Count)","[Seismology] Job Size: Max (Core Count)","[Sociology] Job Size: Max (Core Count)","[Solid-State and Microstructures] Job Size: Max (Core Count)","[Theoretical Physics] Job Size: Max (Core Count)","[Computer and Computation Theory] Job Size: Max (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Max (Core Count)","[Mechanics and Materials] Job Size: Max (Core Count)","[Operations Research and Production Systems] Job Size: Max (Core Count)","[Polar Meteorology] Job Size: Max (Core Count)","[Systems Prototyping and Fabrication] Job Size: Max (Core Count)","[Tectonics] Job Size: Max (Core Count)" +"2016 Q4",336,192,192,160,144,112,108,96,96,96,72,72,64,64,60,56,48,40,32,24,20,20,16,16,12,12,12,12,12,12,12,12,12,1,1,1,1,1,1,1 +"2017 Q1",0,32,192,160,0,0,0,96,48,96,0,72,64,16,5,0,48,0,8,24,0,0,0,16,12,12,0,8,12,12,12,2,0,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Year-reference.csv index 24589fdada..24284d7dc8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/max_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Max (Core Count)" -2016,336 -2017,192 +Year,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Max (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Max (Core Count)","[Systematic and Population Biology] Job Size: Max (Core Count)","[Global Atmospheric Research] Job Size: Max (Core Count)","[Solid State Chemistry and Polymers] Job Size: Max (Core Count)","[Structures and Building Systems] Job Size: Max (Core Count)","[Design, Tools, and Test] Job Size: Max (Core Count)","[Emerging Technologies Initiation] Job Size: Max (Core Count)","[Physical Chemistry] Job Size: Max (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Max (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Max (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Max (Core Count)","[Biophysics] Job Size: Max (Core Count)","[Galactic Astronomy] Job Size: Max (Core Count)","[Geology and Paleontology] Job Size: Max (Core Count)","[Decision, Risk, and Management Science] Job Size: Max (Core Count)","[Economics] Job Size: Max (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Max (Core Count)","[Cell Biology] Job Size: Max (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Max (Core Count)","[Geophysics] Job Size: Max (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Max (Core Count)","[Law and Social Sciences] Job Size: Max (Core Count)","[Statistics and Probability] Job Size: Max (Core Count)","[Algebra and Number Theory] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Max (Core Count)","[Experimental Systems] Job Size: Max (Core Count)","[Polar Ocean and Climate Systems] Job Size: Max (Core Count)","[Seismology] Job Size: Max (Core Count)","[Sociology] Job Size: Max (Core Count)","[Solid-State and Microstructures] Job Size: Max (Core Count)","[Theoretical Physics] Job Size: Max (Core Count)","[Computer and Computation Theory] Job Size: Max (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Max (Core Count)","[Mechanics and Materials] Job Size: Max (Core Count)","[Operations Research and Production Systems] Job Size: Max (Core Count)","[Polar Meteorology] Job Size: Max (Core Count)","[Systems Prototyping and Fabrication] Job Size: Max (Core Count)","[Tectonics] Job Size: Max (Core Count)" +2016,336,192,192,160,144,112,108,96,96,96,72,72,64,64,60,56,48,40,32,24,20,20,16,16,12,12,12,12,12,12,12,12,12,1,1,1,1,1,1,1 +2017,0,32,192,160,0,0,0,96,48,96,0,72,64,16,5,0,48,0,8,24,0,0,0,16,12,12,0,8,12,12,12,2,0,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Day-reference.csv index 1ae7c34f2e..a8651adb87 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Min (Core Count)" -Unknown,1 +"Global Atmospheric Research",160 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Metals, Ceramics, and Electronic Materials",72 +"Fluid, Particulate, and Hydraulic Systems",48 +"Stellar Astronomy and Astrophysics",36 +"Organic and Macromolecular Chemistry",32 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Design and Computer-Integrated Engineering",16 +"Law and Social Sciences",16 +"Polar Aeronomy and Astrophysics",16 +"Algebra and Number Theory",12 +"Polar Ocean and Climate Systems",12 +"Solid State Chemistry and Polymers",12 +"Theoretical Physics",12 +"Experimental Systems",8 +"Physical Chemistry",8 +"Systematic and Population Biology",8 +"Geology and Paleontology",5 +Seismology,5 +"Solid-State and Microstructures",2 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +Economics,1 +"Extragalactic Astronomy and Cosmology",1 +"Galactic Astronomy",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Quantum Electronics, Waves, and Beams",1 +Sociology,1 +"Statistics and Probability",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Month-reference.csv index 1ae7c34f2e..a8651adb87 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Min (Core Count)" -Unknown,1 +"Global Atmospheric Research",160 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Metals, Ceramics, and Electronic Materials",72 +"Fluid, Particulate, and Hydraulic Systems",48 +"Stellar Astronomy and Astrophysics",36 +"Organic and Macromolecular Chemistry",32 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Design and Computer-Integrated Engineering",16 +"Law and Social Sciences",16 +"Polar Aeronomy and Astrophysics",16 +"Algebra and Number Theory",12 +"Polar Ocean and Climate Systems",12 +"Solid State Chemistry and Polymers",12 +"Theoretical Physics",12 +"Experimental Systems",8 +"Physical Chemistry",8 +"Systematic and Population Biology",8 +"Geology and Paleontology",5 +Seismology,5 +"Solid-State and Microstructures",2 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +Economics,1 +"Extragalactic Astronomy and Cosmology",1 +"Galactic Astronomy",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Quantum Electronics, Waves, and Beams",1 +Sociology,1 +"Statistics and Probability",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Quarter-reference.csv index 1ae7c34f2e..a8651adb87 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Min (Core Count)" -Unknown,1 +"Global Atmospheric Research",160 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Metals, Ceramics, and Electronic Materials",72 +"Fluid, Particulate, and Hydraulic Systems",48 +"Stellar Astronomy and Astrophysics",36 +"Organic and Macromolecular Chemistry",32 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Design and Computer-Integrated Engineering",16 +"Law and Social Sciences",16 +"Polar Aeronomy and Astrophysics",16 +"Algebra and Number Theory",12 +"Polar Ocean and Climate Systems",12 +"Solid State Chemistry and Polymers",12 +"Theoretical Physics",12 +"Experimental Systems",8 +"Physical Chemistry",8 +"Systematic and Population Biology",8 +"Geology and Paleontology",5 +Seismology,5 +"Solid-State and Microstructures",2 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +Economics,1 +"Extragalactic Astronomy and Cosmology",1 +"Galactic Astronomy",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Quantum Electronics, Waves, and Beams",1 +Sociology,1 +"Statistics and Probability",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Year-reference.csv index 1ae7c34f2e..a8651adb87 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Job Size: Min (Core Count)" -Unknown,1 +"Global Atmospheric Research",160 +"Structures and Building Systems",112 +"Design, Tools, and Test",108 +"Emerging Technologies Initiation",96 +"Metals, Ceramics, and Electronic Materials",72 +"Fluid, Particulate, and Hydraulic Systems",48 +"Stellar Astronomy and Astrophysics",36 +"Organic and Macromolecular Chemistry",32 +Geophysics,20 +"Volcanology and Mantle Geochemistry",20 +"Design and Computer-Integrated Engineering",16 +"Law and Social Sciences",16 +"Polar Aeronomy and Astrophysics",16 +"Algebra and Number Theory",12 +"Polar Ocean and Climate Systems",12 +"Solid State Chemistry and Polymers",12 +"Theoretical Physics",12 +"Experimental Systems",8 +"Physical Chemistry",8 +"Systematic and Population Biology",8 +"Geology and Paleontology",5 +Seismology,5 +"Solid-State and Microstructures",2 +Arts,1 +"Biochemistry and Molecular Structure and Function",1 +Biophysics,1 +"Cell Biology",1 +"Computer and Computation Theory",1 +"Decision, Risk, and Management Science",1 +Economics,1 +"Extragalactic Astronomy and Cosmology",1 +"Galactic Astronomy",1 +"Mechanics and Materials",1 +"Operations Research and Production Systems",1 +"Polar Meteorology",1 +"Quantum Electronics, Waves, and Beams",1 +Sociology,1 +"Statistics and Probability",1 +"Systems Prototyping and Fabrication",1 +Tectonics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Day-reference.csv index 4583f71c32..3ab754cb2a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Min (Core Count)" -2016-12-22,12 -2016-12-23,1 -2016-12-24,1 -2016-12-25,1 -2016-12-26,1 -2016-12-27,1 -2016-12-28,1 -2016-12-29,1 -2016-12-30,1 -2016-12-31,1 -2017-01-01,1 +Day,"[Global Atmospheric Research] Job Size: Min (Core Count)","[Structures and Building Systems] Job Size: Min (Core Count)","[Design, Tools, and Test] Job Size: Min (Core Count)","[Emerging Technologies Initiation] Job Size: Min (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Min (Core Count)","[Fluid, Particulate, and Hydraulic Systems] Job Size: Min (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Min (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Min (Core Count)","[Geophysics] Job Size: Min (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Min (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Min (Core Count)","[Law and Social Sciences] Job Size: Min (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Min (Core Count)","[Algebra and Number Theory] Job Size: Min (Core Count)","[Polar Ocean and Climate Systems] Job Size: Min (Core Count)","[Solid State Chemistry and Polymers] Job Size: Min (Core Count)","[Theoretical Physics] Job Size: Min (Core Count)","[Experimental Systems] Job Size: Min (Core Count)","[Physical Chemistry] Job Size: Min (Core Count)","[Systematic and Population Biology] Job Size: Min (Core Count)","[Geology and Paleontology] Job Size: Min (Core Count)","[Seismology] Job Size: Min (Core Count)","[Solid-State and Microstructures] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Min (Core Count)","[Biophysics] Job Size: Min (Core Count)","[Cell Biology] Job Size: Min (Core Count)","[Computer and Computation Theory] Job Size: Min (Core Count)","[Decision, Risk, and Management Science] Job Size: Min (Core Count)","[Economics] Job Size: Min (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Min (Core Count)","[Galactic Astronomy] Job Size: Min (Core Count)","[Mechanics and Materials] Job Size: Min (Core Count)","[Operations Research and Production Systems] Job Size: Min (Core Count)","[Polar Meteorology] Job Size: Min (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Min (Core Count)","[Sociology] Job Size: Min (Core Count)","[Statistics and Probability] Job Size: Min (Core Count)","[Systems Prototyping and Fabrication] Job Size: Min (Core Count)","[Tectonics] Job Size: Min (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,12,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,12,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,12,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,12,0,0,0,0,0,1,0,0,0,0,0,16,0,0 +2016-12-27,0,0,0,0,0,0,72,0,0,0,0,0,0,0,0,32,0,0,8,0,0,0,0,0,12,12,8,0,0,0,0,1,0,0,0,96,1,1,0,0 +2016-12-28,0,0,0,0,0,0,48,112,0,20,0,0,0,12,0,12,12,8,8,0,0,0,0,0,12,12,8,0,0,0,0,1,0,1,0,96,1,1,1,0 +2016-12-29,160,112,0,96,72,0,48,112,0,20,0,0,40,12,0,12,12,8,8,0,0,5,2,4,12,12,1,1,56,0,0,1,0,1,0,1,1,1,1,0 +2016-12-30,160,112,108,96,72,48,48,32,20,20,0,16,16,12,0,12,12,8,8,8,5,5,2,1,1,12,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2016-12-31,0,112,0,96,72,336,36,64,0,0,16,0,40,12,12,12,0,8,8,12,5,8,2,1,1,8,8,1,1,12,1,1,1,1,1,1,1,1,1,1 +2017-01-01,160,0,0,96,0,0,36,32,0,0,16,0,0,12,12,0,0,8,8,8,5,12,2,4,0,1,8,0,0,12,0,1,1,1,1,8,1,8,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Month-reference.csv index 457fc3f108..cec71756a9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Min (Core Count)" -2016-12,1 -2017-01,1 +Month,"[Global Atmospheric Research] Job Size: Min (Core Count)","[Structures and Building Systems] Job Size: Min (Core Count)","[Design, Tools, and Test] Job Size: Min (Core Count)","[Emerging Technologies Initiation] Job Size: Min (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Min (Core Count)","[Fluid, Particulate, and Hydraulic Systems] Job Size: Min (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Min (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Min (Core Count)","[Geophysics] Job Size: Min (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Min (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Min (Core Count)","[Law and Social Sciences] Job Size: Min (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Min (Core Count)","[Algebra and Number Theory] Job Size: Min (Core Count)","[Polar Ocean and Climate Systems] Job Size: Min (Core Count)","[Solid State Chemistry and Polymers] Job Size: Min (Core Count)","[Theoretical Physics] Job Size: Min (Core Count)","[Experimental Systems] Job Size: Min (Core Count)","[Physical Chemistry] Job Size: Min (Core Count)","[Systematic and Population Biology] Job Size: Min (Core Count)","[Geology and Paleontology] Job Size: Min (Core Count)","[Seismology] Job Size: Min (Core Count)","[Solid-State and Microstructures] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Min (Core Count)","[Biophysics] Job Size: Min (Core Count)","[Cell Biology] Job Size: Min (Core Count)","[Computer and Computation Theory] Job Size: Min (Core Count)","[Decision, Risk, and Management Science] Job Size: Min (Core Count)","[Economics] Job Size: Min (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Min (Core Count)","[Galactic Astronomy] Job Size: Min (Core Count)","[Mechanics and Materials] Job Size: Min (Core Count)","[Operations Research and Production Systems] Job Size: Min (Core Count)","[Polar Meteorology] Job Size: Min (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Min (Core Count)","[Sociology] Job Size: Min (Core Count)","[Statistics and Probability] Job Size: Min (Core Count)","[Systems Prototyping and Fabrication] Job Size: Min (Core Count)","[Tectonics] Job Size: Min (Core Count)" +2016-12,160,112,108,96,72,48,36,32,20,20,16,16,16,12,12,12,12,8,8,8,5,5,2,1,1,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017-01,160,0,0,96,0,0,36,32,0,0,16,0,0,12,12,0,0,8,8,8,5,12,2,4,0,1,8,0,0,12,0,1,1,1,1,8,1,8,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Quarter-reference.csv index 2aaf419f5f..03768010e4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Min (Core Count)" -"2016 Q4",1 -"2017 Q1",1 +Quarter,"[Global Atmospheric Research] Job Size: Min (Core Count)","[Structures and Building Systems] Job Size: Min (Core Count)","[Design, Tools, and Test] Job Size: Min (Core Count)","[Emerging Technologies Initiation] Job Size: Min (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Min (Core Count)","[Fluid, Particulate, and Hydraulic Systems] Job Size: Min (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Min (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Min (Core Count)","[Geophysics] Job Size: Min (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Min (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Min (Core Count)","[Law and Social Sciences] Job Size: Min (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Min (Core Count)","[Algebra and Number Theory] Job Size: Min (Core Count)","[Polar Ocean and Climate Systems] Job Size: Min (Core Count)","[Solid State Chemistry and Polymers] Job Size: Min (Core Count)","[Theoretical Physics] Job Size: Min (Core Count)","[Experimental Systems] Job Size: Min (Core Count)","[Physical Chemistry] Job Size: Min (Core Count)","[Systematic and Population Biology] Job Size: Min (Core Count)","[Geology and Paleontology] Job Size: Min (Core Count)","[Seismology] Job Size: Min (Core Count)","[Solid-State and Microstructures] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Min (Core Count)","[Biophysics] Job Size: Min (Core Count)","[Cell Biology] Job Size: Min (Core Count)","[Computer and Computation Theory] Job Size: Min (Core Count)","[Decision, Risk, and Management Science] Job Size: Min (Core Count)","[Economics] Job Size: Min (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Min (Core Count)","[Galactic Astronomy] Job Size: Min (Core Count)","[Mechanics and Materials] Job Size: Min (Core Count)","[Operations Research and Production Systems] Job Size: Min (Core Count)","[Polar Meteorology] Job Size: Min (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Min (Core Count)","[Sociology] Job Size: Min (Core Count)","[Statistics and Probability] Job Size: Min (Core Count)","[Systems Prototyping and Fabrication] Job Size: Min (Core Count)","[Tectonics] Job Size: Min (Core Count)" +"2016 Q4",160,112,108,96,72,48,36,32,20,20,16,16,16,12,12,12,12,8,8,8,5,5,2,1,1,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +"2017 Q1",160,0,0,96,0,0,36,32,0,0,16,0,0,12,12,0,0,8,8,8,5,12,2,4,0,1,8,0,0,12,0,1,1,1,1,8,1,8,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Year-reference.csv index 7f40f6821c..b7267b1fd9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/min_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Min (Core Count)" -2016,1 -2017,1 +Year,"[Global Atmospheric Research] Job Size: Min (Core Count)","[Structures and Building Systems] Job Size: Min (Core Count)","[Design, Tools, and Test] Job Size: Min (Core Count)","[Emerging Technologies Initiation] Job Size: Min (Core Count)","[Metals, Ceramics, and Electronic Materials] Job Size: Min (Core Count)","[Fluid, Particulate, and Hydraulic Systems] Job Size: Min (Core Count)","[Stellar Astronomy and Astrophysics] Job Size: Min (Core Count)","[Organic and Macromolecular Chemistry] Job Size: Min (Core Count)","[Geophysics] Job Size: Min (Core Count)","[Volcanology and Mantle Geochemistry] Job Size: Min (Core Count)","[Design and Computer-Integrated Engineering] Job Size: Min (Core Count)","[Law and Social Sciences] Job Size: Min (Core Count)","[Polar Aeronomy and Astrophysics] Job Size: Min (Core Count)","[Algebra and Number Theory] Job Size: Min (Core Count)","[Polar Ocean and Climate Systems] Job Size: Min (Core Count)","[Solid State Chemistry and Polymers] Job Size: Min (Core Count)","[Theoretical Physics] Job Size: Min (Core Count)","[Experimental Systems] Job Size: Min (Core Count)","[Physical Chemistry] Job Size: Min (Core Count)","[Systematic and Population Biology] Job Size: Min (Core Count)","[Geology and Paleontology] Job Size: Min (Core Count)","[Seismology] Job Size: Min (Core Count)","[Solid-State and Microstructures] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Biochemistry and Molecular Structure and Function] Job Size: Min (Core Count)","[Biophysics] Job Size: Min (Core Count)","[Cell Biology] Job Size: Min (Core Count)","[Computer and Computation Theory] Job Size: Min (Core Count)","[Decision, Risk, and Management Science] Job Size: Min (Core Count)","[Economics] Job Size: Min (Core Count)","[Extragalactic Astronomy and Cosmology] Job Size: Min (Core Count)","[Galactic Astronomy] Job Size: Min (Core Count)","[Mechanics and Materials] Job Size: Min (Core Count)","[Operations Research and Production Systems] Job Size: Min (Core Count)","[Polar Meteorology] Job Size: Min (Core Count)","[Quantum Electronics, Waves, and Beams] Job Size: Min (Core Count)","[Sociology] Job Size: Min (Core Count)","[Statistics and Probability] Job Size: Min (Core Count)","[Systems Prototyping and Fabrication] Job Size: Min (Core Count)","[Tectonics] Job Size: Min (Core Count)" +2016,160,112,108,96,72,48,36,32,20,20,16,16,16,12,12,12,12,8,8,8,5,5,2,1,1,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2017,160,0,0,96,0,0,36,32,0,0,16,0,0,12,12,0,0,8,8,8,5,12,2,4,0,1,8,0,0,12,0,1,1,1,1,8,1,8,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Day-reference.csv index 03e287280f..fe4b5aedfc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12-22,0.150000000 -2016-12-23,0.104166667 -2016-12-24,0.104166667 -2016-12-25,0.177083333 -2016-12-26,0.125000000 -2016-12-27,0.145119048 -2016-12-28,0.057822222 -2016-12-29,0.034318966 -2016-12-30,0.040081442 -2016-12-31,0.043928656 -2017-01-01,0.045663105 +Day,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.450000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0.400000000,0,0,0,0,0.450000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,0,1.800000000,0,2.400000000,0,0,0,0,0,0,0.950000000,0,0,0,0,0,1.733333333,0.168750000,0,0,0.200000000,0.300000000,0.321428571,0.025000000,0.168750000,0,0,0,0,0,0,0,0,0 +2016-12-28,0,0,0,0,0,0,4.577777778,1.500000000,0,2.400000000,0,0,0,0,0.500000000,0,0.950000000,0,0.300000000,0.300000000,0,0.200000000,0.433333333,0.188970588,0,0,0.200000000,0.300000000,0.332500000,0.025000000,0.168750000,0,0,0,0,0,0.025000000,0,0.025000000,0 +2016-12-29,0,4.000000000,2.800000000,0,2.400000000,1.800000000,4.577777778,1.500000000,0,2.296739130,0,0,0,0,0.500000000,1.000000000,0.950000000,0,0.300000000,0.300000000,0.125000000,0.200000000,0.225333333,0.191071429,0,0.140909091,0.058870968,0.300000000,0.149382716,0.058544922,0.078472222,0.050000000,1.400000000,0.025000000,0,0,0.025000000,0,0.025000000,0 +2016-12-30,5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.769230769,1.542857143,1.101111111,0.974107143,0.616250000,0.583333333,0,0.500000000,0.500000000,0.350000000,0.950000000,0.400000000,0.300000000,0.300000000,0.125000000,0.225000000,0.167708333,0.191071429,0,0.140000000,0.069852941,0.043333333,0.068990239,0.045443743,0.035292793,0.118750000,0.026617647,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2016-12-31,8.400000000,0,2.800000000,0,2.400000000,1.800000000,1.830769231,1.325000000,2.310000000,0.976041667,0.611538462,0.812500000,0.577777778,0,0,1.000000000,0.750000000,0,0.300000000,0,0.285714286,0.250000000,0.205421687,0.258854167,0.300000000,0.136111111,0.200000000,0.025000000,0.068637470,0.049394653,0.207500000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2017-01-01,0,4.000000000,0,0,2.400000000,0,0.800000000,1.233333333,0.947482014,0.662500000,0.600000000,0.125000000,0.577777778,0,0,0,0.204629630,0,0.300000000,0,0.300000000,0.200000000,0,0.263829787,0.150000000,0.130000000,0.200000000,0,0.086733002,0.045675831,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Month-reference.csv index 448dd06706..65c55c788a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12,0.042694764 -2017-01,0.045663105 +Month,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +2016-12,5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.380000000,1.541176471,1.222000000,0.871484375,0.613586957,0.577777778,0.500000000,0.500000000,0.583333333,0.400000000,0.350000000,0.750000000,0.300000000,0.300000000,0.265625000,0.237931034,0.157762557,0.300000000,0.138636364,0.133796296,0.077083333,0.068459546,0.047571583,0.043333333,0.035334646,0.028712871,0.026044436,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2017-01,0,4.000000000,0,0,2.400000000,0,1.233333333,0.800000000,0.947482014,0.662500000,0.600000000,0.577777778,0,0,0.125000000,0,0,0.204629630,0.300000000,0,0.300000000,0.200000000,0,0.150000000,0.130000000,0.263829787,0.200000000,0.086733002,0.045675831,0,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Quarter-reference.csv index 0cd0e77394..9abeab4e7f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Normalized (% of Total Cores)" -"2016 Q4",0.042694764 -"2017 Q1",0.045663105 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +"2016 Q4",5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.380000000,1.541176471,1.222000000,0.871484375,0.613586957,0.577777778,0.500000000,0.500000000,0.583333333,0.400000000,0.350000000,0.750000000,0.300000000,0.300000000,0.265625000,0.237931034,0.157762557,0.300000000,0.138636364,0.133796296,0.077083333,0.068459546,0.047571583,0.043333333,0.035334646,0.028712871,0.026044436,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +"2017 Q1",0,4.000000000,0,0,2.400000000,0,1.233333333,0.800000000,0.947482014,0.662500000,0.600000000,0.577777778,0,0,0.125000000,0,0,0.204629630,0.300000000,0,0.300000000,0.200000000,0,0.150000000,0.130000000,0.263829787,0.200000000,0.086733002,0.045675831,0,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Year-reference.csv index 5fe84412fa..052c88bbb4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016,0.042694764 -2017,0.045663105 +Year,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +2016,5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.380000000,1.541176471,1.222000000,0.871484375,0.613586957,0.577777778,0.500000000,0.500000000,0.583333333,0.400000000,0.350000000,0.750000000,0.300000000,0.300000000,0.265625000,0.237931034,0.157762557,0.300000000,0.138636364,0.133796296,0.077083333,0.068459546,0.047571583,0.043333333,0.035334646,0.028712871,0.026044436,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2017,0,4.000000000,0,0,2.400000000,0,1.233333333,0.800000000,0.947482014,0.662500000,0.600000000,0.577777778,0,0,0.125000000,0,0,0.204629630,0.300000000,0,0.300000000,0.200000000,0,0.150000000,0.130000000,0.263829787,0.200000000,0.086733002,0.045675831,0,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Day-reference.csv index 03e287280f..fe4b5aedfc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12-22,0.150000000 -2016-12-23,0.104166667 -2016-12-24,0.104166667 -2016-12-25,0.177083333 -2016-12-26,0.125000000 -2016-12-27,0.145119048 -2016-12-28,0.057822222 -2016-12-29,0.034318966 -2016-12-30,0.040081442 -2016-12-31,0.043928656 -2017-01-01,0.045663105 +Day,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0,0,0,0.450000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0.400000000,0,0,0,0,0.450000000,0,0.025000000,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,0,1.800000000,0,2.400000000,0,0,0,0,0,0,0.950000000,0,0,0,0,0,1.733333333,0.168750000,0,0,0.200000000,0.300000000,0.321428571,0.025000000,0.168750000,0,0,0,0,0,0,0,0,0 +2016-12-28,0,0,0,0,0,0,4.577777778,1.500000000,0,2.400000000,0,0,0,0,0.500000000,0,0.950000000,0,0.300000000,0.300000000,0,0.200000000,0.433333333,0.188970588,0,0,0.200000000,0.300000000,0.332500000,0.025000000,0.168750000,0,0,0,0,0,0.025000000,0,0.025000000,0 +2016-12-29,0,4.000000000,2.800000000,0,2.400000000,1.800000000,4.577777778,1.500000000,0,2.296739130,0,0,0,0,0.500000000,1.000000000,0.950000000,0,0.300000000,0.300000000,0.125000000,0.200000000,0.225333333,0.191071429,0,0.140909091,0.058870968,0.300000000,0.149382716,0.058544922,0.078472222,0.050000000,1.400000000,0.025000000,0,0,0.025000000,0,0.025000000,0 +2016-12-30,5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.769230769,1.542857143,1.101111111,0.974107143,0.616250000,0.583333333,0,0.500000000,0.500000000,0.350000000,0.950000000,0.400000000,0.300000000,0.300000000,0.125000000,0.225000000,0.167708333,0.191071429,0,0.140000000,0.069852941,0.043333333,0.068990239,0.045443743,0.035292793,0.118750000,0.026617647,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2016-12-31,8.400000000,0,2.800000000,0,2.400000000,1.800000000,1.830769231,1.325000000,2.310000000,0.976041667,0.611538462,0.812500000,0.577777778,0,0,1.000000000,0.750000000,0,0.300000000,0,0.285714286,0.250000000,0.205421687,0.258854167,0.300000000,0.136111111,0.200000000,0.025000000,0.068637470,0.049394653,0.207500000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2017-01-01,0,4.000000000,0,0,2.400000000,0,0.800000000,1.233333333,0.947482014,0.662500000,0.600000000,0.125000000,0.577777778,0,0,0,0.204629630,0,0.300000000,0,0.300000000,0.200000000,0,0.263829787,0.150000000,0.130000000,0.200000000,0,0.086733002,0.045675831,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Month-reference.csv index 448dd06706..65c55c788a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12,0.042694764 -2017-01,0.045663105 +Month,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +2016-12,5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.380000000,1.541176471,1.222000000,0.871484375,0.613586957,0.577777778,0.500000000,0.500000000,0.583333333,0.400000000,0.350000000,0.750000000,0.300000000,0.300000000,0.265625000,0.237931034,0.157762557,0.300000000,0.138636364,0.133796296,0.077083333,0.068459546,0.047571583,0.043333333,0.035334646,0.028712871,0.026044436,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2017-01,0,4.000000000,0,0,2.400000000,0,1.233333333,0.800000000,0.947482014,0.662500000,0.600000000,0.577777778,0,0,0.125000000,0,0,0.204629630,0.300000000,0,0.300000000,0.200000000,0,0.150000000,0.130000000,0.263829787,0.200000000,0.086733002,0.045675831,0,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Quarter-reference.csv index 0cd0e77394..9abeab4e7f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Normalized (% of Total Cores)" -"2016 Q4",0.042694764 -"2017 Q1",0.045663105 +Quarter,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +"2016 Q4",5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.380000000,1.541176471,1.222000000,0.871484375,0.613586957,0.577777778,0.500000000,0.500000000,0.583333333,0.400000000,0.350000000,0.750000000,0.300000000,0.300000000,0.265625000,0.237931034,0.157762557,0.300000000,0.138636364,0.133796296,0.077083333,0.068459546,0.047571583,0.043333333,0.035334646,0.028712871,0.026044436,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +"2017 Q1",0,4.000000000,0,0,2.400000000,0,1.233333333,0.800000000,0.947482014,0.662500000,0.600000000,0.577777778,0,0,0.125000000,0,0,0.204629630,0.300000000,0,0.300000000,0.200000000,0,0.150000000,0.130000000,0.263829787,0.200000000,0.086733002,0.045675831,0,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Year-reference.csv index 5fe84412fa..052c88bbb4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/normalized_avg_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016,0.042694764 -2017,0.045663105 +Year,"[Fluid, Particulate, and Hydraulic Systems] Job Size: Normalized (% of Total Cores)","[Global Atmospheric Research] Job Size: Normalized (% of Total Cores)","[Structures and Building Systems] Job Size: Normalized (% of Total Cores)","[Design, Tools, and Test] Job Size: Normalized (% of Total Cores)","[Emerging Technologies Initiation] Job Size: Normalized (% of Total Cores)","[Metals, Ceramics, and Electronic Materials] Job Size: Normalized (% of Total Cores)","[Stellar Astronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Organic and Macromolecular Chemistry] Job Size: Normalized (% of Total Cores)","[Systematic and Population Biology] Job Size: Normalized (% of Total Cores)","[Quantum Electronics, Waves, and Beams] Job Size: Normalized (% of Total Cores)","[Economics] Job Size: Normalized (% of Total Cores)","[Design and Computer-Integrated Engineering] Job Size: Normalized (% of Total Cores)","[Geophysics] Job Size: Normalized (% of Total Cores)","[Volcanology and Mantle Geochemistry] Job Size: Normalized (% of Total Cores)","[Geology and Paleontology] Job Size: Normalized (% of Total Cores)","[Law and Social Sciences] Job Size: Normalized (% of Total Cores)","[Polar Aeronomy and Astrophysics] Job Size: Normalized (% of Total Cores)","[Biophysics] Job Size: Normalized (% of Total Cores)","[Algebra and Number Theory] Job Size: Normalized (% of Total Cores)","[Theoretical Physics] Job Size: Normalized (% of Total Cores)","[Seismology] Job Size: Normalized (% of Total Cores)","[Experimental Systems] Job Size: Normalized (% of Total Cores)","[Solid State Chemistry and Polymers] Job Size: Normalized (% of Total Cores)","[Polar Ocean and Climate Systems] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Statistics and Probability] Job Size: Normalized (% of Total Cores)","[Cell Biology] Job Size: Normalized (% of Total Cores)","[Physical Chemistry] Job Size: Normalized (% of Total Cores)","[Sociology] Job Size: Normalized (% of Total Cores)","[Biochemistry and Molecular Structure and Function] Job Size: Normalized (% of Total Cores)","[Galactic Astronomy] Job Size: Normalized (% of Total Cores)","[Solid-State and Microstructures] Job Size: Normalized (% of Total Cores)","[Decision, Risk, and Management Science] Job Size: Normalized (% of Total Cores)","[Computer and Computation Theory] Job Size: Normalized (% of Total Cores)","[Extragalactic Astronomy and Cosmology] Job Size: Normalized (% of Total Cores)","[Mechanics and Materials] Job Size: Normalized (% of Total Cores)","[Operations Research and Production Systems] Job Size: Normalized (% of Total Cores)","[Polar Meteorology] Job Size: Normalized (% of Total Cores)","[Systems Prototyping and Fabrication] Job Size: Normalized (% of Total Cores)","[Tectonics] Job Size: Normalized (% of Total Cores)" +2016,5.600000000,4.000000000,2.800000000,2.700000000,2.400000000,1.800000000,1.380000000,1.541176471,1.222000000,0.871484375,0.613586957,0.577777778,0.500000000,0.500000000,0.583333333,0.400000000,0.350000000,0.750000000,0.300000000,0.300000000,0.265625000,0.237931034,0.157762557,0.300000000,0.138636364,0.133796296,0.077083333,0.068459546,0.047571583,0.043333333,0.035334646,0.028712871,0.026044436,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000,0.025000000 +2017,0,4.000000000,0,0,2.400000000,0,1.233333333,0.800000000,0.947482014,0.662500000,0.600000000,0.577777778,0,0,0.125000000,0,0,0.204629630,0.300000000,0,0.300000000,0.200000000,0,0.150000000,0.130000000,0.263829787,0.200000000,0.086733002,0.045675831,0,0.212500000,0.050000000,0,0,0,0.025000000,0.025000000,0.025000000,0.025000000,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Day-reference.csv index 371aa047f2..54e1885868 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Running" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Month-reference.csv index 371aa047f2..54e1885868 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Running" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Quarter-reference.csv index 371aa047f2..54e1885868 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Running" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Year-reference.csv index 371aa047f2..54e1885868 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Running" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Day-reference.csv index 94f36c6786..11223eff77 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Running" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,6 -2016-12-26,11 -2016-12-27,42 -2016-12-28,450 -2016-12-29,1740 -2016-12-30,28855 -2016-12-31,29603 -2017-01-01,16566 +Day,"[Sociology] Number of Jobs Running","[Physical Chemistry] Number of Jobs Running","[Decision, Risk, and Management Science] Number of Jobs Running","[Systems Prototyping and Fabrication] Number of Jobs Running","[Tectonics] Number of Jobs Running","[Galactic Astronomy] Number of Jobs Running","[Polar Ocean and Climate Systems] Number of Jobs Running","[Operations Research and Production Systems] Number of Jobs Running","[Systematic and Population Biology] Number of Jobs Running","[Polar Meteorology] Number of Jobs Running","[Solid State Chemistry and Polymers] Number of Jobs Running","[Solid-State and Microstructures] Number of Jobs Running","[Mechanics and Materials] Number of Jobs Running","[Cell Biology] Number of Jobs Running","[Economics] Number of Jobs Running","[Arts] Number of Jobs Running","[Statistics and Probability] Number of Jobs Running","[Quantum Electronics, Waves, and Beams] Number of Jobs Running","[Experimental Systems] Number of Jobs Running","[Biophysics] Number of Jobs Running","[Organic and Macromolecular Chemistry] Number of Jobs Running","[Computer and Computation Theory] Number of Jobs Running","[Stellar Astronomy and Astrophysics] Number of Jobs Running","[Emerging Technologies Initiation] Number of Jobs Running","[Biochemistry and Molecular Structure and Function] Number of Jobs Running","[Geophysics] Number of Jobs Running","[Algebra and Number Theory] Number of Jobs Running","[Extragalactic Astronomy and Cosmology] Number of Jobs Running","[Seismology] Number of Jobs Running","[Design and Computer-Integrated Engineering] Number of Jobs Running","[Structures and Building Systems] Number of Jobs Running","[Metals, Ceramics, and Electronic Materials] Number of Jobs Running","[Geology and Paleontology] Number of Jobs Running","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Running","[Theoretical Physics] Number of Jobs Running","[Global Atmospheric Research] Number of Jobs Running","[Polar Aeronomy and Astrophysics] Number of Jobs Running","[Design, Tools, and Test] Number of Jobs Running","[Law and Social Sciences] Number of Jobs Running","[Volcanology and Mantle Geochemistry] Number of Jobs Running" +2016-12-22,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,4,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,4,0,0,0,1,0,0,0,0,0,0,0,0,0,0,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,1,14,0,0,0,6,0,0,0,0,3,0,0,5,0,0,6,3,0,2,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,1,20,0,190,0,6,0,147,0,0,12,0,0,10,0,0,17,15,5,2,9,0,2,0,1,0,9,0,0,0,0,0,0,0,3,0,0,0,0,1 +2016-12-29,256,54,1,960,0,24,0,235,0,0,25,1,0,62,0,11,21,23,16,2,9,5,4,3,1,0,9,0,1,0,4,7,0,0,3,1,1,0,0,1 +2016-12-30,19313,3859,1700,1635,719,740,0,252,90,68,96,4,28,68,20,65,21,28,24,2,13,20,7,8,15,14,11,4,1,0,8,7,3,3,3,1,2,1,1,1 +2016-12-31,22516,2740,933,1637,999,30,16,255,10,24,83,98,28,12,26,27,48,24,22,6,13,1,12,7,4,0,1,6,7,9,4,1,2,1,0,0,1,0,0,0 +2017-01-01,13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Month-reference.csv index 75f821679c..66e065ba38 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Running" -2016-12,56209 -2017-01,16566 +Month,"[Sociology] Number of Jobs Running","[Physical Chemistry] Number of Jobs Running","[Decision, Risk, and Management Science] Number of Jobs Running","[Systems Prototyping and Fabrication] Number of Jobs Running","[Tectonics] Number of Jobs Running","[Galactic Astronomy] Number of Jobs Running","[Polar Ocean and Climate Systems] Number of Jobs Running","[Operations Research and Production Systems] Number of Jobs Running","[Systematic and Population Biology] Number of Jobs Running","[Polar Meteorology] Number of Jobs Running","[Solid State Chemistry and Polymers] Number of Jobs Running","[Solid-State and Microstructures] Number of Jobs Running","[Mechanics and Materials] Number of Jobs Running","[Cell Biology] Number of Jobs Running","[Economics] Number of Jobs Running","[Arts] Number of Jobs Running","[Statistics and Probability] Number of Jobs Running","[Quantum Electronics, Waves, and Beams] Number of Jobs Running","[Experimental Systems] Number of Jobs Running","[Biophysics] Number of Jobs Running","[Organic and Macromolecular Chemistry] Number of Jobs Running","[Computer and Computation Theory] Number of Jobs Running","[Stellar Astronomy and Astrophysics] Number of Jobs Running","[Emerging Technologies Initiation] Number of Jobs Running","[Biochemistry and Molecular Structure and Function] Number of Jobs Running","[Geophysics] Number of Jobs Running","[Algebra and Number Theory] Number of Jobs Running","[Extragalactic Astronomy and Cosmology] Number of Jobs Running","[Seismology] Number of Jobs Running","[Design and Computer-Integrated Engineering] Number of Jobs Running","[Structures and Building Systems] Number of Jobs Running","[Metals, Ceramics, and Electronic Materials] Number of Jobs Running","[Geology and Paleontology] Number of Jobs Running","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Running","[Theoretical Physics] Number of Jobs Running","[Global Atmospheric Research] Number of Jobs Running","[Polar Aeronomy and Astrophysics] Number of Jobs Running","[Design, Tools, and Test] Number of Jobs Running","[Law and Social Sciences] Number of Jobs Running","[Volcanology and Mantle Geochemistry] Number of Jobs Running" +2016-12,41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,1,2,1,1,1 +2017-01,13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Quarter-reference.csv index 6afbf1315a..25be773686 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Running" -"2016 Q4",56209 -"2017 Q1",16566 +Quarter,"[Sociology] Number of Jobs Running","[Physical Chemistry] Number of Jobs Running","[Decision, Risk, and Management Science] Number of Jobs Running","[Systems Prototyping and Fabrication] Number of Jobs Running","[Tectonics] Number of Jobs Running","[Galactic Astronomy] Number of Jobs Running","[Polar Ocean and Climate Systems] Number of Jobs Running","[Operations Research and Production Systems] Number of Jobs Running","[Systematic and Population Biology] Number of Jobs Running","[Polar Meteorology] Number of Jobs Running","[Solid State Chemistry and Polymers] Number of Jobs Running","[Solid-State and Microstructures] Number of Jobs Running","[Mechanics and Materials] Number of Jobs Running","[Cell Biology] Number of Jobs Running","[Economics] Number of Jobs Running","[Arts] Number of Jobs Running","[Statistics and Probability] Number of Jobs Running","[Quantum Electronics, Waves, and Beams] Number of Jobs Running","[Experimental Systems] Number of Jobs Running","[Biophysics] Number of Jobs Running","[Organic and Macromolecular Chemistry] Number of Jobs Running","[Computer and Computation Theory] Number of Jobs Running","[Stellar Astronomy and Astrophysics] Number of Jobs Running","[Emerging Technologies Initiation] Number of Jobs Running","[Biochemistry and Molecular Structure and Function] Number of Jobs Running","[Geophysics] Number of Jobs Running","[Algebra and Number Theory] Number of Jobs Running","[Extragalactic Astronomy and Cosmology] Number of Jobs Running","[Seismology] Number of Jobs Running","[Design and Computer-Integrated Engineering] Number of Jobs Running","[Structures and Building Systems] Number of Jobs Running","[Metals, Ceramics, and Electronic Materials] Number of Jobs Running","[Geology and Paleontology] Number of Jobs Running","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Running","[Theoretical Physics] Number of Jobs Running","[Global Atmospheric Research] Number of Jobs Running","[Polar Aeronomy and Astrophysics] Number of Jobs Running","[Design, Tools, and Test] Number of Jobs Running","[Law and Social Sciences] Number of Jobs Running","[Volcanology and Mantle Geochemistry] Number of Jobs Running" +"2016 Q4",41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,1,2,1,1,1 +"2017 Q1",13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Year-reference.csv index 73dce4884a..7c07a41a14 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/running_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Running" -2016,56209 -2017,16566 +Year,"[Sociology] Number of Jobs Running","[Physical Chemistry] Number of Jobs Running","[Decision, Risk, and Management Science] Number of Jobs Running","[Systems Prototyping and Fabrication] Number of Jobs Running","[Tectonics] Number of Jobs Running","[Galactic Astronomy] Number of Jobs Running","[Polar Ocean and Climate Systems] Number of Jobs Running","[Operations Research and Production Systems] Number of Jobs Running","[Systematic and Population Biology] Number of Jobs Running","[Polar Meteorology] Number of Jobs Running","[Solid State Chemistry and Polymers] Number of Jobs Running","[Solid-State and Microstructures] Number of Jobs Running","[Mechanics and Materials] Number of Jobs Running","[Cell Biology] Number of Jobs Running","[Economics] Number of Jobs Running","[Arts] Number of Jobs Running","[Statistics and Probability] Number of Jobs Running","[Quantum Electronics, Waves, and Beams] Number of Jobs Running","[Experimental Systems] Number of Jobs Running","[Biophysics] Number of Jobs Running","[Organic and Macromolecular Chemistry] Number of Jobs Running","[Computer and Computation Theory] Number of Jobs Running","[Stellar Astronomy and Astrophysics] Number of Jobs Running","[Emerging Technologies Initiation] Number of Jobs Running","[Biochemistry and Molecular Structure and Function] Number of Jobs Running","[Geophysics] Number of Jobs Running","[Algebra and Number Theory] Number of Jobs Running","[Extragalactic Astronomy and Cosmology] Number of Jobs Running","[Seismology] Number of Jobs Running","[Design and Computer-Integrated Engineering] Number of Jobs Running","[Structures and Building Systems] Number of Jobs Running","[Metals, Ceramics, and Electronic Materials] Number of Jobs Running","[Geology and Paleontology] Number of Jobs Running","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Running","[Theoretical Physics] Number of Jobs Running","[Global Atmospheric Research] Number of Jobs Running","[Polar Aeronomy and Astrophysics] Number of Jobs Running","[Design, Tools, and Test] Number of Jobs Running","[Law and Social Sciences] Number of Jobs Running","[Volcanology and Mantle Geochemistry] Number of Jobs Running" +2016,41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,1,2,1,1,1 +2017,13931,402,0,972,0,2,752,94,139,62,0,1,28,7,25,5,47,20,14,27,8,0,9,7,0,0,1,0,2,9,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Day-reference.csv index 6d1346e221..f9365463fb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Started" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Month-reference.csv index 6d1346e221..f9365463fb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Started" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Quarter-reference.csv index 6d1346e221..f9365463fb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Started" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Year-reference.csv index 6d1346e221..f9365463fb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Started" -Unknown,71313 +Sociology,55001 +"Physical Chemistry",6944 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",756 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",239 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Global Atmospheric Research",2 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Day-reference.csv index a6c7a48381..5811ad30c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Started" -2016-12-22,2 -2016-12-23,1 -2016-12-24,0 -2016-12-25,3 -2016-12-26,5 -2016-12-27,31 -2016-12-28,408 -2016-12-29,1290 -2016-12-30,27115 -2016-12-31,27354 -2017-01-01,15104 +Day,"[Sociology] Number of Jobs Started","[Physical Chemistry] Number of Jobs Started","[Decision, Risk, and Management Science] Number of Jobs Started","[Systems Prototyping and Fabrication] Number of Jobs Started","[Tectonics] Number of Jobs Started","[Galactic Astronomy] Number of Jobs Started","[Polar Ocean and Climate Systems] Number of Jobs Started","[Operations Research and Production Systems] Number of Jobs Started","[Systematic and Population Biology] Number of Jobs Started","[Polar Meteorology] Number of Jobs Started","[Solid State Chemistry and Polymers] Number of Jobs Started","[Solid-State and Microstructures] Number of Jobs Started","[Mechanics and Materials] Number of Jobs Started","[Cell Biology] Number of Jobs Started","[Economics] Number of Jobs Started","[Arts] Number of Jobs Started","[Statistics and Probability] Number of Jobs Started","[Quantum Electronics, Waves, and Beams] Number of Jobs Started","[Experimental Systems] Number of Jobs Started","[Biophysics] Number of Jobs Started","[Organic and Macromolecular Chemistry] Number of Jobs Started","[Computer and Computation Theory] Number of Jobs Started","[Stellar Astronomy and Astrophysics] Number of Jobs Started","[Emerging Technologies Initiation] Number of Jobs Started","[Biochemistry and Molecular Structure and Function] Number of Jobs Started","[Geophysics] Number of Jobs Started","[Algebra and Number Theory] Number of Jobs Started","[Extragalactic Astronomy and Cosmology] Number of Jobs Started","[Seismology] Number of Jobs Started","[Design and Computer-Integrated Engineering] Number of Jobs Started","[Structures and Building Systems] Number of Jobs Started","[Metals, Ceramics, and Electronic Materials] Number of Jobs Started","[Geology and Paleontology] Number of Jobs Started","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Started","[Theoretical Physics] Number of Jobs Started","[Global Atmospheric Research] Number of Jobs Started","[Polar Aeronomy and Astrophysics] Number of Jobs Started","[Design, Tools, and Test] Number of Jobs Started","[Law and Social Sciences] Number of Jobs Started","[Volcanology and Mantle Geochemistry] Number of Jobs Started" +2016-12-22,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,1,10,0,0,0,5,0,0,0,0,3,0,0,5,0,0,1,3,0,1,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,0,6,0,190,0,0,0,147,0,0,9,0,0,5,0,0,11,12,5,0,9,0,1,0,0,0,9,0,0,0,0,0,0,0,3,0,0,0,0,1 +2016-12-29,255,34,1,770,0,18,0,88,0,0,13,1,0,52,0,11,4,8,11,0,0,5,2,3,0,0,0,0,1,0,4,7,0,0,0,1,1,0,0,0 +2016-12-30,19057,3805,1699,675,719,716,0,17,90,68,71,3,28,6,20,54,0,5,8,0,4,15,3,5,14,14,2,4,0,0,4,0,3,3,0,0,1,1,1,0 +2016-12-31,22247,2704,933,790,281,22,16,37,10,24,50,97,28,4,26,1,33,4,5,4,4,0,8,4,0,0,0,6,7,9,0,0,0,0,0,0,0,0,0,0 +2017-01-01,13441,381,0,204,0,1,740,19,139,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Month-reference.csv index f86447d157..b3ab25f7f8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Started" -2016-12,56209 -2017-01,15104 +Month,"[Sociology] Number of Jobs Started","[Physical Chemistry] Number of Jobs Started","[Decision, Risk, and Management Science] Number of Jobs Started","[Systems Prototyping and Fabrication] Number of Jobs Started","[Tectonics] Number of Jobs Started","[Galactic Astronomy] Number of Jobs Started","[Polar Ocean and Climate Systems] Number of Jobs Started","[Operations Research and Production Systems] Number of Jobs Started","[Systematic and Population Biology] Number of Jobs Started","[Polar Meteorology] Number of Jobs Started","[Solid State Chemistry and Polymers] Number of Jobs Started","[Solid-State and Microstructures] Number of Jobs Started","[Mechanics and Materials] Number of Jobs Started","[Cell Biology] Number of Jobs Started","[Economics] Number of Jobs Started","[Arts] Number of Jobs Started","[Statistics and Probability] Number of Jobs Started","[Quantum Electronics, Waves, and Beams] Number of Jobs Started","[Experimental Systems] Number of Jobs Started","[Biophysics] Number of Jobs Started","[Organic and Macromolecular Chemistry] Number of Jobs Started","[Computer and Computation Theory] Number of Jobs Started","[Stellar Astronomy and Astrophysics] Number of Jobs Started","[Emerging Technologies Initiation] Number of Jobs Started","[Biochemistry and Molecular Structure and Function] Number of Jobs Started","[Geophysics] Number of Jobs Started","[Algebra and Number Theory] Number of Jobs Started","[Extragalactic Astronomy and Cosmology] Number of Jobs Started","[Seismology] Number of Jobs Started","[Design and Computer-Integrated Engineering] Number of Jobs Started","[Structures and Building Systems] Number of Jobs Started","[Metals, Ceramics, and Electronic Materials] Number of Jobs Started","[Geology and Paleontology] Number of Jobs Started","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Started","[Theoretical Physics] Number of Jobs Started","[Global Atmospheric Research] Number of Jobs Started","[Polar Aeronomy and Astrophysics] Number of Jobs Started","[Design, Tools, and Test] Number of Jobs Started","[Law and Social Sciences] Number of Jobs Started","[Volcanology and Mantle Geochemistry] Number of Jobs Started" +2016-12,41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,1,2,1,1,1 +2017-01,13441,381,0,204,0,1,740,19,139,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Quarter-reference.csv index 3b7e14cf15..4ddd161523 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Started" -"2016 Q4",56209 -"2017 Q1",15104 +Quarter,"[Sociology] Number of Jobs Started","[Physical Chemistry] Number of Jobs Started","[Decision, Risk, and Management Science] Number of Jobs Started","[Systems Prototyping and Fabrication] Number of Jobs Started","[Tectonics] Number of Jobs Started","[Galactic Astronomy] Number of Jobs Started","[Polar Ocean and Climate Systems] Number of Jobs Started","[Operations Research and Production Systems] Number of Jobs Started","[Systematic and Population Biology] Number of Jobs Started","[Polar Meteorology] Number of Jobs Started","[Solid State Chemistry and Polymers] Number of Jobs Started","[Solid-State and Microstructures] Number of Jobs Started","[Mechanics and Materials] Number of Jobs Started","[Cell Biology] Number of Jobs Started","[Economics] Number of Jobs Started","[Arts] Number of Jobs Started","[Statistics and Probability] Number of Jobs Started","[Quantum Electronics, Waves, and Beams] Number of Jobs Started","[Experimental Systems] Number of Jobs Started","[Biophysics] Number of Jobs Started","[Organic and Macromolecular Chemistry] Number of Jobs Started","[Computer and Computation Theory] Number of Jobs Started","[Stellar Astronomy and Astrophysics] Number of Jobs Started","[Emerging Technologies Initiation] Number of Jobs Started","[Biochemistry and Molecular Structure and Function] Number of Jobs Started","[Geophysics] Number of Jobs Started","[Algebra and Number Theory] Number of Jobs Started","[Extragalactic Astronomy and Cosmology] Number of Jobs Started","[Seismology] Number of Jobs Started","[Design and Computer-Integrated Engineering] Number of Jobs Started","[Structures and Building Systems] Number of Jobs Started","[Metals, Ceramics, and Electronic Materials] Number of Jobs Started","[Geology and Paleontology] Number of Jobs Started","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Started","[Theoretical Physics] Number of Jobs Started","[Global Atmospheric Research] Number of Jobs Started","[Polar Aeronomy and Astrophysics] Number of Jobs Started","[Design, Tools, and Test] Number of Jobs Started","[Law and Social Sciences] Number of Jobs Started","[Volcanology and Mantle Geochemistry] Number of Jobs Started" +"2016 Q4",41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,1,2,1,1,1 +"2017 Q1",13441,381,0,204,0,1,740,19,139,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Year-reference.csv index 5dc984e7f6..6814a45bab 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/started_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Started" -2016,56209 -2017,15104 +Year,"[Sociology] Number of Jobs Started","[Physical Chemistry] Number of Jobs Started","[Decision, Risk, and Management Science] Number of Jobs Started","[Systems Prototyping and Fabrication] Number of Jobs Started","[Tectonics] Number of Jobs Started","[Galactic Astronomy] Number of Jobs Started","[Polar Ocean and Climate Systems] Number of Jobs Started","[Operations Research and Production Systems] Number of Jobs Started","[Systematic and Population Biology] Number of Jobs Started","[Polar Meteorology] Number of Jobs Started","[Solid State Chemistry and Polymers] Number of Jobs Started","[Solid-State and Microstructures] Number of Jobs Started","[Mechanics and Materials] Number of Jobs Started","[Cell Biology] Number of Jobs Started","[Economics] Number of Jobs Started","[Arts] Number of Jobs Started","[Statistics and Probability] Number of Jobs Started","[Quantum Electronics, Waves, and Beams] Number of Jobs Started","[Experimental Systems] Number of Jobs Started","[Biophysics] Number of Jobs Started","[Organic and Macromolecular Chemistry] Number of Jobs Started","[Computer and Computation Theory] Number of Jobs Started","[Stellar Astronomy and Astrophysics] Number of Jobs Started","[Emerging Technologies Initiation] Number of Jobs Started","[Biochemistry and Molecular Structure and Function] Number of Jobs Started","[Geophysics] Number of Jobs Started","[Algebra and Number Theory] Number of Jobs Started","[Extragalactic Astronomy and Cosmology] Number of Jobs Started","[Seismology] Number of Jobs Started","[Design and Computer-Integrated Engineering] Number of Jobs Started","[Structures and Building Systems] Number of Jobs Started","[Metals, Ceramics, and Electronic Materials] Number of Jobs Started","[Geology and Paleontology] Number of Jobs Started","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Started","[Theoretical Physics] Number of Jobs Started","[Global Atmospheric Research] Number of Jobs Started","[Polar Aeronomy and Astrophysics] Number of Jobs Started","[Design, Tools, and Test] Number of Jobs Started","[Law and Social Sciences] Number of Jobs Started","[Volcanology and Mantle Geochemistry] Number of Jobs Started" +2016,41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,1,2,1,1,1 +2017,13441,381,0,204,0,1,740,19,139,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,1,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Day-reference.csv index 374af8586b..5cad7fe104 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Submitted" -Unknown,64416 +Sociology,49664 +"Physical Chemistry",6927 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2586 +Tectonics,719 +"Polar Ocean and Climate Systems",693 +"Operations Research and Production Systems",308 +"Polar Meteorology",154 +"Systematic and Population Biology",123 +"Mechanics and Materials",84 +Economics,69 +"Cell Biology",55 +"Statistics and Probability",50 +"Galactic Astronomy",47 +"Experimental Systems",37 +Arts,31 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Quantum Electronics, Waves, and Beams",22 +"Computer and Computation Theory",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",14 +Geophysics,14 +"Stellar Astronomy and Astrophysics",14 +"Solid State Chemistry and Polymers",13 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Theoretical Physics",3 +"Design, Tools, and Test",1 +"Law and Social Sciences",1 +"Polar Aeronomy and Astrophysics",1 +"Solid-State and Microstructures",1 +"Volcanology and Mantle Geochemistry",1 +"Fluid, Particulate, and Hydraulic Systems",0 +"Global Atmospheric Research",0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Month-reference.csv index d9d8db75fb..fb2d491b59 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Submitted" -Unknown,69243 +Sociology,53071 +"Physical Chemistry",6943 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",693 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",164 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Quarter-reference.csv index d9d8db75fb..fb2d491b59 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Submitted" -Unknown,69243 +Sociology,53071 +"Physical Chemistry",6943 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",693 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",164 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Year-reference.csv index d9d8db75fb..fb2d491b59 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Number of Jobs Submitted" -Unknown,69243 +Sociology,53071 +"Physical Chemistry",6943 +"Decision, Risk, and Management Science",2633 +"Systems Prototyping and Fabrication",2629 +Tectonics,1000 +"Galactic Astronomy",763 +"Polar Ocean and Climate Systems",693 +"Operations Research and Production Systems",308 +"Systematic and Population Biology",164 +"Polar Meteorology",154 +"Solid State Chemistry and Polymers",146 +"Solid-State and Microstructures",101 +"Mechanics and Materials",84 +"Cell Biology",72 +Economics,69 +Arts,66 +"Statistics and Probability",54 +"Quantum Electronics, Waves, and Beams",44 +"Experimental Systems",37 +Biophysics,31 +"Organic and Macromolecular Chemistry",25 +"Computer and Computation Theory",20 +"Stellar Astronomy and Astrophysics",20 +"Emerging Technologies Initiation",16 +"Biochemistry and Molecular Structure and Function",15 +Geophysics,14 +"Algebra and Number Theory",11 +"Extragalactic Astronomy and Cosmology",10 +Seismology,10 +"Design and Computer-Integrated Engineering",9 +"Structures and Building Systems",8 +"Metals, Ceramics, and Electronic Materials",7 +"Geology and Paleontology",4 +"Fluid, Particulate, and Hydraulic Systems",3 +"Theoretical Physics",3 +"Polar Aeronomy and Astrophysics",2 +"Design, Tools, and Test",1 +"Global Atmospheric Research",1 +"Law and Social Sciences",1 +"Volcanology and Mantle Geochemistry",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Day-reference.csv index 160cdddfee..5f48ded37f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Submitted" -2016-12-22,1 -2016-12-23,1 -2016-12-24,0 -2016-12-25,1 -2016-12-26,5 -2016-12-27,18 -2016-12-28,379 -2016-12-29,1206 -2016-12-30,25660 -2016-12-31,24111 -2017-01-01,13034 +Day,"[Sociology] Number of Jobs Submitted","[Physical Chemistry] Number of Jobs Submitted","[Decision, Risk, and Management Science] Number of Jobs Submitted","[Systems Prototyping and Fabrication] Number of Jobs Submitted","[Tectonics] Number of Jobs Submitted","[Polar Ocean and Climate Systems] Number of Jobs Submitted","[Operations Research and Production Systems] Number of Jobs Submitted","[Polar Meteorology] Number of Jobs Submitted","[Systematic and Population Biology] Number of Jobs Submitted","[Mechanics and Materials] Number of Jobs Submitted","[Economics] Number of Jobs Submitted","[Cell Biology] Number of Jobs Submitted","[Statistics and Probability] Number of Jobs Submitted","[Galactic Astronomy] Number of Jobs Submitted","[Experimental Systems] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Biophysics] Number of Jobs Submitted","[Organic and Macromolecular Chemistry] Number of Jobs Submitted","[Quantum Electronics, Waves, and Beams] Number of Jobs Submitted","[Computer and Computation Theory] Number of Jobs Submitted","[Emerging Technologies Initiation] Number of Jobs Submitted","[Biochemistry and Molecular Structure and Function] Number of Jobs Submitted","[Geophysics] Number of Jobs Submitted","[Stellar Astronomy and Astrophysics] Number of Jobs Submitted","[Solid State Chemistry and Polymers] Number of Jobs Submitted","[Algebra and Number Theory] Number of Jobs Submitted","[Extragalactic Astronomy and Cosmology] Number of Jobs Submitted","[Seismology] Number of Jobs Submitted","[Design and Computer-Integrated Engineering] Number of Jobs Submitted","[Structures and Building Systems] Number of Jobs Submitted","[Metals, Ceramics, and Electronic Materials] Number of Jobs Submitted","[Geology and Paleontology] Number of Jobs Submitted","[Theoretical Physics] Number of Jobs Submitted","[Design, Tools, and Test] Number of Jobs Submitted","[Law and Social Sciences] Number of Jobs Submitted","[Polar Aeronomy and Astrophysics] Number of Jobs Submitted","[Solid-State and Microstructures] Number of Jobs Submitted","[Volcanology and Mantle Geochemistry] Number of Jobs Submitted","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Submitted","[Global Atmospheric Research] Number of Jobs Submitted" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,1,10,0,0,0,0,0,0,0,0,0,0,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,0,4,0,190,0,0,147,0,0,0,0,0,11,0,5,0,0,9,0,0,0,0,0,0,0,9,0,0,0,0,0,0,3,0,0,0,0,1,0,0 +2016-12-29,205,32,1,770,0,0,88,0,0,0,0,50,0,4,11,11,0,0,1,5,3,0,0,1,10,0,0,1,0,4,7,0,0,0,0,1,1,0,0,0 +2016-12-30,18462,3801,1699,675,719,0,17,68,50,28,20,5,0,15,8,19,0,4,5,15,5,14,14,1,1,2,4,0,0,4,0,3,0,1,1,0,0,0,0,0 +2016-12-31,19485,2699,933,747,0,16,37,24,9,28,26,0,33,21,5,1,4,4,4,0,4,0,0,7,2,0,6,7,9,0,0,0,0,0,0,0,0,0,0,0 +2017-01-01,11511,380,0,204,0,677,19,62,64,28,23,0,0,1,8,0,25,8,12,0,4,0,0,5,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Month-reference.csv index 76392bedd0..ff3a785a64 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Submitted" -2016-12,56209 -2017-01,13034 +Month,"[Sociology] Number of Jobs Submitted","[Physical Chemistry] Number of Jobs Submitted","[Decision, Risk, and Management Science] Number of Jobs Submitted","[Systems Prototyping and Fabrication] Number of Jobs Submitted","[Tectonics] Number of Jobs Submitted","[Galactic Astronomy] Number of Jobs Submitted","[Polar Ocean and Climate Systems] Number of Jobs Submitted","[Operations Research and Production Systems] Number of Jobs Submitted","[Systematic and Population Biology] Number of Jobs Submitted","[Polar Meteorology] Number of Jobs Submitted","[Solid State Chemistry and Polymers] Number of Jobs Submitted","[Solid-State and Microstructures] Number of Jobs Submitted","[Mechanics and Materials] Number of Jobs Submitted","[Cell Biology] Number of Jobs Submitted","[Economics] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Statistics and Probability] Number of Jobs Submitted","[Quantum Electronics, Waves, and Beams] Number of Jobs Submitted","[Experimental Systems] Number of Jobs Submitted","[Biophysics] Number of Jobs Submitted","[Organic and Macromolecular Chemistry] Number of Jobs Submitted","[Computer and Computation Theory] Number of Jobs Submitted","[Stellar Astronomy and Astrophysics] Number of Jobs Submitted","[Emerging Technologies Initiation] Number of Jobs Submitted","[Biochemistry and Molecular Structure and Function] Number of Jobs Submitted","[Geophysics] Number of Jobs Submitted","[Algebra and Number Theory] Number of Jobs Submitted","[Extragalactic Astronomy and Cosmology] Number of Jobs Submitted","[Seismology] Number of Jobs Submitted","[Design and Computer-Integrated Engineering] Number of Jobs Submitted","[Structures and Building Systems] Number of Jobs Submitted","[Metals, Ceramics, and Electronic Materials] Number of Jobs Submitted","[Geology and Paleontology] Number of Jobs Submitted","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Submitted","[Theoretical Physics] Number of Jobs Submitted","[Polar Aeronomy and Astrophysics] Number of Jobs Submitted","[Design, Tools, and Test] Number of Jobs Submitted","[Global Atmospheric Research] Number of Jobs Submitted","[Law and Social Sciences] Number of Jobs Submitted","[Volcanology and Mantle Geochemistry] Number of Jobs Submitted" +2016-12,41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,2,1,1,1,1 +2017-01,11511,380,0,204,0,1,677,19,64,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Quarter-reference.csv index 3bd0a697e8..0f9fd295a7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Submitted" -"2016 Q4",56209 -"2017 Q1",13034 +Quarter,"[Sociology] Number of Jobs Submitted","[Physical Chemistry] Number of Jobs Submitted","[Decision, Risk, and Management Science] Number of Jobs Submitted","[Systems Prototyping and Fabrication] Number of Jobs Submitted","[Tectonics] Number of Jobs Submitted","[Galactic Astronomy] Number of Jobs Submitted","[Polar Ocean and Climate Systems] Number of Jobs Submitted","[Operations Research and Production Systems] Number of Jobs Submitted","[Systematic and Population Biology] Number of Jobs Submitted","[Polar Meteorology] Number of Jobs Submitted","[Solid State Chemistry and Polymers] Number of Jobs Submitted","[Solid-State and Microstructures] Number of Jobs Submitted","[Mechanics and Materials] Number of Jobs Submitted","[Cell Biology] Number of Jobs Submitted","[Economics] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Statistics and Probability] Number of Jobs Submitted","[Quantum Electronics, Waves, and Beams] Number of Jobs Submitted","[Experimental Systems] Number of Jobs Submitted","[Biophysics] Number of Jobs Submitted","[Organic and Macromolecular Chemistry] Number of Jobs Submitted","[Computer and Computation Theory] Number of Jobs Submitted","[Stellar Astronomy and Astrophysics] Number of Jobs Submitted","[Emerging Technologies Initiation] Number of Jobs Submitted","[Biochemistry and Molecular Structure and Function] Number of Jobs Submitted","[Geophysics] Number of Jobs Submitted","[Algebra and Number Theory] Number of Jobs Submitted","[Extragalactic Astronomy and Cosmology] Number of Jobs Submitted","[Seismology] Number of Jobs Submitted","[Design and Computer-Integrated Engineering] Number of Jobs Submitted","[Structures and Building Systems] Number of Jobs Submitted","[Metals, Ceramics, and Electronic Materials] Number of Jobs Submitted","[Geology and Paleontology] Number of Jobs Submitted","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Submitted","[Theoretical Physics] Number of Jobs Submitted","[Polar Aeronomy and Astrophysics] Number of Jobs Submitted","[Design, Tools, and Test] Number of Jobs Submitted","[Global Atmospheric Research] Number of Jobs Submitted","[Law and Social Sciences] Number of Jobs Submitted","[Volcanology and Mantle Geochemistry] Number of Jobs Submitted" +"2016 Q4",41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,2,1,1,1,1 +"2017 Q1",11511,380,0,204,0,1,677,19,64,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Year-reference.csv index 5b946830a9..027c098e45 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/submitted_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Submitted" -2016,56209 -2017,13034 +Year,"[Sociology] Number of Jobs Submitted","[Physical Chemistry] Number of Jobs Submitted","[Decision, Risk, and Management Science] Number of Jobs Submitted","[Systems Prototyping and Fabrication] Number of Jobs Submitted","[Tectonics] Number of Jobs Submitted","[Galactic Astronomy] Number of Jobs Submitted","[Polar Ocean and Climate Systems] Number of Jobs Submitted","[Operations Research and Production Systems] Number of Jobs Submitted","[Systematic and Population Biology] Number of Jobs Submitted","[Polar Meteorology] Number of Jobs Submitted","[Solid State Chemistry and Polymers] Number of Jobs Submitted","[Solid-State and Microstructures] Number of Jobs Submitted","[Mechanics and Materials] Number of Jobs Submitted","[Cell Biology] Number of Jobs Submitted","[Economics] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Statistics and Probability] Number of Jobs Submitted","[Quantum Electronics, Waves, and Beams] Number of Jobs Submitted","[Experimental Systems] Number of Jobs Submitted","[Biophysics] Number of Jobs Submitted","[Organic and Macromolecular Chemistry] Number of Jobs Submitted","[Computer and Computation Theory] Number of Jobs Submitted","[Stellar Astronomy and Astrophysics] Number of Jobs Submitted","[Emerging Technologies Initiation] Number of Jobs Submitted","[Biochemistry and Molecular Structure and Function] Number of Jobs Submitted","[Geophysics] Number of Jobs Submitted","[Algebra and Number Theory] Number of Jobs Submitted","[Extragalactic Astronomy and Cosmology] Number of Jobs Submitted","[Seismology] Number of Jobs Submitted","[Design and Computer-Integrated Engineering] Number of Jobs Submitted","[Structures and Building Systems] Number of Jobs Submitted","[Metals, Ceramics, and Electronic Materials] Number of Jobs Submitted","[Geology and Paleontology] Number of Jobs Submitted","[Fluid, Particulate, and Hydraulic Systems] Number of Jobs Submitted","[Theoretical Physics] Number of Jobs Submitted","[Polar Aeronomy and Astrophysics] Number of Jobs Submitted","[Design, Tools, and Test] Number of Jobs Submitted","[Global Atmospheric Research] Number of Jobs Submitted","[Law and Social Sciences] Number of Jobs Submitted","[Volcanology and Mantle Geochemistry] Number of Jobs Submitted" +2016,41560,6563,2633,2425,1000,762,16,289,100,92,146,101,56,72,46,66,54,32,29,6,17,20,15,12,15,14,11,10,8,9,8,7,3,3,3,2,1,1,1,1 +2017,11511,380,0,204,0,1,677,19,64,62,0,0,28,0,23,0,0,12,8,25,8,0,5,4,0,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Day-reference.csv index ad810e949a..57e99001f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","CPU Hours: Total" -Unknown,840555.8369 +Sociology,160661.1219 +"Quantum Electronics, Waves, and Beams",147374.4353 +"Organic and Macromolecular Chemistry",119274.1289 +"Physical Chemistry",69231.4289 +"Systems Prototyping and Fabrication",67004.1206 +"Statistics and Probability",34897.7289 +"Solid State Chemistry and Polymers",33446.5633 +"Stellar Astronomy and Astrophysics",21995.7300 +"Emerging Technologies Initiation",19473.8133 +"Polar Ocean and Climate Systems",19117.7667 +"Metals, Ceramics, and Electronic Materials",18391.0000 +"Operations Research and Production Systems",15354.0758 +"Structures and Building Systems",14141.1200 +"Galactic Astronomy",13804.8528 +"Fluid, Particulate, and Hydraulic Systems",13105.9733 +Arts,12416.7611 +Biophysics,10880.2728 +"Cell Biology",8707.0903 +Tectonics,8590.5158 +"Experimental Systems",7367.1656 +"Design and Computer-Integrated Engineering",5262.3156 +"Algebra and Number Theory",5198.0500 +"Solid-State and Microstructures",2039.1683 +"Polar Aeronomy and Astrophysics",2013.9756 +"Theoretical Physics",1588.9133 +"Systematic and Population Biology",1518.1478 +Economics,1446.9428 +"Global Atmospheric Research",1444.4889 +"Decision, Risk, and Management Science",1183.6917 +"Biochemistry and Molecular Structure and Function",1021.5447 +"Volcanology and Mantle Geochemistry",960.1333 +Seismology,622.6494 +"Geology and Paleontology",590.3347 +"Polar Meteorology",135.7597 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Extragalactic Astronomy and Cosmology",59.8692 +"Design, Tools, and Test",28.1400 +Geophysics,22.5389 +"Law and Social Sciences",1.0400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Month-reference.csv index ad810e949a..57e99001f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","CPU Hours: Total" -Unknown,840555.8369 +Sociology,160661.1219 +"Quantum Electronics, Waves, and Beams",147374.4353 +"Organic and Macromolecular Chemistry",119274.1289 +"Physical Chemistry",69231.4289 +"Systems Prototyping and Fabrication",67004.1206 +"Statistics and Probability",34897.7289 +"Solid State Chemistry and Polymers",33446.5633 +"Stellar Astronomy and Astrophysics",21995.7300 +"Emerging Technologies Initiation",19473.8133 +"Polar Ocean and Climate Systems",19117.7667 +"Metals, Ceramics, and Electronic Materials",18391.0000 +"Operations Research and Production Systems",15354.0758 +"Structures and Building Systems",14141.1200 +"Galactic Astronomy",13804.8528 +"Fluid, Particulate, and Hydraulic Systems",13105.9733 +Arts,12416.7611 +Biophysics,10880.2728 +"Cell Biology",8707.0903 +Tectonics,8590.5158 +"Experimental Systems",7367.1656 +"Design and Computer-Integrated Engineering",5262.3156 +"Algebra and Number Theory",5198.0500 +"Solid-State and Microstructures",2039.1683 +"Polar Aeronomy and Astrophysics",2013.9756 +"Theoretical Physics",1588.9133 +"Systematic and Population Biology",1518.1478 +Economics,1446.9428 +"Global Atmospheric Research",1444.4889 +"Decision, Risk, and Management Science",1183.6917 +"Biochemistry and Molecular Structure and Function",1021.5447 +"Volcanology and Mantle Geochemistry",960.1333 +Seismology,622.6494 +"Geology and Paleontology",590.3347 +"Polar Meteorology",135.7597 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Extragalactic Astronomy and Cosmology",59.8692 +"Design, Tools, and Test",28.1400 +Geophysics,22.5389 +"Law and Social Sciences",1.0400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Quarter-reference.csv index ad810e949a..57e99001f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","CPU Hours: Total" -Unknown,840555.8369 +Sociology,160661.1219 +"Quantum Electronics, Waves, and Beams",147374.4353 +"Organic and Macromolecular Chemistry",119274.1289 +"Physical Chemistry",69231.4289 +"Systems Prototyping and Fabrication",67004.1206 +"Statistics and Probability",34897.7289 +"Solid State Chemistry and Polymers",33446.5633 +"Stellar Astronomy and Astrophysics",21995.7300 +"Emerging Technologies Initiation",19473.8133 +"Polar Ocean and Climate Systems",19117.7667 +"Metals, Ceramics, and Electronic Materials",18391.0000 +"Operations Research and Production Systems",15354.0758 +"Structures and Building Systems",14141.1200 +"Galactic Astronomy",13804.8528 +"Fluid, Particulate, and Hydraulic Systems",13105.9733 +Arts,12416.7611 +Biophysics,10880.2728 +"Cell Biology",8707.0903 +Tectonics,8590.5158 +"Experimental Systems",7367.1656 +"Design and Computer-Integrated Engineering",5262.3156 +"Algebra and Number Theory",5198.0500 +"Solid-State and Microstructures",2039.1683 +"Polar Aeronomy and Astrophysics",2013.9756 +"Theoretical Physics",1588.9133 +"Systematic and Population Biology",1518.1478 +Economics,1446.9428 +"Global Atmospheric Research",1444.4889 +"Decision, Risk, and Management Science",1183.6917 +"Biochemistry and Molecular Structure and Function",1021.5447 +"Volcanology and Mantle Geochemistry",960.1333 +Seismology,622.6494 +"Geology and Paleontology",590.3347 +"Polar Meteorology",135.7597 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Extragalactic Astronomy and Cosmology",59.8692 +"Design, Tools, and Test",28.1400 +Geophysics,22.5389 +"Law and Social Sciences",1.0400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Year-reference.csv index ad810e949a..57e99001f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","CPU Hours: Total" -Unknown,840555.8369 +Sociology,160661.1219 +"Quantum Electronics, Waves, and Beams",147374.4353 +"Organic and Macromolecular Chemistry",119274.1289 +"Physical Chemistry",69231.4289 +"Systems Prototyping and Fabrication",67004.1206 +"Statistics and Probability",34897.7289 +"Solid State Chemistry and Polymers",33446.5633 +"Stellar Astronomy and Astrophysics",21995.7300 +"Emerging Technologies Initiation",19473.8133 +"Polar Ocean and Climate Systems",19117.7667 +"Metals, Ceramics, and Electronic Materials",18391.0000 +"Operations Research and Production Systems",15354.0758 +"Structures and Building Systems",14141.1200 +"Galactic Astronomy",13804.8528 +"Fluid, Particulate, and Hydraulic Systems",13105.9733 +Arts,12416.7611 +Biophysics,10880.2728 +"Cell Biology",8707.0903 +Tectonics,8590.5158 +"Experimental Systems",7367.1656 +"Design and Computer-Integrated Engineering",5262.3156 +"Algebra and Number Theory",5198.0500 +"Solid-State and Microstructures",2039.1683 +"Polar Aeronomy and Astrophysics",2013.9756 +"Theoretical Physics",1588.9133 +"Systematic and Population Biology",1518.1478 +Economics,1446.9428 +"Global Atmospheric Research",1444.4889 +"Decision, Risk, and Management Science",1183.6917 +"Biochemistry and Molecular Structure and Function",1021.5447 +"Volcanology and Mantle Geochemistry",960.1333 +Seismology,622.6494 +"Geology and Paleontology",590.3347 +"Polar Meteorology",135.7597 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Extragalactic Astronomy and Cosmology",59.8692 +"Design, Tools, and Test",28.1400 +Geophysics,22.5389 +"Law and Social Sciences",1.0400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Day-reference.csv index 6589257e0c..c0ca4f1d48 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Total" -2016-12-22,404.2567 -2016-12-23,584.6036 -2016-12-24,600.0000 -2016-12-25,778.2700 -2016-12-26,2256.3333 -2016-12-27,15553.1447 -2016-12-28,81988.7103 -2016-12-29,171261.7833 -2016-12-30,275119.2672 -2016-12-31,222229.6297 -2017-01-01,69779.8381 +Day,"[Sociology] CPU Hours: Total","[Quantum Electronics, Waves, and Beams] CPU Hours: Total","[Organic and Macromolecular Chemistry] CPU Hours: Total","[Physical Chemistry] CPU Hours: Total","[Systems Prototyping and Fabrication] CPU Hours: Total","[Statistics and Probability] CPU Hours: Total","[Solid State Chemistry and Polymers] CPU Hours: Total","[Stellar Astronomy and Astrophysics] CPU Hours: Total","[Emerging Technologies Initiation] CPU Hours: Total","[Polar Ocean and Climate Systems] CPU Hours: Total","[Metals, Ceramics, and Electronic Materials] CPU Hours: Total","[Operations Research and Production Systems] CPU Hours: Total","[Structures and Building Systems] CPU Hours: Total","[Galactic Astronomy] CPU Hours: Total","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Biophysics] CPU Hours: Total","[Cell Biology] CPU Hours: Total","[Tectonics] CPU Hours: Total","[Experimental Systems] CPU Hours: Total","[Design and Computer-Integrated Engineering] CPU Hours: Total","[Algebra and Number Theory] CPU Hours: Total","[Solid-State and Microstructures] CPU Hours: Total","[Polar Aeronomy and Astrophysics] CPU Hours: Total","[Theoretical Physics] CPU Hours: Total","[Systematic and Population Biology] CPU Hours: Total","[Economics] CPU Hours: Total","[Global Atmospheric Research] CPU Hours: Total","[Decision, Risk, and Management Science] CPU Hours: Total","[Biochemistry and Molecular Structure and Function] CPU Hours: Total","[Volcanology and Mantle Geochemistry] CPU Hours: Total","[Seismology] CPU Hours: Total","[Geology and Paleontology] CPU Hours: Total","[Polar Meteorology] CPU Hours: Total","[Computer and Computation Theory] CPU Hours: Total","[Mechanics and Materials] CPU Hours: Total","[Extragalactic Astronomy and Cosmology] CPU Hours: Total","[Design, Tools, and Test] CPU Hours: Total","[Geophysics] CPU Hours: Total","[Law and Social Sciences] CPU Hours: Total" +2016-12-22,0,0,0,203.3000,0,0,0,0,0,0,0,0,0,0,0,0,200.9567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,288.0000,0,0,0,0,0,0,0,0,0,8.6036,0,0,288.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,288.0000,0,0,0,0,0,0,0,0,0,24.0000,0,0,288.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,466.2700,0,0,0,0,0,0,0,0,0,24.0000,0,0,288.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,1728.0000,0,216.3333,0,0,0,0,0,0,0,24.0000,0,0,288.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,3.2167,3739.4133,0,2293.7600,0,1924.7214,4298.8089,1487.8200,0,0,0,0,0,476.7422,0,0,531.1822,558.6133,0,0,0,0,0,0,0,0,0,0,0,238.8667,0,0,0,0,0,0,0,0,0,0 +2016-12-28,24.0000,21931.9200,29467.4711,9954.8311,953.0369,2334.7378,6587.9644,2341.3467,0,0,0,1962.8444,0,1944.0000,0,0,1824.0000,1411.0667,0,351.5933,0,336.4567,0,0,181.4300,0,0,0,0,288.0000,94.0111,0,0,0,0,0,0,0,0,0 +2016-12-29,1793.4019,49556.3222,39552.0000,15738.2700,12583.2597,7668.0844,12041.5822,4466.4000,1834.4800,0,5821.2600,3901.6422,1643.9111,2568.7161,0,516.0911,1824.0000,2203.9531,0,1349.9467,0,2592.0000,7.2400,758.9889,864.0000,0,0,1038.2222,107.9089,288.0000,480.0000,52.0042,0,0,10.0983,0,0,0,0,0 +2016-12-30,62498.5789,46993.5803,39578.0711,16799.6656,21766.1511,6074.5967,7951.5333,4841.8833,6126.0000,0,10979.2200,5473.3125,9211.3156,5521.6442,7404.4267,6971.0514,1824.0000,2108.7128,3055.8617,2630.7078,0,1921.0433,568.6500,960.0089,543.4833,522.1678,326.5894,402.8000,1061.9836,198.9664,386.1222,68.0319,65.9958,108.1047,82.1119,27.2308,13.9453,28.1400,22.5389,1.0400 +2016-12-31,87876.5508,22254.2050,10619.6356,14731.3744,20518.0064,11780.8131,2566.6744,5674.2567,6839.5200,37.7500,1590.5200,2761.8142,3285.8933,2841.5344,5701.5467,4629.6697,1827.6067,1437.7244,5534.6542,2071.8422,3473.9867,288.0000,1428.0200,294.9778,0,125.4733,914.2433,0,13.7992,7.7117,0,491.1800,502.9333,25.9131,8.6314,27.2439,45.9239,0,0,0 +2017-01-01,8465.3736,2898.9944,56.9511,6739.9578,11183.6664,4898.4422,0,3184.0233,4673.8133,19080.0167,0,1254.4625,0,371.6122,0,299.9489,1696.5272,987.0200,0,963.0756,1788.3289,60.5500,35.2583,0,0,870.5067,206.1100,3.4667,0,0,0,11.4333,21.4056,1.7419,0,27.1514,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Month-reference.csv index 7e0903cd54..0bdd6daa86 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Total" -2016-12,770775.9989 -2017-01,69779.8381 +Month,"[Sociology] CPU Hours: Total","[Quantum Electronics, Waves, and Beams] CPU Hours: Total","[Organic and Macromolecular Chemistry] CPU Hours: Total","[Physical Chemistry] CPU Hours: Total","[Systems Prototyping and Fabrication] CPU Hours: Total","[Statistics and Probability] CPU Hours: Total","[Solid State Chemistry and Polymers] CPU Hours: Total","[Stellar Astronomy and Astrophysics] CPU Hours: Total","[Emerging Technologies Initiation] CPU Hours: Total","[Polar Ocean and Climate Systems] CPU Hours: Total","[Metals, Ceramics, and Electronic Materials] CPU Hours: Total","[Operations Research and Production Systems] CPU Hours: Total","[Structures and Building Systems] CPU Hours: Total","[Galactic Astronomy] CPU Hours: Total","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Biophysics] CPU Hours: Total","[Cell Biology] CPU Hours: Total","[Tectonics] CPU Hours: Total","[Experimental Systems] CPU Hours: Total","[Design and Computer-Integrated Engineering] CPU Hours: Total","[Algebra and Number Theory] CPU Hours: Total","[Solid-State and Microstructures] CPU Hours: Total","[Polar Aeronomy and Astrophysics] CPU Hours: Total","[Theoretical Physics] CPU Hours: Total","[Systematic and Population Biology] CPU Hours: Total","[Economics] CPU Hours: Total","[Global Atmospheric Research] CPU Hours: Total","[Decision, Risk, and Management Science] CPU Hours: Total","[Biochemistry and Molecular Structure and Function] CPU Hours: Total","[Volcanology and Mantle Geochemistry] CPU Hours: Total","[Seismology] CPU Hours: Total","[Geology and Paleontology] CPU Hours: Total","[Polar Meteorology] CPU Hours: Total","[Computer and Computation Theory] CPU Hours: Total","[Mechanics and Materials] CPU Hours: Total","[Extragalactic Astronomy and Cosmology] CPU Hours: Total","[Design, Tools, and Test] CPU Hours: Total","[Geophysics] CPU Hours: Total","[Law and Social Sciences] CPU Hours: Total" +2016-12,152195.7483,144475.4408,119217.1778,62491.4711,55820.4542,29999.2867,33446.5633,18811.7067,14800.0000,37.7500,18391.0000,14099.6133,14141.1200,13433.2406,13105.9733,12116.8122,9183.7456,7720.0703,8590.5158,6404.0900,3473.9867,5137.5000,2003.9100,2013.9756,1588.9133,647.6411,1240.8328,1441.0222,1183.6917,1021.5447,960.1333,611.2161,568.9292,134.0178,100.8417,54.4747,59.8692,28.1400,22.5389,1.0400 +2017-01,8465.3736,2898.9944,56.9511,6739.9578,11183.6664,4898.4422,0,3184.0233,4673.8133,19080.0167,0,1254.4625,0,371.6122,0,299.9489,1696.5272,987.0200,0,963.0756,1788.3289,60.5500,35.2583,0,0,870.5067,206.1100,3.4667,0,0,0,11.4333,21.4056,1.7419,0,27.1514,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Quarter-reference.csv index ebfff59d2a..58b7d75d4d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Total" -"2016 Q4",770775.9989 -"2017 Q1",69779.8381 +Quarter,"[Sociology] CPU Hours: Total","[Quantum Electronics, Waves, and Beams] CPU Hours: Total","[Organic and Macromolecular Chemistry] CPU Hours: Total","[Physical Chemistry] CPU Hours: Total","[Systems Prototyping and Fabrication] CPU Hours: Total","[Statistics and Probability] CPU Hours: Total","[Solid State Chemistry and Polymers] CPU Hours: Total","[Stellar Astronomy and Astrophysics] CPU Hours: Total","[Emerging Technologies Initiation] CPU Hours: Total","[Polar Ocean and Climate Systems] CPU Hours: Total","[Metals, Ceramics, and Electronic Materials] CPU Hours: Total","[Operations Research and Production Systems] CPU Hours: Total","[Structures and Building Systems] CPU Hours: Total","[Galactic Astronomy] CPU Hours: Total","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Biophysics] CPU Hours: Total","[Cell Biology] CPU Hours: Total","[Tectonics] CPU Hours: Total","[Experimental Systems] CPU Hours: Total","[Design and Computer-Integrated Engineering] CPU Hours: Total","[Algebra and Number Theory] CPU Hours: Total","[Solid-State and Microstructures] CPU Hours: Total","[Polar Aeronomy and Astrophysics] CPU Hours: Total","[Theoretical Physics] CPU Hours: Total","[Systematic and Population Biology] CPU Hours: Total","[Economics] CPU Hours: Total","[Global Atmospheric Research] CPU Hours: Total","[Decision, Risk, and Management Science] CPU Hours: Total","[Biochemistry and Molecular Structure and Function] CPU Hours: Total","[Volcanology and Mantle Geochemistry] CPU Hours: Total","[Seismology] CPU Hours: Total","[Geology and Paleontology] CPU Hours: Total","[Polar Meteorology] CPU Hours: Total","[Computer and Computation Theory] CPU Hours: Total","[Mechanics and Materials] CPU Hours: Total","[Extragalactic Astronomy and Cosmology] CPU Hours: Total","[Design, Tools, and Test] CPU Hours: Total","[Geophysics] CPU Hours: Total","[Law and Social Sciences] CPU Hours: Total" +"2016 Q4",152195.7483,144475.4408,119217.1778,62491.4711,55820.4542,29999.2867,33446.5633,18811.7067,14800.0000,37.7500,18391.0000,14099.6133,14141.1200,13433.2406,13105.9733,12116.8122,9183.7456,7720.0703,8590.5158,6404.0900,3473.9867,5137.5000,2003.9100,2013.9756,1588.9133,647.6411,1240.8328,1441.0222,1183.6917,1021.5447,960.1333,611.2161,568.9292,134.0178,100.8417,54.4747,59.8692,28.1400,22.5389,1.0400 +"2017 Q1",8465.3736,2898.9944,56.9511,6739.9578,11183.6664,4898.4422,0,3184.0233,4673.8133,19080.0167,0,1254.4625,0,371.6122,0,299.9489,1696.5272,987.0200,0,963.0756,1788.3289,60.5500,35.2583,0,0,870.5067,206.1100,3.4667,0,0,0,11.4333,21.4056,1.7419,0,27.1514,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Year-reference.csv index 7c1fe16803..89136c4c16 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Total" -2016,770775.9989 -2017,69779.8381 +Year,"[Sociology] CPU Hours: Total","[Quantum Electronics, Waves, and Beams] CPU Hours: Total","[Organic and Macromolecular Chemistry] CPU Hours: Total","[Physical Chemistry] CPU Hours: Total","[Systems Prototyping and Fabrication] CPU Hours: Total","[Statistics and Probability] CPU Hours: Total","[Solid State Chemistry and Polymers] CPU Hours: Total","[Stellar Astronomy and Astrophysics] CPU Hours: Total","[Emerging Technologies Initiation] CPU Hours: Total","[Polar Ocean and Climate Systems] CPU Hours: Total","[Metals, Ceramics, and Electronic Materials] CPU Hours: Total","[Operations Research and Production Systems] CPU Hours: Total","[Structures and Building Systems] CPU Hours: Total","[Galactic Astronomy] CPU Hours: Total","[Fluid, Particulate, and Hydraulic Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Biophysics] CPU Hours: Total","[Cell Biology] CPU Hours: Total","[Tectonics] CPU Hours: Total","[Experimental Systems] CPU Hours: Total","[Design and Computer-Integrated Engineering] CPU Hours: Total","[Algebra and Number Theory] CPU Hours: Total","[Solid-State and Microstructures] CPU Hours: Total","[Polar Aeronomy and Astrophysics] CPU Hours: Total","[Theoretical Physics] CPU Hours: Total","[Systematic and Population Biology] CPU Hours: Total","[Economics] CPU Hours: Total","[Global Atmospheric Research] CPU Hours: Total","[Decision, Risk, and Management Science] CPU Hours: Total","[Biochemistry and Molecular Structure and Function] CPU Hours: Total","[Volcanology and Mantle Geochemistry] CPU Hours: Total","[Seismology] CPU Hours: Total","[Geology and Paleontology] CPU Hours: Total","[Polar Meteorology] CPU Hours: Total","[Computer and Computation Theory] CPU Hours: Total","[Mechanics and Materials] CPU Hours: Total","[Extragalactic Astronomy and Cosmology] CPU Hours: Total","[Design, Tools, and Test] CPU Hours: Total","[Geophysics] CPU Hours: Total","[Law and Social Sciences] CPU Hours: Total" +2016,152195.7483,144475.4408,119217.1778,62491.4711,55820.4542,29999.2867,33446.5633,18811.7067,14800.0000,37.7500,18391.0000,14099.6133,14141.1200,13433.2406,13105.9733,12116.8122,9183.7456,7720.0703,8590.5158,6404.0900,3473.9867,5137.5000,2003.9100,2013.9756,1588.9133,647.6411,1240.8328,1441.0222,1183.6917,1021.5447,960.1333,611.2161,568.9292,134.0178,100.8417,54.4747,59.8692,28.1400,22.5389,1.0400 +2017,8465.3736,2898.9944,56.9511,6739.9578,11183.6664,4898.4422,0,3184.0233,4673.8133,19080.0167,0,1254.4625,0,371.6122,0,299.9489,1696.5272,987.0200,0,963.0756,1788.3289,60.5500,35.2583,0,0,870.5067,206.1100,3.4667,0,0,0,11.4333,21.4056,1.7419,0,27.1514,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Day-reference.csv index 1cb57e6a69..91e7ee4e0b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Node Hours: Total" -Unknown,156303.7475 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +"Quantum Electronics, Waves, and Beams",12343.6392 +Tectonics,8590.5158 +"Organic and Macromolecular Chemistry",7492.8064 +"Physical Chemistry",5412.7517 +"Statistics and Probability",2845.5633 +"Solid State Chemistry and Polymers",2367.6417 +"Stellar Astronomy and Astrophysics",1973.0481 +"Emerging Technologies Initiation",1622.8178 +"Polar Ocean and Climate Systems",1593.1472 +"Metals, Ceramics, and Electronic Materials",1532.5833 +"Cell Biology",1526.7692 +"Galactic Astronomy",1376.1239 +Biophysics,1233.9042 +Arts,1140.0328 +"Fluid, Particulate, and Hydraulic Systems",1092.1644 +"Experimental Systems",896.5864 +"Structures and Building Systems",883.8200 +"Solid-State and Microstructures",802.6467 +"Design and Computer-Integrated Engineering",458.9083 +"Algebra and Number Theory",433.1708 +"Decision, Risk, and Management Science",336.9017 +"Biochemistry and Molecular Structure and Function",251.4806 +"Global Atmospheric Research",180.5611 +"Systematic and Population Biology",150.5339 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +Economics,120.6086 +"Computer and Computation Theory",100.8417 +"Polar Aeronomy and Astrophysics",100.6989 +"Mechanics and Materials",81.6261 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +"Geology and Paleontology",54.6022 +"Volcanology and Mantle Geochemistry",48.0067 +"Design, Tools, and Test",2.3450 +Geophysics,1.1269 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Month-reference.csv index 1cb57e6a69..91e7ee4e0b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Node Hours: Total" -Unknown,156303.7475 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +"Quantum Electronics, Waves, and Beams",12343.6392 +Tectonics,8590.5158 +"Organic and Macromolecular Chemistry",7492.8064 +"Physical Chemistry",5412.7517 +"Statistics and Probability",2845.5633 +"Solid State Chemistry and Polymers",2367.6417 +"Stellar Astronomy and Astrophysics",1973.0481 +"Emerging Technologies Initiation",1622.8178 +"Polar Ocean and Climate Systems",1593.1472 +"Metals, Ceramics, and Electronic Materials",1532.5833 +"Cell Biology",1526.7692 +"Galactic Astronomy",1376.1239 +Biophysics,1233.9042 +Arts,1140.0328 +"Fluid, Particulate, and Hydraulic Systems",1092.1644 +"Experimental Systems",896.5864 +"Structures and Building Systems",883.8200 +"Solid-State and Microstructures",802.6467 +"Design and Computer-Integrated Engineering",458.9083 +"Algebra and Number Theory",433.1708 +"Decision, Risk, and Management Science",336.9017 +"Biochemistry and Molecular Structure and Function",251.4806 +"Global Atmospheric Research",180.5611 +"Systematic and Population Biology",150.5339 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +Economics,120.6086 +"Computer and Computation Theory",100.8417 +"Polar Aeronomy and Astrophysics",100.6989 +"Mechanics and Materials",81.6261 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +"Geology and Paleontology",54.6022 +"Volcanology and Mantle Geochemistry",48.0067 +"Design, Tools, and Test",2.3450 +Geophysics,1.1269 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Quarter-reference.csv index 1cb57e6a69..91e7ee4e0b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Node Hours: Total" -Unknown,156303.7475 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +"Quantum Electronics, Waves, and Beams",12343.6392 +Tectonics,8590.5158 +"Organic and Macromolecular Chemistry",7492.8064 +"Physical Chemistry",5412.7517 +"Statistics and Probability",2845.5633 +"Solid State Chemistry and Polymers",2367.6417 +"Stellar Astronomy and Astrophysics",1973.0481 +"Emerging Technologies Initiation",1622.8178 +"Polar Ocean and Climate Systems",1593.1472 +"Metals, Ceramics, and Electronic Materials",1532.5833 +"Cell Biology",1526.7692 +"Galactic Astronomy",1376.1239 +Biophysics,1233.9042 +Arts,1140.0328 +"Fluid, Particulate, and Hydraulic Systems",1092.1644 +"Experimental Systems",896.5864 +"Structures and Building Systems",883.8200 +"Solid-State and Microstructures",802.6467 +"Design and Computer-Integrated Engineering",458.9083 +"Algebra and Number Theory",433.1708 +"Decision, Risk, and Management Science",336.9017 +"Biochemistry and Molecular Structure and Function",251.4806 +"Global Atmospheric Research",180.5611 +"Systematic and Population Biology",150.5339 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +Economics,120.6086 +"Computer and Computation Theory",100.8417 +"Polar Aeronomy and Astrophysics",100.6989 +"Mechanics and Materials",81.6261 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +"Geology and Paleontology",54.6022 +"Volcanology and Mantle Geochemistry",48.0067 +"Design, Tools, and Test",2.3450 +Geophysics,1.1269 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Year-reference.csv index 1cb57e6a69..91e7ee4e0b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Node Hours: Total" -Unknown,156303.7475 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +"Quantum Electronics, Waves, and Beams",12343.6392 +Tectonics,8590.5158 +"Organic and Macromolecular Chemistry",7492.8064 +"Physical Chemistry",5412.7517 +"Statistics and Probability",2845.5633 +"Solid State Chemistry and Polymers",2367.6417 +"Stellar Astronomy and Astrophysics",1973.0481 +"Emerging Technologies Initiation",1622.8178 +"Polar Ocean and Climate Systems",1593.1472 +"Metals, Ceramics, and Electronic Materials",1532.5833 +"Cell Biology",1526.7692 +"Galactic Astronomy",1376.1239 +Biophysics,1233.9042 +Arts,1140.0328 +"Fluid, Particulate, and Hydraulic Systems",1092.1644 +"Experimental Systems",896.5864 +"Structures and Building Systems",883.8200 +"Solid-State and Microstructures",802.6467 +"Design and Computer-Integrated Engineering",458.9083 +"Algebra and Number Theory",433.1708 +"Decision, Risk, and Management Science",336.9017 +"Biochemistry and Molecular Structure and Function",251.4806 +"Global Atmospheric Research",180.5611 +"Systematic and Population Biology",150.5339 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +Economics,120.6086 +"Computer and Computation Theory",100.8417 +"Polar Aeronomy and Astrophysics",100.6989 +"Mechanics and Materials",81.6261 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +"Geology and Paleontology",54.6022 +"Volcanology and Mantle Geochemistry",48.0067 +"Design, Tools, and Test",2.3450 +Geophysics,1.1269 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Day-reference.csv index fa9b9b948b..384962b9cd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Total" -2016-12-22,33.6881 -2016-12-23,56.6036 -2016-12-24,72.0000 -2016-12-25,80.5078 -2016-12-26,157.5208 -2016-12-27,1206.3922 -2016-12-28,8614.6167 -2016-12-29,28528.4969 -2016-12-30,52308.5600 -2016-12-31,47388.7967 -2017-01-01,17856.5647 +Day,"[Systems Prototyping and Fabrication] Node Hours: Total","[Sociology] Node Hours: Total","[Operations Research and Production Systems] Node Hours: Total","[Quantum Electronics, Waves, and Beams] Node Hours: Total","[Tectonics] Node Hours: Total","[Organic and Macromolecular Chemistry] Node Hours: Total","[Physical Chemistry] Node Hours: Total","[Statistics and Probability] Node Hours: Total","[Solid State Chemistry and Polymers] Node Hours: Total","[Stellar Astronomy and Astrophysics] Node Hours: Total","[Emerging Technologies Initiation] Node Hours: Total","[Polar Ocean and Climate Systems] Node Hours: Total","[Metals, Ceramics, and Electronic Materials] Node Hours: Total","[Cell Biology] Node Hours: Total","[Galactic Astronomy] Node Hours: Total","[Biophysics] Node Hours: Total","[Arts] Node Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Node Hours: Total","[Experimental Systems] Node Hours: Total","[Structures and Building Systems] Node Hours: Total","[Solid-State and Microstructures] Node Hours: Total","[Design and Computer-Integrated Engineering] Node Hours: Total","[Algebra and Number Theory] Node Hours: Total","[Decision, Risk, and Management Science] Node Hours: Total","[Biochemistry and Molecular Structure and Function] Node Hours: Total","[Global Atmospheric Research] Node Hours: Total","[Systematic and Population Biology] Node Hours: Total","[Polar Meteorology] Node Hours: Total","[Theoretical Physics] Node Hours: Total","[Economics] Node Hours: Total","[Computer and Computation Theory] Node Hours: Total","[Polar Aeronomy and Astrophysics] Node Hours: Total","[Mechanics and Materials] Node Hours: Total","[Seismology] Node Hours: Total","[Extragalactic Astronomy and Cosmology] Node Hours: Total","[Geology and Paleontology] Node Hours: Total","[Volcanology and Mantle Geochemistry] Node Hours: Total","[Design, Tools, and Test] Node Hours: Total","[Geophysics] Node Hours: Total","[Law and Social Sciences] Node Hours: Total" +2016-12-22,0,0,0,0,0,0,16.9417,0,0,0,0,0,0,0,0,16.7464,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,24.0000,0,0,0,0,0,0,0,8.6036,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,24.0000,0,0,0,0,0,0,0,24.0000,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,32.5078,0,0,0,0,0,0,0,24.0000,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,96.0000,13.5208,0,0,0,0,0,0,24.0000,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,3.2167,0,311.6178,0,0,115.3094,124.7214,331.1156,123.9850,0,0,0,69.8267,52.2964,54.3978,0,0,0,0,0,0,0,0,19.9056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,953.0369,24.0000,1962.8444,1827.6600,0,1841.7169,461.3931,168.4211,502.6856,220.6683,0,0,0,176.3833,144.0000,216.0000,0,0,43.9492,0,0,0,28.0381,0,24.0000,0,0,0,15.1192,0,0,0,0,0,0,0,4.7006,0,0,0 +2016-12-29,12583.2597,301.8189,3901.6422,4150.0822,0,2472.0000,933.4136,501.7553,848.2247,420.2000,152.8733,0,485.1050,479.3708,208.6497,216.0000,47.7900,0,168.7433,102.7444,3.6200,0,216.0000,26.9772,24.0000,129.7778,0,0,72.0000,0,10.0983,37.9494,0,10.4008,0,0,24.0000,0,0,0 +2016-12-30,21766.1511,6638.2006,5473.3125,3949.6347,3055.8617,2475.2589,1433.8564,397.7425,521.4136,451.4903,510.5000,0,914.9350,498.0953,664.9178,216.0000,629.4331,617.0356,321.9956,575.7072,67.3875,0,160.0869,296.1253,175.8633,50.3500,51.2486,108.1047,45.2903,27.2458,82.1119,48.0006,27.2308,13.6064,13.9453,7.5778,19.3061,2.3450,1.1269,0.0650 +2016-12-31,20518.0064,8599.9281,2761.8142,1871.4597,5534.6542,696.7117,1625.9722,1112.6033,164.2022,491.3692,569.9600,3.1458,132.5433,179.7156,202.4067,216.4508,430.1536,475.1289,241.5139,205.3683,714.0100,299.0033,24.0000,13.7992,7.7117,0,10.4561,25.9131,0,76.1869,8.6314,14.7489,27.2439,45.3169,45.9239,42.7433,0,0,0,0 +2017-01-01,11183.6664,932.0322,1254.4625,233.1847,0,7.1189,649.3575,526.7989,0,265.3353,389.4844,1590.0014,0,123.3775,23.2497,202.3092,32.6561,0,120.3844,0,17.6292,159.9050,5.0458,0,0,0.4333,88.8292,1.7419,0,17.1758,0,0,27.1514,0.9528,0,4.2811,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Month-reference.csv index 398edeb836..5bf98609d8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Total" -2016-12,138447.1828 -2017-01,17856.5647 +Month,"[Systems Prototyping and Fabrication] Node Hours: Total","[Sociology] Node Hours: Total","[Operations Research and Production Systems] Node Hours: Total","[Quantum Electronics, Waves, and Beams] Node Hours: Total","[Tectonics] Node Hours: Total","[Organic and Macromolecular Chemistry] Node Hours: Total","[Physical Chemistry] Node Hours: Total","[Statistics and Probability] Node Hours: Total","[Solid State Chemistry and Polymers] Node Hours: Total","[Stellar Astronomy and Astrophysics] Node Hours: Total","[Emerging Technologies Initiation] Node Hours: Total","[Polar Ocean and Climate Systems] Node Hours: Total","[Metals, Ceramics, and Electronic Materials] Node Hours: Total","[Cell Biology] Node Hours: Total","[Galactic Astronomy] Node Hours: Total","[Biophysics] Node Hours: Total","[Arts] Node Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Node Hours: Total","[Experimental Systems] Node Hours: Total","[Structures and Building Systems] Node Hours: Total","[Solid-State and Microstructures] Node Hours: Total","[Design and Computer-Integrated Engineering] Node Hours: Total","[Algebra and Number Theory] Node Hours: Total","[Decision, Risk, and Management Science] Node Hours: Total","[Biochemistry and Molecular Structure and Function] Node Hours: Total","[Global Atmospheric Research] Node Hours: Total","[Systematic and Population Biology] Node Hours: Total","[Polar Meteorology] Node Hours: Total","[Theoretical Physics] Node Hours: Total","[Economics] Node Hours: Total","[Computer and Computation Theory] Node Hours: Total","[Polar Aeronomy and Astrophysics] Node Hours: Total","[Mechanics and Materials] Node Hours: Total","[Seismology] Node Hours: Total","[Extragalactic Astronomy and Cosmology] Node Hours: Total","[Geology and Paleontology] Node Hours: Total","[Volcanology and Mantle Geochemistry] Node Hours: Total","[Design, Tools, and Test] Node Hours: Total","[Geophysics] Node Hours: Total","[Law and Social Sciences] Node Hours: Total" +2016-12,55820.4542,15567.1642,14099.6133,12110.4544,8590.5158,7485.6875,4763.3942,2318.7644,2367.6417,1707.7128,1233.3333,3.1458,1532.5833,1403.3917,1352.8742,1031.5950,1107.3767,1092.1644,776.2019,883.8200,785.0175,299.0033,428.1250,336.9017,251.4806,180.1278,61.7047,134.0178,132.4094,103.4328,100.8417,100.6989,54.4747,69.3242,59.8692,50.3211,48.0067,2.3450,1.1269,0.0650 +2017-01,11183.6664,932.0322,1254.4625,233.1847,0,7.1189,649.3575,526.7989,0,265.3353,389.4844,1590.0014,0,123.3775,23.2497,202.3092,32.6561,0,120.3844,0,17.6292,159.9050,5.0458,0,0,0.4333,88.8292,1.7419,0,17.1758,0,0,27.1514,0.9528,0,4.2811,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Quarter-reference.csv index 1c5cbe6a2c..97c0c150f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Total" -"2016 Q4",138447.1828 -"2017 Q1",17856.5647 +Quarter,"[Systems Prototyping and Fabrication] Node Hours: Total","[Sociology] Node Hours: Total","[Operations Research and Production Systems] Node Hours: Total","[Quantum Electronics, Waves, and Beams] Node Hours: Total","[Tectonics] Node Hours: Total","[Organic and Macromolecular Chemistry] Node Hours: Total","[Physical Chemistry] Node Hours: Total","[Statistics and Probability] Node Hours: Total","[Solid State Chemistry and Polymers] Node Hours: Total","[Stellar Astronomy and Astrophysics] Node Hours: Total","[Emerging Technologies Initiation] Node Hours: Total","[Polar Ocean and Climate Systems] Node Hours: Total","[Metals, Ceramics, and Electronic Materials] Node Hours: Total","[Cell Biology] Node Hours: Total","[Galactic Astronomy] Node Hours: Total","[Biophysics] Node Hours: Total","[Arts] Node Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Node Hours: Total","[Experimental Systems] Node Hours: Total","[Structures and Building Systems] Node Hours: Total","[Solid-State and Microstructures] Node Hours: Total","[Design and Computer-Integrated Engineering] Node Hours: Total","[Algebra and Number Theory] Node Hours: Total","[Decision, Risk, and Management Science] Node Hours: Total","[Biochemistry and Molecular Structure and Function] Node Hours: Total","[Global Atmospheric Research] Node Hours: Total","[Systematic and Population Biology] Node Hours: Total","[Polar Meteorology] Node Hours: Total","[Theoretical Physics] Node Hours: Total","[Economics] Node Hours: Total","[Computer and Computation Theory] Node Hours: Total","[Polar Aeronomy and Astrophysics] Node Hours: Total","[Mechanics and Materials] Node Hours: Total","[Seismology] Node Hours: Total","[Extragalactic Astronomy and Cosmology] Node Hours: Total","[Geology and Paleontology] Node Hours: Total","[Volcanology and Mantle Geochemistry] Node Hours: Total","[Design, Tools, and Test] Node Hours: Total","[Geophysics] Node Hours: Total","[Law and Social Sciences] Node Hours: Total" +"2016 Q4",55820.4542,15567.1642,14099.6133,12110.4544,8590.5158,7485.6875,4763.3942,2318.7644,2367.6417,1707.7128,1233.3333,3.1458,1532.5833,1403.3917,1352.8742,1031.5950,1107.3767,1092.1644,776.2019,883.8200,785.0175,299.0033,428.1250,336.9017,251.4806,180.1278,61.7047,134.0178,132.4094,103.4328,100.8417,100.6989,54.4747,69.3242,59.8692,50.3211,48.0067,2.3450,1.1269,0.0650 +"2017 Q1",11183.6664,932.0322,1254.4625,233.1847,0,7.1189,649.3575,526.7989,0,265.3353,389.4844,1590.0014,0,123.3775,23.2497,202.3092,32.6561,0,120.3844,0,17.6292,159.9050,5.0458,0,0,0.4333,88.8292,1.7419,0,17.1758,0,0,27.1514,0.9528,0,4.2811,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Year-reference.csv index 4cdf534e6c..7892e91bd4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_node_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Total" -2016,138447.1828 -2017,17856.5647 +Year,"[Systems Prototyping and Fabrication] Node Hours: Total","[Sociology] Node Hours: Total","[Operations Research and Production Systems] Node Hours: Total","[Quantum Electronics, Waves, and Beams] Node Hours: Total","[Tectonics] Node Hours: Total","[Organic and Macromolecular Chemistry] Node Hours: Total","[Physical Chemistry] Node Hours: Total","[Statistics and Probability] Node Hours: Total","[Solid State Chemistry and Polymers] Node Hours: Total","[Stellar Astronomy and Astrophysics] Node Hours: Total","[Emerging Technologies Initiation] Node Hours: Total","[Polar Ocean and Climate Systems] Node Hours: Total","[Metals, Ceramics, and Electronic Materials] Node Hours: Total","[Cell Biology] Node Hours: Total","[Galactic Astronomy] Node Hours: Total","[Biophysics] Node Hours: Total","[Arts] Node Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Node Hours: Total","[Experimental Systems] Node Hours: Total","[Structures and Building Systems] Node Hours: Total","[Solid-State and Microstructures] Node Hours: Total","[Design and Computer-Integrated Engineering] Node Hours: Total","[Algebra and Number Theory] Node Hours: Total","[Decision, Risk, and Management Science] Node Hours: Total","[Biochemistry and Molecular Structure and Function] Node Hours: Total","[Global Atmospheric Research] Node Hours: Total","[Systematic and Population Biology] Node Hours: Total","[Polar Meteorology] Node Hours: Total","[Theoretical Physics] Node Hours: Total","[Economics] Node Hours: Total","[Computer and Computation Theory] Node Hours: Total","[Polar Aeronomy and Astrophysics] Node Hours: Total","[Mechanics and Materials] Node Hours: Total","[Seismology] Node Hours: Total","[Extragalactic Astronomy and Cosmology] Node Hours: Total","[Geology and Paleontology] Node Hours: Total","[Volcanology and Mantle Geochemistry] Node Hours: Total","[Design, Tools, and Test] Node Hours: Total","[Geophysics] Node Hours: Total","[Law and Social Sciences] Node Hours: Total" +2016,55820.4542,15567.1642,14099.6133,12110.4544,8590.5158,7485.6875,4763.3942,2318.7644,2367.6417,1707.7128,1233.3333,3.1458,1532.5833,1403.3917,1352.8742,1031.5950,1107.3767,1092.1644,776.2019,883.8200,785.0175,299.0033,428.1250,336.9017,251.4806,180.1278,61.7047,134.0178,132.4094,103.4328,100.8417,100.6989,54.4747,69.3242,59.8692,50.3211,48.0067,2.3450,1.1269,0.0650 +2017,11183.6664,932.0322,1254.4625,233.1847,0,7.1189,649.3575,526.7989,0,265.3353,389.4844,1590.0014,0,123.3775,23.2497,202.3092,32.6561,0,120.3844,0,17.6292,159.9050,5.0458,0,0,0.4333,88.8292,1.7419,0,17.1758,0,0,27.1514,0.9528,0,4.2811,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Day-reference.csv index 8687d1efc1..7dda11cfa6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Total" -Unknown,306345.3608 +"Galactic Astronomy",163477.1903 +Sociology,112939.7331 +"Cell Biology",5136.8678 +"Solid State Chemistry and Polymers",5128.4506 +"Polar Ocean and Climate Systems",4056.0075 +Tectonics,3927.5247 +"Systematic and Population Biology",3030.4719 +"Solid-State and Microstructures",2704.6794 +"Quantum Electronics, Waves, and Beams",1959.9481 +"Decision, Risk, and Management Science",1953.8047 +"Systems Prototyping and Fabrication",544.5967 +"Physical Chemistry",443.1597 +Arts,321.4447 +"Stellar Astronomy and Astrophysics",184.2997 +"Biochemistry and Molecular Structure and Function",122.8625 +"Polar Aeronomy and Astrophysics",105.4822 +"Global Atmospheric Research",62.0436 +"Algebra and Number Theory",48.5308 +"Statistics and Probability",36.5339 +"Emerging Technologies Initiation",30.1542 +Economics,20.6675 +"Fluid, Particulate, and Hydraulic Systems",20.0331 +"Design and Computer-Integrated Engineering",19.3700 +"Operations Research and Production Systems",17.6803 +"Metals, Ceramics, and Electronic Materials",13.9250 +"Polar Meteorology",12.6592 +"Theoretical Physics",11.1744 +"Experimental Systems",7.7419 +"Computer and Computation Theory",6.4781 +Biophysics,1.2361 +Seismology,0.1747 +"Geology and Paleontology",0.1614 +"Extragalactic Astronomy and Cosmology",0.1408 +"Design, Tools, and Test",0.0978 +Geophysics,0.0147 +"Mechanics and Materials",0.0106 +"Structures and Building Systems",0.0047 +"Organic and Macromolecular Chemistry",0.0042 +"Volcanology and Mantle Geochemistry",0.0003 +"Law and Social Sciences",0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Month-reference.csv index 8687d1efc1..7dda11cfa6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Total" -Unknown,306345.3608 +"Galactic Astronomy",163477.1903 +Sociology,112939.7331 +"Cell Biology",5136.8678 +"Solid State Chemistry and Polymers",5128.4506 +"Polar Ocean and Climate Systems",4056.0075 +Tectonics,3927.5247 +"Systematic and Population Biology",3030.4719 +"Solid-State and Microstructures",2704.6794 +"Quantum Electronics, Waves, and Beams",1959.9481 +"Decision, Risk, and Management Science",1953.8047 +"Systems Prototyping and Fabrication",544.5967 +"Physical Chemistry",443.1597 +Arts,321.4447 +"Stellar Astronomy and Astrophysics",184.2997 +"Biochemistry and Molecular Structure and Function",122.8625 +"Polar Aeronomy and Astrophysics",105.4822 +"Global Atmospheric Research",62.0436 +"Algebra and Number Theory",48.5308 +"Statistics and Probability",36.5339 +"Emerging Technologies Initiation",30.1542 +Economics,20.6675 +"Fluid, Particulate, and Hydraulic Systems",20.0331 +"Design and Computer-Integrated Engineering",19.3700 +"Operations Research and Production Systems",17.6803 +"Metals, Ceramics, and Electronic Materials",13.9250 +"Polar Meteorology",12.6592 +"Theoretical Physics",11.1744 +"Experimental Systems",7.7419 +"Computer and Computation Theory",6.4781 +Biophysics,1.2361 +Seismology,0.1747 +"Geology and Paleontology",0.1614 +"Extragalactic Astronomy and Cosmology",0.1408 +"Design, Tools, and Test",0.0978 +Geophysics,0.0147 +"Mechanics and Materials",0.0106 +"Structures and Building Systems",0.0047 +"Organic and Macromolecular Chemistry",0.0042 +"Volcanology and Mantle Geochemistry",0.0003 +"Law and Social Sciences",0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Quarter-reference.csv index 8687d1efc1..7dda11cfa6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Total" -Unknown,306345.3608 +"Galactic Astronomy",163477.1903 +Sociology,112939.7331 +"Cell Biology",5136.8678 +"Solid State Chemistry and Polymers",5128.4506 +"Polar Ocean and Climate Systems",4056.0075 +Tectonics,3927.5247 +"Systematic and Population Biology",3030.4719 +"Solid-State and Microstructures",2704.6794 +"Quantum Electronics, Waves, and Beams",1959.9481 +"Decision, Risk, and Management Science",1953.8047 +"Systems Prototyping and Fabrication",544.5967 +"Physical Chemistry",443.1597 +Arts,321.4447 +"Stellar Astronomy and Astrophysics",184.2997 +"Biochemistry and Molecular Structure and Function",122.8625 +"Polar Aeronomy and Astrophysics",105.4822 +"Global Atmospheric Research",62.0436 +"Algebra and Number Theory",48.5308 +"Statistics and Probability",36.5339 +"Emerging Technologies Initiation",30.1542 +Economics,20.6675 +"Fluid, Particulate, and Hydraulic Systems",20.0331 +"Design and Computer-Integrated Engineering",19.3700 +"Operations Research and Production Systems",17.6803 +"Metals, Ceramics, and Electronic Materials",13.9250 +"Polar Meteorology",12.6592 +"Theoretical Physics",11.1744 +"Experimental Systems",7.7419 +"Computer and Computation Theory",6.4781 +Biophysics,1.2361 +Seismology,0.1747 +"Geology and Paleontology",0.1614 +"Extragalactic Astronomy and Cosmology",0.1408 +"Design, Tools, and Test",0.0978 +Geophysics,0.0147 +"Mechanics and Materials",0.0106 +"Structures and Building Systems",0.0047 +"Organic and Macromolecular Chemistry",0.0042 +"Volcanology and Mantle Geochemistry",0.0003 +"Law and Social Sciences",0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Year-reference.csv index 8687d1efc1..7dda11cfa6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wait Hours: Total" -Unknown,306345.3608 +"Galactic Astronomy",163477.1903 +Sociology,112939.7331 +"Cell Biology",5136.8678 +"Solid State Chemistry and Polymers",5128.4506 +"Polar Ocean and Climate Systems",4056.0075 +Tectonics,3927.5247 +"Systematic and Population Biology",3030.4719 +"Solid-State and Microstructures",2704.6794 +"Quantum Electronics, Waves, and Beams",1959.9481 +"Decision, Risk, and Management Science",1953.8047 +"Systems Prototyping and Fabrication",544.5967 +"Physical Chemistry",443.1597 +Arts,321.4447 +"Stellar Astronomy and Astrophysics",184.2997 +"Biochemistry and Molecular Structure and Function",122.8625 +"Polar Aeronomy and Astrophysics",105.4822 +"Global Atmospheric Research",62.0436 +"Algebra and Number Theory",48.5308 +"Statistics and Probability",36.5339 +"Emerging Technologies Initiation",30.1542 +Economics,20.6675 +"Fluid, Particulate, and Hydraulic Systems",20.0331 +"Design and Computer-Integrated Engineering",19.3700 +"Operations Research and Production Systems",17.6803 +"Metals, Ceramics, and Electronic Materials",13.9250 +"Polar Meteorology",12.6592 +"Theoretical Physics",11.1744 +"Experimental Systems",7.7419 +"Computer and Computation Theory",6.4781 +Biophysics,1.2361 +Seismology,0.1747 +"Geology and Paleontology",0.1614 +"Extragalactic Astronomy and Cosmology",0.1408 +"Design, Tools, and Test",0.0978 +Geophysics,0.0147 +"Mechanics and Materials",0.0106 +"Structures and Building Systems",0.0047 +"Organic and Macromolecular Chemistry",0.0042 +"Volcanology and Mantle Geochemistry",0.0003 +"Law and Social Sciences",0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Day-reference.csv index 5215699996..f83f085322 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wait Hours: Total" -2016-12-22,9.3325 -2016-12-23,9.5964 -2016-12-24,0.0000 -2016-12-25,110.8856 -2016-12-26,0.0033 -2016-12-27,1978.2519 -2016-12-28,3598.3319 -2016-12-29,6101.8714 -2016-12-30,195282.2372 -2016-12-31,73421.2575 -2017-01-01,25833.5931 +Day,"[Galactic Astronomy] Wait Hours: Total","[Sociology] Wait Hours: Total","[Cell Biology] Wait Hours: Total","[Solid State Chemistry and Polymers] Wait Hours: Total","[Polar Ocean and Climate Systems] Wait Hours: Total","[Tectonics] Wait Hours: Total","[Systematic and Population Biology] Wait Hours: Total","[Solid-State and Microstructures] Wait Hours: Total","[Quantum Electronics, Waves, and Beams] Wait Hours: Total","[Decision, Risk, and Management Science] Wait Hours: Total","[Systems Prototyping and Fabrication] Wait Hours: Total","[Physical Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Stellar Astronomy and Astrophysics] Wait Hours: Total","[Biochemistry and Molecular Structure and Function] Wait Hours: Total","[Polar Aeronomy and Astrophysics] Wait Hours: Total","[Global Atmospheric Research] Wait Hours: Total","[Algebra and Number Theory] Wait Hours: Total","[Statistics and Probability] Wait Hours: Total","[Emerging Technologies Initiation] Wait Hours: Total","[Economics] Wait Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Total","[Design and Computer-Integrated Engineering] Wait Hours: Total","[Operations Research and Production Systems] Wait Hours: Total","[Metals, Ceramics, and Electronic Materials] Wait Hours: Total","[Polar Meteorology] Wait Hours: Total","[Theoretical Physics] Wait Hours: Total","[Experimental Systems] Wait Hours: Total","[Computer and Computation Theory] Wait Hours: Total","[Biophysics] Wait Hours: Total","[Seismology] Wait Hours: Total","[Geology and Paleontology] Wait Hours: Total","[Extragalactic Astronomy and Cosmology] Wait Hours: Total","[Design, Tools, and Test] Wait Hours: Total","[Geophysics] Wait Hours: Total","[Mechanics and Materials] Wait Hours: Total","[Structures and Building Systems] Wait Hours: Total","[Organic and Macromolecular Chemistry] Wait Hours: Total","[Volcanology and Mantle Geochemistry] Wait Hours: Total","[Law and Social Sciences] Wait Hours: Total" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,9.3322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0003,0,0,0,0,0,0,0,0,0,0 +2016-12-23,9.5964,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0.0000,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0.0000,0,0,0,0,0,0,0,0,0,0,110.8856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0.0000,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0.0033,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0.0028,0.0000,1367.4053,172.7719,0,0,0,0,311.1344,0,0,0.0289,0,76.0861,50.8225,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0,0,0 +2016-12-28,0.0000,0.0000,1403.6350,723.1878,0,0,0,0,1296.2100,0,5.6581,42.4475,0,36.8761,0.0000,0,0,47.7519,18.4800,0,0,0,0,10.5775,0,0,11.1744,2.3317,0,0.0000,0,0,0,0,0,0,0,0.0017,0.0003,0 +2016-12-29,2704.7964,1973.6497,627.0644,288.5578,0,0,0,0.0044,334.2367,0.7922,32.6300,45.4447,9.5847,11.7164,0.0000,0.0017,25.7286,0.0000,17.8439,10.4372,0,0,0,3.9286,13.9250,0,0.0000,1.4369,0.0894,0.0000,0.0000,0,0,0,0,0,0.0025,0.0000,0.0000,0 +2016-12-30,160667.2464,26578.5867,331.7789,2269.2967,0,1857.6733,1170.3947,54.0756,0.0111,1436.2097,221.0947,98.0058,311.8600,44.7175,72.0400,105.4806,0.0000,0.7789,0.0000,7.3803,11.9272,20.0331,0,2.2686,0.0000,12.1381,0.0000,2.5139,6.3886,0.0000,0.0000,0.1611,0.0575,0.0978,0.0147,0.0028,0.0022,0.0008,0.0000,0.0000 +2016-12-31,95.5417,64555.5128,1406.9842,1674.6364,0.3231,2069.8514,33.5839,2650.5994,0.0031,516.8028,277.8381,100.6983,0.0000,7.6042,0.0000,0.0000,0,0.0000,0.2067,0.3128,8.7356,0.0000,19.3700,0.5711,0.0000,0.5147,0,1.3047,0.0000,0.0011,0.1747,0.0000,0.0833,0,0,0.0031,0.0000,0.0006,0,0 +2017-01-01,0.0067,19831.9839,0.0000,0,4055.6844,0,1826.4933,0.0000,18.3528,0,7.3758,36.3167,0.0000,7.2994,0,0,36.3150,0.0000,0.0000,12.0239,0.0047,0,0.0000,0.3344,0,0.0064,0,0.1547,0,1.2347,0.0000,0.0003,0,0,0,0.0047,0,0.0011,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Month-reference.csv index b1b7d839ae..6582e95fbe 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wait Hours: Total" -2016-12,280511.7678 -2017-01,25833.5931 +Month,"[Galactic Astronomy] Wait Hours: Total","[Sociology] Wait Hours: Total","[Cell Biology] Wait Hours: Total","[Solid State Chemistry and Polymers] Wait Hours: Total","[Polar Ocean and Climate Systems] Wait Hours: Total","[Tectonics] Wait Hours: Total","[Systematic and Population Biology] Wait Hours: Total","[Solid-State and Microstructures] Wait Hours: Total","[Quantum Electronics, Waves, and Beams] Wait Hours: Total","[Decision, Risk, and Management Science] Wait Hours: Total","[Systems Prototyping and Fabrication] Wait Hours: Total","[Physical Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Stellar Astronomy and Astrophysics] Wait Hours: Total","[Biochemistry and Molecular Structure and Function] Wait Hours: Total","[Polar Aeronomy and Astrophysics] Wait Hours: Total","[Global Atmospheric Research] Wait Hours: Total","[Algebra and Number Theory] Wait Hours: Total","[Statistics and Probability] Wait Hours: Total","[Emerging Technologies Initiation] Wait Hours: Total","[Economics] Wait Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Total","[Design and Computer-Integrated Engineering] Wait Hours: Total","[Operations Research and Production Systems] Wait Hours: Total","[Metals, Ceramics, and Electronic Materials] Wait Hours: Total","[Polar Meteorology] Wait Hours: Total","[Theoretical Physics] Wait Hours: Total","[Experimental Systems] Wait Hours: Total","[Computer and Computation Theory] Wait Hours: Total","[Biophysics] Wait Hours: Total","[Seismology] Wait Hours: Total","[Geology and Paleontology] Wait Hours: Total","[Extragalactic Astronomy and Cosmology] Wait Hours: Total","[Design, Tools, and Test] Wait Hours: Total","[Geophysics] Wait Hours: Total","[Mechanics and Materials] Wait Hours: Total","[Structures and Building Systems] Wait Hours: Total","[Organic and Macromolecular Chemistry] Wait Hours: Total","[Volcanology and Mantle Geochemistry] Wait Hours: Total","[Law and Social Sciences] Wait Hours: Total" +2016-12,163477.1836,93107.7492,5136.8678,5128.4506,0.3231,3927.5247,1203.9786,2704.6794,1941.5953,1953.8047,537.2208,406.8431,321.4447,177.0003,122.8625,105.4822,25.7286,48.5308,36.5339,18.1303,20.6628,20.0331,19.3700,17.3458,13.9250,12.6528,11.1744,7.5872,6.4781,0.0014,0.1747,0.1611,0.1408,0.0978,0.0147,0.0058,0.0047,0.0031,0.0003,0.0000 +2017-01,0.0067,19831.9839,0.0000,0,4055.6844,0,1826.4933,0.0000,18.3528,0,7.3758,36.3167,0.0000,7.2994,0,0,36.3150,0.0000,0.0000,12.0239,0.0047,0,0.0000,0.3344,0,0.0064,0,0.1547,0,1.2347,0.0000,0.0003,0,0,0,0.0047,0,0.0011,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Quarter-reference.csv index 5b680af454..711e2f8ec9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wait Hours: Total" -"2016 Q4",280511.7678 -"2017 Q1",25833.5931 +Quarter,"[Galactic Astronomy] Wait Hours: Total","[Sociology] Wait Hours: Total","[Cell Biology] Wait Hours: Total","[Solid State Chemistry and Polymers] Wait Hours: Total","[Polar Ocean and Climate Systems] Wait Hours: Total","[Tectonics] Wait Hours: Total","[Systematic and Population Biology] Wait Hours: Total","[Solid-State and Microstructures] Wait Hours: Total","[Quantum Electronics, Waves, and Beams] Wait Hours: Total","[Decision, Risk, and Management Science] Wait Hours: Total","[Systems Prototyping and Fabrication] Wait Hours: Total","[Physical Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Stellar Astronomy and Astrophysics] Wait Hours: Total","[Biochemistry and Molecular Structure and Function] Wait Hours: Total","[Polar Aeronomy and Astrophysics] Wait Hours: Total","[Global Atmospheric Research] Wait Hours: Total","[Algebra and Number Theory] Wait Hours: Total","[Statistics and Probability] Wait Hours: Total","[Emerging Technologies Initiation] Wait Hours: Total","[Economics] Wait Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Total","[Design and Computer-Integrated Engineering] Wait Hours: Total","[Operations Research and Production Systems] Wait Hours: Total","[Metals, Ceramics, and Electronic Materials] Wait Hours: Total","[Polar Meteorology] Wait Hours: Total","[Theoretical Physics] Wait Hours: Total","[Experimental Systems] Wait Hours: Total","[Computer and Computation Theory] Wait Hours: Total","[Biophysics] Wait Hours: Total","[Seismology] Wait Hours: Total","[Geology and Paleontology] Wait Hours: Total","[Extragalactic Astronomy and Cosmology] Wait Hours: Total","[Design, Tools, and Test] Wait Hours: Total","[Geophysics] Wait Hours: Total","[Mechanics and Materials] Wait Hours: Total","[Structures and Building Systems] Wait Hours: Total","[Organic and Macromolecular Chemistry] Wait Hours: Total","[Volcanology and Mantle Geochemistry] Wait Hours: Total","[Law and Social Sciences] Wait Hours: Total" +"2016 Q4",163477.1836,93107.7492,5136.8678,5128.4506,0.3231,3927.5247,1203.9786,2704.6794,1941.5953,1953.8047,537.2208,406.8431,321.4447,177.0003,122.8625,105.4822,25.7286,48.5308,36.5339,18.1303,20.6628,20.0331,19.3700,17.3458,13.9250,12.6528,11.1744,7.5872,6.4781,0.0014,0.1747,0.1611,0.1408,0.0978,0.0147,0.0058,0.0047,0.0031,0.0003,0.0000 +"2017 Q1",0.0067,19831.9839,0.0000,0,4055.6844,0,1826.4933,0.0000,18.3528,0,7.3758,36.3167,0.0000,7.2994,0,0,36.3150,0.0000,0.0000,12.0239,0.0047,0,0.0000,0.3344,0,0.0064,0,0.1547,0,1.2347,0.0000,0.0003,0,0,0,0.0047,0,0.0011,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Year-reference.csv index 8291668a36..5ac7b9cf91 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_waitduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wait Hours: Total" -2016,280511.7678 -2017,25833.5931 +Year,"[Galactic Astronomy] Wait Hours: Total","[Sociology] Wait Hours: Total","[Cell Biology] Wait Hours: Total","[Solid State Chemistry and Polymers] Wait Hours: Total","[Polar Ocean and Climate Systems] Wait Hours: Total","[Tectonics] Wait Hours: Total","[Systematic and Population Biology] Wait Hours: Total","[Solid-State and Microstructures] Wait Hours: Total","[Quantum Electronics, Waves, and Beams] Wait Hours: Total","[Decision, Risk, and Management Science] Wait Hours: Total","[Systems Prototyping and Fabrication] Wait Hours: Total","[Physical Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Stellar Astronomy and Astrophysics] Wait Hours: Total","[Biochemistry and Molecular Structure and Function] Wait Hours: Total","[Polar Aeronomy and Astrophysics] Wait Hours: Total","[Global Atmospheric Research] Wait Hours: Total","[Algebra and Number Theory] Wait Hours: Total","[Statistics and Probability] Wait Hours: Total","[Emerging Technologies Initiation] Wait Hours: Total","[Economics] Wait Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wait Hours: Total","[Design and Computer-Integrated Engineering] Wait Hours: Total","[Operations Research and Production Systems] Wait Hours: Total","[Metals, Ceramics, and Electronic Materials] Wait Hours: Total","[Polar Meteorology] Wait Hours: Total","[Theoretical Physics] Wait Hours: Total","[Experimental Systems] Wait Hours: Total","[Computer and Computation Theory] Wait Hours: Total","[Biophysics] Wait Hours: Total","[Seismology] Wait Hours: Total","[Geology and Paleontology] Wait Hours: Total","[Extragalactic Astronomy and Cosmology] Wait Hours: Total","[Design, Tools, and Test] Wait Hours: Total","[Geophysics] Wait Hours: Total","[Mechanics and Materials] Wait Hours: Total","[Structures and Building Systems] Wait Hours: Total","[Organic and Macromolecular Chemistry] Wait Hours: Total","[Volcanology and Mantle Geochemistry] Wait Hours: Total","[Law and Social Sciences] Wait Hours: Total" +2016,163477.1836,93107.7492,5136.8678,5128.4506,0.3231,3927.5247,1203.9786,2704.6794,1941.5953,1953.8047,537.2208,406.8431,321.4447,177.0003,122.8625,105.4822,25.7286,48.5308,36.5339,18.1303,20.6628,20.0331,19.3700,17.3458,13.9250,12.6528,11.1744,7.5872,6.4781,0.0014,0.1747,0.1611,0.1408,0.0978,0.0147,0.0058,0.0047,0.0031,0.0003,0.0000 +2017,0.0067,19831.9839,0.0000,0,4055.6844,0,1826.4933,0.0000,18.3528,0,7.3758,36.3167,0.0000,7.2994,0,0,36.3150,0.0000,0.0000,12.0239,0.0047,0,0.0000,0.3344,0,0.0064,0,0.1547,0,1.2347,0.0000,0.0003,0,0,0,0.0047,0,0.0011,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Day-reference.csv index f04b4ab3ac..f4da77210d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Total" -Unknown,127976.8064 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +Tectonics,8590.5158 +"Physical Chemistry",3832.1586 +"Statistics and Probability",2845.5633 +"Quantum Electronics, Waves, and Beams",1663.0800 +"Polar Ocean and Climate Systems",1593.1472 +"Cell Biology",1526.7414 +"Galactic Astronomy",1230.7931 +"Solid State Chemistry and Polymers",1145.5708 +Arts,1140.0328 +"Experimental Systems",896.5864 +"Solid-State and Microstructures",802.6467 +"Organic and Macromolecular Chemistry",658.6011 +"Algebra and Number Theory",433.1708 +Biophysics,393.6403 +"Stellar Astronomy and Astrophysics",371.0986 +"Metals, Ceramics, and Electronic Materials",255.4306 +"Biochemistry and Molecular Structure and Function",251.4806 +"Design and Computer-Integrated Engineering",229.4542 +"Emerging Technologies Initiation",202.8522 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +"Structures and Building Systems",126.2600 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Decision, Risk, and Management Science",74.8000 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +Economics,56.2867 +"Polar Aeronomy and Astrophysics",50.3497 +"Volcanology and Mantle Geochemistry",48.0067 +"Fluid, Particulate, and Hydraulic Systems",46.3125 +"Systematic and Population Biology",45.2333 +"Geology and Paleontology",18.3367 +"Global Atmospheric Research",9.0281 +Geophysics,1.1269 +"Design, Tools, and Test",0.2606 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Month-reference.csv index f04b4ab3ac..f4da77210d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Total" -Unknown,127976.8064 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +Tectonics,8590.5158 +"Physical Chemistry",3832.1586 +"Statistics and Probability",2845.5633 +"Quantum Electronics, Waves, and Beams",1663.0800 +"Polar Ocean and Climate Systems",1593.1472 +"Cell Biology",1526.7414 +"Galactic Astronomy",1230.7931 +"Solid State Chemistry and Polymers",1145.5708 +Arts,1140.0328 +"Experimental Systems",896.5864 +"Solid-State and Microstructures",802.6467 +"Organic and Macromolecular Chemistry",658.6011 +"Algebra and Number Theory",433.1708 +Biophysics,393.6403 +"Stellar Astronomy and Astrophysics",371.0986 +"Metals, Ceramics, and Electronic Materials",255.4306 +"Biochemistry and Molecular Structure and Function",251.4806 +"Design and Computer-Integrated Engineering",229.4542 +"Emerging Technologies Initiation",202.8522 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +"Structures and Building Systems",126.2600 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Decision, Risk, and Management Science",74.8000 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +Economics,56.2867 +"Polar Aeronomy and Astrophysics",50.3497 +"Volcanology and Mantle Geochemistry",48.0067 +"Fluid, Particulate, and Hydraulic Systems",46.3125 +"Systematic and Population Biology",45.2333 +"Geology and Paleontology",18.3367 +"Global Atmospheric Research",9.0281 +Geophysics,1.1269 +"Design, Tools, and Test",0.2606 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Quarter-reference.csv index f04b4ab3ac..f4da77210d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Total" -Unknown,127976.8064 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +Tectonics,8590.5158 +"Physical Chemistry",3832.1586 +"Statistics and Probability",2845.5633 +"Quantum Electronics, Waves, and Beams",1663.0800 +"Polar Ocean and Climate Systems",1593.1472 +"Cell Biology",1526.7414 +"Galactic Astronomy",1230.7931 +"Solid State Chemistry and Polymers",1145.5708 +Arts,1140.0328 +"Experimental Systems",896.5864 +"Solid-State and Microstructures",802.6467 +"Organic and Macromolecular Chemistry",658.6011 +"Algebra and Number Theory",433.1708 +Biophysics,393.6403 +"Stellar Astronomy and Astrophysics",371.0986 +"Metals, Ceramics, and Electronic Materials",255.4306 +"Biochemistry and Molecular Structure and Function",251.4806 +"Design and Computer-Integrated Engineering",229.4542 +"Emerging Technologies Initiation",202.8522 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +"Structures and Building Systems",126.2600 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Decision, Risk, and Management Science",74.8000 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +Economics,56.2867 +"Polar Aeronomy and Astrophysics",50.3497 +"Volcanology and Mantle Geochemistry",48.0067 +"Fluid, Particulate, and Hydraulic Systems",46.3125 +"Systematic and Population Biology",45.2333 +"Geology and Paleontology",18.3367 +"Global Atmospheric Research",9.0281 +Geophysics,1.1269 +"Design, Tools, and Test",0.2606 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Year-reference.csv index f04b4ab3ac..f4da77210d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Wall Hours: Total" -Unknown,127976.8064 +"Systems Prototyping and Fabrication",67004.1206 +Sociology,16499.1964 +"Operations Research and Production Systems",15354.0758 +Tectonics,8590.5158 +"Physical Chemistry",3832.1586 +"Statistics and Probability",2845.5633 +"Quantum Electronics, Waves, and Beams",1663.0800 +"Polar Ocean and Climate Systems",1593.1472 +"Cell Biology",1526.7414 +"Galactic Astronomy",1230.7931 +"Solid State Chemistry and Polymers",1145.5708 +Arts,1140.0328 +"Experimental Systems",896.5864 +"Solid-State and Microstructures",802.6467 +"Organic and Macromolecular Chemistry",658.6011 +"Algebra and Number Theory",433.1708 +Biophysics,393.6403 +"Stellar Astronomy and Astrophysics",371.0986 +"Metals, Ceramics, and Electronic Materials",255.4306 +"Biochemistry and Molecular Structure and Function",251.4806 +"Design and Computer-Integrated Engineering",229.4542 +"Emerging Technologies Initiation",202.8522 +"Polar Meteorology",135.7597 +"Theoretical Physics",132.4094 +"Structures and Building Systems",126.2600 +"Computer and Computation Theory",100.8417 +"Mechanics and Materials",81.6261 +"Decision, Risk, and Management Science",74.8000 +Seismology,70.2769 +"Extragalactic Astronomy and Cosmology",59.8692 +Economics,56.2867 +"Polar Aeronomy and Astrophysics",50.3497 +"Volcanology and Mantle Geochemistry",48.0067 +"Fluid, Particulate, and Hydraulic Systems",46.3125 +"Systematic and Population Biology",45.2333 +"Geology and Paleontology",18.3367 +"Global Atmospheric Research",9.0281 +Geophysics,1.1269 +"Design, Tools, and Test",0.2606 +"Law and Social Sciences",0.0650 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Day-reference.csv index 0b204380a8..35d72cdbed 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wall Hours: Total" -2016-12-22,33.6881 -2016-12-23,56.6036 -2016-12-24,72.0000 -2016-12-25,80.5078 -2016-12-26,157.5208 -2016-12-27,534.1833 -2016-12-28,4574.1436 -2016-12-29,20504.5094 -2016-12-30,42862.5139 -2016-12-31,42322.5450 -2017-01-01,16778.5908 +Day,"[Systems Prototyping and Fabrication] Wall Hours: Total","[Sociology] Wall Hours: Total","[Operations Research and Production Systems] Wall Hours: Total","[Tectonics] Wall Hours: Total","[Physical Chemistry] Wall Hours: Total","[Statistics and Probability] Wall Hours: Total","[Quantum Electronics, Waves, and Beams] Wall Hours: Total","[Polar Ocean and Climate Systems] Wall Hours: Total","[Cell Biology] Wall Hours: Total","[Galactic Astronomy] Wall Hours: Total","[Solid State Chemistry and Polymers] Wall Hours: Total","[Arts] Wall Hours: Total","[Experimental Systems] Wall Hours: Total","[Solid-State and Microstructures] Wall Hours: Total","[Organic and Macromolecular Chemistry] Wall Hours: Total","[Algebra and Number Theory] Wall Hours: Total","[Biophysics] Wall Hours: Total","[Stellar Astronomy and Astrophysics] Wall Hours: Total","[Metals, Ceramics, and Electronic Materials] Wall Hours: Total","[Biochemistry and Molecular Structure and Function] Wall Hours: Total","[Design and Computer-Integrated Engineering] Wall Hours: Total","[Emerging Technologies Initiation] Wall Hours: Total","[Polar Meteorology] Wall Hours: Total","[Theoretical Physics] Wall Hours: Total","[Structures and Building Systems] Wall Hours: Total","[Computer and Computation Theory] Wall Hours: Total","[Mechanics and Materials] Wall Hours: Total","[Decision, Risk, and Management Science] Wall Hours: Total","[Seismology] Wall Hours: Total","[Extragalactic Astronomy and Cosmology] Wall Hours: Total","[Economics] Wall Hours: Total","[Polar Aeronomy and Astrophysics] Wall Hours: Total","[Volcanology and Mantle Geochemistry] Wall Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Total","[Systematic and Population Biology] Wall Hours: Total","[Geology and Paleontology] Wall Hours: Total","[Global Atmospheric Research] Wall Hours: Total","[Geophysics] Wall Hours: Total","[Design, Tools, and Test] Wall Hours: Total","[Law and Social Sciences] Wall Hours: Total" +2016-12-22,0,0,0,0,16.9417,0,0,0,0,0,0,0,0,0,0,0,16.7464,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,24.0000,0,0,0,0,8.6036,0,0,0,0,0,0,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,24.0000,0,0,0,0,24.0000,0,0,0,0,0,0,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,32.5078,0,0,0,0,24.0000,0,0,0,0,0,0,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,96.0000,13.5208,0,0,0,24.0000,0,0,0,0,0,0,24.0000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,3.2167,0,0,115.3094,124.7214,38.9522,0,69.8267,52.2964,61.4911,0,0,0,0,0,27.7997,20.6642,0,19.9056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,953.0369,24.0000,1962.8444,0,386.4281,168.4211,228.4575,0,176.3833,144.0000,169.2183,0,43.9492,0,160.7689,28.0381,48.0000,36.7781,0,24.0000,0,0,0,15.1192,0,0,0,0,0,0,0,0,4.7006,0,0,0,0,0,0,0 +2016-12-29,12583.2597,301.8189,3901.6422,0,597.4011,501.7553,538.2222,0,479.3708,187.5622,356.3561,47.7900,168.7433,3.6200,216.0000,216.0000,48.0000,74.4400,80.8508,24.0000,0,19.1092,0,72.0000,14.6778,10.0983,0,1.9269,10.4008,0,0,18.9747,24.0000,0,0,0,6.4889,0,0,0 +2016-12-30,21766.1511,6638.2006,5473.3125,3055.8617,1061.7603,397.7425,530.1600,0,498.0675,592.9178,394.3031,629.4331,321.9956,67.3875,216.5364,160.0869,48.0000,83.3264,152.4892,175.8633,0,63.8125,108.1047,45.2903,82.2439,82.1119,27.2308,59.0739,13.6064,13.9453,9.6922,24.0006,19.3061,29.3436,12.8208,4.3656,2.5175,1.1269,0.2606,0.0650 +2016-12-31,20518.0064,8599.9281,2761.8142,5534.6542,889.1303,1112.6033,266.9975,3.1458,179.7156,150.1633,164.2022,430.1536,241.5139,714.0100,63.5161,24.0000,48.2375,99.6328,22.0906,7.7117,149.5017,71.2450,25.9131,0,29.3383,8.6314,27.2439,13.7992,45.3169,45.9239,38.8869,7.3744,0,16.9689,1.4844,9.6900,0,0,0,0 +2017-01-01,11183.6664,932.0322,1254.4625,0,588.6800,526.7989,60.2906,1590.0014,123.3775,23.2497,0,32.6561,120.3844,17.6292,1.7797,5.0458,60.8567,56.2572,0,0,79.9525,48.6856,1.7419,0,0,0,27.1514,0,0.9528,0,7.7075,0,0,0,30.9281,4.2811,0.0217,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Month-reference.csv index 53320afda1..6cbbbc2ea9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wall Hours: Total" -2016-12,111198.2156 -2017-01,16778.5908 +Month,"[Systems Prototyping and Fabrication] Wall Hours: Total","[Sociology] Wall Hours: Total","[Operations Research and Production Systems] Wall Hours: Total","[Tectonics] Wall Hours: Total","[Physical Chemistry] Wall Hours: Total","[Statistics and Probability] Wall Hours: Total","[Quantum Electronics, Waves, and Beams] Wall Hours: Total","[Polar Ocean and Climate Systems] Wall Hours: Total","[Cell Biology] Wall Hours: Total","[Galactic Astronomy] Wall Hours: Total","[Solid State Chemistry and Polymers] Wall Hours: Total","[Arts] Wall Hours: Total","[Experimental Systems] Wall Hours: Total","[Solid-State and Microstructures] Wall Hours: Total","[Organic and Macromolecular Chemistry] Wall Hours: Total","[Algebra and Number Theory] Wall Hours: Total","[Biophysics] Wall Hours: Total","[Stellar Astronomy and Astrophysics] Wall Hours: Total","[Metals, Ceramics, and Electronic Materials] Wall Hours: Total","[Biochemistry and Molecular Structure and Function] Wall Hours: Total","[Design and Computer-Integrated Engineering] Wall Hours: Total","[Emerging Technologies Initiation] Wall Hours: Total","[Polar Meteorology] Wall Hours: Total","[Theoretical Physics] Wall Hours: Total","[Structures and Building Systems] Wall Hours: Total","[Computer and Computation Theory] Wall Hours: Total","[Mechanics and Materials] Wall Hours: Total","[Decision, Risk, and Management Science] Wall Hours: Total","[Seismology] Wall Hours: Total","[Extragalactic Astronomy and Cosmology] Wall Hours: Total","[Economics] Wall Hours: Total","[Polar Aeronomy and Astrophysics] Wall Hours: Total","[Volcanology and Mantle Geochemistry] Wall Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Total","[Systematic and Population Biology] Wall Hours: Total","[Geology and Paleontology] Wall Hours: Total","[Global Atmospheric Research] Wall Hours: Total","[Geophysics] Wall Hours: Total","[Design, Tools, and Test] Wall Hours: Total","[Law and Social Sciences] Wall Hours: Total" +2016-12,55820.4542,15567.1642,14099.6133,8590.5158,3243.4786,2318.7644,1602.7894,3.1458,1403.3639,1207.5433,1145.5708,1107.3767,776.2019,785.0175,656.8214,428.1250,332.7836,314.8414,255.4306,251.4806,149.5017,154.1667,134.0178,132.4094,126.2600,100.8417,54.4747,74.8000,69.3242,59.8692,48.5792,50.3497,48.0067,46.3125,14.3053,14.0556,9.0064,1.1269,0.2606,0.0650 +2017-01,11183.6664,932.0322,1254.4625,0,588.6800,526.7989,60.2906,1590.0014,123.3775,23.2497,0,32.6561,120.3844,17.6292,1.7797,5.0458,60.8567,56.2572,0,0,79.9525,48.6856,1.7419,0,0,0,27.1514,0,0.9528,0,7.7075,0,0,0,30.9281,4.2811,0.0217,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Quarter-reference.csv index 2be8000959..90d483a75d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wall Hours: Total" -"2016 Q4",111198.2156 -"2017 Q1",16778.5908 +Quarter,"[Systems Prototyping and Fabrication] Wall Hours: Total","[Sociology] Wall Hours: Total","[Operations Research and Production Systems] Wall Hours: Total","[Tectonics] Wall Hours: Total","[Physical Chemistry] Wall Hours: Total","[Statistics and Probability] Wall Hours: Total","[Quantum Electronics, Waves, and Beams] Wall Hours: Total","[Polar Ocean and Climate Systems] Wall Hours: Total","[Cell Biology] Wall Hours: Total","[Galactic Astronomy] Wall Hours: Total","[Solid State Chemistry and Polymers] Wall Hours: Total","[Arts] Wall Hours: Total","[Experimental Systems] Wall Hours: Total","[Solid-State and Microstructures] Wall Hours: Total","[Organic and Macromolecular Chemistry] Wall Hours: Total","[Algebra and Number Theory] Wall Hours: Total","[Biophysics] Wall Hours: Total","[Stellar Astronomy and Astrophysics] Wall Hours: Total","[Metals, Ceramics, and Electronic Materials] Wall Hours: Total","[Biochemistry and Molecular Structure and Function] Wall Hours: Total","[Design and Computer-Integrated Engineering] Wall Hours: Total","[Emerging Technologies Initiation] Wall Hours: Total","[Polar Meteorology] Wall Hours: Total","[Theoretical Physics] Wall Hours: Total","[Structures and Building Systems] Wall Hours: Total","[Computer and Computation Theory] Wall Hours: Total","[Mechanics and Materials] Wall Hours: Total","[Decision, Risk, and Management Science] Wall Hours: Total","[Seismology] Wall Hours: Total","[Extragalactic Astronomy and Cosmology] Wall Hours: Total","[Economics] Wall Hours: Total","[Polar Aeronomy and Astrophysics] Wall Hours: Total","[Volcanology and Mantle Geochemistry] Wall Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Total","[Systematic and Population Biology] Wall Hours: Total","[Geology and Paleontology] Wall Hours: Total","[Global Atmospheric Research] Wall Hours: Total","[Geophysics] Wall Hours: Total","[Design, Tools, and Test] Wall Hours: Total","[Law and Social Sciences] Wall Hours: Total" +"2016 Q4",55820.4542,15567.1642,14099.6133,8590.5158,3243.4786,2318.7644,1602.7894,3.1458,1403.3639,1207.5433,1145.5708,1107.3767,776.2019,785.0175,656.8214,428.1250,332.7836,314.8414,255.4306,251.4806,149.5017,154.1667,134.0178,132.4094,126.2600,100.8417,54.4747,74.8000,69.3242,59.8692,48.5792,50.3497,48.0067,46.3125,14.3053,14.0556,9.0064,1.1269,0.2606,0.0650 +"2017 Q1",11183.6664,932.0322,1254.4625,0,588.6800,526.7989,60.2906,1590.0014,123.3775,23.2497,0,32.6561,120.3844,17.6292,1.7797,5.0458,60.8567,56.2572,0,0,79.9525,48.6856,1.7419,0,0,0,27.1514,0,0.9528,0,7.7075,0,0,0,30.9281,4.2811,0.0217,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Year-reference.csv index 2736ff2194..6a542b5dee 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/total_wallduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wall Hours: Total" -2016,111198.2156 -2017,16778.5908 +Year,"[Systems Prototyping and Fabrication] Wall Hours: Total","[Sociology] Wall Hours: Total","[Operations Research and Production Systems] Wall Hours: Total","[Tectonics] Wall Hours: Total","[Physical Chemistry] Wall Hours: Total","[Statistics and Probability] Wall Hours: Total","[Quantum Electronics, Waves, and Beams] Wall Hours: Total","[Polar Ocean and Climate Systems] Wall Hours: Total","[Cell Biology] Wall Hours: Total","[Galactic Astronomy] Wall Hours: Total","[Solid State Chemistry and Polymers] Wall Hours: Total","[Arts] Wall Hours: Total","[Experimental Systems] Wall Hours: Total","[Solid-State and Microstructures] Wall Hours: Total","[Organic and Macromolecular Chemistry] Wall Hours: Total","[Algebra and Number Theory] Wall Hours: Total","[Biophysics] Wall Hours: Total","[Stellar Astronomy and Astrophysics] Wall Hours: Total","[Metals, Ceramics, and Electronic Materials] Wall Hours: Total","[Biochemistry and Molecular Structure and Function] Wall Hours: Total","[Design and Computer-Integrated Engineering] Wall Hours: Total","[Emerging Technologies Initiation] Wall Hours: Total","[Polar Meteorology] Wall Hours: Total","[Theoretical Physics] Wall Hours: Total","[Structures and Building Systems] Wall Hours: Total","[Computer and Computation Theory] Wall Hours: Total","[Mechanics and Materials] Wall Hours: Total","[Decision, Risk, and Management Science] Wall Hours: Total","[Seismology] Wall Hours: Total","[Extragalactic Astronomy and Cosmology] Wall Hours: Total","[Economics] Wall Hours: Total","[Polar Aeronomy and Astrophysics] Wall Hours: Total","[Volcanology and Mantle Geochemistry] Wall Hours: Total","[Fluid, Particulate, and Hydraulic Systems] Wall Hours: Total","[Systematic and Population Biology] Wall Hours: Total","[Geology and Paleontology] Wall Hours: Total","[Global Atmospheric Research] Wall Hours: Total","[Geophysics] Wall Hours: Total","[Design, Tools, and Test] Wall Hours: Total","[Law and Social Sciences] Wall Hours: Total" +2016,55820.4542,15567.1642,14099.6133,8590.5158,3243.4786,2318.7644,1602.7894,3.1458,1403.3639,1207.5433,1145.5708,1107.3767,776.2019,785.0175,656.8214,428.1250,332.7836,314.8414,255.4306,251.4806,149.5017,154.1667,134.0178,132.4094,126.2600,100.8417,54.4747,74.8000,69.3242,59.8692,48.5792,50.3497,48.0067,46.3125,14.3053,14.0556,9.0064,1.1269,0.2606,0.0650 +2017,11183.6664,932.0322,1254.4625,0,588.6800,526.7989,60.2906,1590.0014,123.3775,23.2497,0,32.6561,120.3844,17.6292,1.7797,5.0458,60.8567,56.2572,0,0,79.9525,48.6856,1.7419,0,0,0,27.1514,0,0.9528,0,7.7075,0,0,0,30.9281,4.2811,0.0217,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Day-reference.csv index 4314b5a2ba..8321bcf033 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Day-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Quantum Electronics, Waves, and Beams",6.977956216 +"Systems Prototyping and Fabrication",6.345087174 +"Organic and Macromolecular Chemistry",5.647449285 +Sociology,3.042824279 +"Physical Chemistry",2.185335508 +"Stellar Astronomy and Astrophysics",2.082928977 +"Emerging Technologies Initiation",1.844111111 +"Metals, Ceramics, and Electronic Materials",1.741571970 +"Statistics and Probability",1.652354588 +"Operations Research and Production Systems",1.453984454 +"Structures and Building Systems",1.339121212 +"Fluid, Particulate, and Hydraulic Systems",1.241095960 +"Solid State Chemistry and Polymers",1.055762731 +Biophysics,1.030328862 +"Polar Ocean and Climate Systems",0.905197285 +"Cell Biology",0.824535064 +Tectonics,0.813495818 +"Experimental Systems",0.697648253 +Arts,0.587914825 +"Design and Computer-Integrated Engineering",0.498325337 +"Algebra and Number Theory",0.492239583 +"Galactic Astronomy",0.435759242 +"Theoretical Physics",0.150465278 +"Systematic and Population Biology",0.143763994 +Economics,0.137021096 +"Global Atmospheric Research",0.136788721 +"Decision, Risk, and Management Science",0.112092014 +"Biochemistry and Molecular Structure and Function",0.096737190 +"Solid-State and Microstructures",0.096551531 +"Polar Aeronomy and Astrophysics",0.095358691 +"Volcanology and Mantle Geochemistry",0.090921717 +Seismology,0.058963016 +"Geology and Paleontology",0.055902909 +"Polar Meteorology",0.012856034 +"Computer and Computation Theory",0.009549400 +"Mechanics and Materials",0.007729745 +"Extragalactic Astronomy and Cosmology",0.005669429 +"Design, Tools, and Test",0.002664773 +Geophysics,0.002134364 +"Law and Social Sciences",0.000098485 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Month-reference.csv index 4314b5a2ba..8321bcf033 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Month-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Quantum Electronics, Waves, and Beams",6.977956216 +"Systems Prototyping and Fabrication",6.345087174 +"Organic and Macromolecular Chemistry",5.647449285 +Sociology,3.042824279 +"Physical Chemistry",2.185335508 +"Stellar Astronomy and Astrophysics",2.082928977 +"Emerging Technologies Initiation",1.844111111 +"Metals, Ceramics, and Electronic Materials",1.741571970 +"Statistics and Probability",1.652354588 +"Operations Research and Production Systems",1.453984454 +"Structures and Building Systems",1.339121212 +"Fluid, Particulate, and Hydraulic Systems",1.241095960 +"Solid State Chemistry and Polymers",1.055762731 +Biophysics,1.030328862 +"Polar Ocean and Climate Systems",0.905197285 +"Cell Biology",0.824535064 +Tectonics,0.813495818 +"Experimental Systems",0.697648253 +Arts,0.587914825 +"Design and Computer-Integrated Engineering",0.498325337 +"Algebra and Number Theory",0.492239583 +"Galactic Astronomy",0.435759242 +"Theoretical Physics",0.150465278 +"Systematic and Population Biology",0.143763994 +Economics,0.137021096 +"Global Atmospheric Research",0.136788721 +"Decision, Risk, and Management Science",0.112092014 +"Biochemistry and Molecular Structure and Function",0.096737190 +"Solid-State and Microstructures",0.096551531 +"Polar Aeronomy and Astrophysics",0.095358691 +"Volcanology and Mantle Geochemistry",0.090921717 +Seismology,0.058963016 +"Geology and Paleontology",0.055902909 +"Polar Meteorology",0.012856034 +"Computer and Computation Theory",0.009549400 +"Mechanics and Materials",0.007729745 +"Extragalactic Astronomy and Cosmology",0.005669429 +"Design, Tools, and Test",0.002664773 +Geophysics,0.002134364 +"Law and Social Sciences",0.000098485 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Quarter-reference.csv index 4314b5a2ba..8321bcf033 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Quantum Electronics, Waves, and Beams",6.977956216 +"Systems Prototyping and Fabrication",6.345087174 +"Organic and Macromolecular Chemistry",5.647449285 +Sociology,3.042824279 +"Physical Chemistry",2.185335508 +"Stellar Astronomy and Astrophysics",2.082928977 +"Emerging Technologies Initiation",1.844111111 +"Metals, Ceramics, and Electronic Materials",1.741571970 +"Statistics and Probability",1.652354588 +"Operations Research and Production Systems",1.453984454 +"Structures and Building Systems",1.339121212 +"Fluid, Particulate, and Hydraulic Systems",1.241095960 +"Solid State Chemistry and Polymers",1.055762731 +Biophysics,1.030328862 +"Polar Ocean and Climate Systems",0.905197285 +"Cell Biology",0.824535064 +Tectonics,0.813495818 +"Experimental Systems",0.697648253 +Arts,0.587914825 +"Design and Computer-Integrated Engineering",0.498325337 +"Algebra and Number Theory",0.492239583 +"Galactic Astronomy",0.435759242 +"Theoretical Physics",0.150465278 +"Systematic and Population Biology",0.143763994 +Economics,0.137021096 +"Global Atmospheric Research",0.136788721 +"Decision, Risk, and Management Science",0.112092014 +"Biochemistry and Molecular Structure and Function",0.096737190 +"Solid-State and Microstructures",0.096551531 +"Polar Aeronomy and Astrophysics",0.095358691 +"Volcanology and Mantle Geochemistry",0.090921717 +Seismology,0.058963016 +"Geology and Paleontology",0.055902909 +"Polar Meteorology",0.012856034 +"Computer and Computation Theory",0.009549400 +"Mechanics and Materials",0.007729745 +"Extragalactic Astronomy and Cosmology",0.005669429 +"Design, Tools, and Test",0.002664773 +Geophysics,0.002134364 +"Law and Social Sciences",0.000098485 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Year-reference.csv index 4314b5a2ba..8321bcf033 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/aggregate-Year-reference.csv @@ -6,5 +6,44 @@ start,end 2016-12-22,2017-01-01 --------- "PI Group","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Quantum Electronics, Waves, and Beams",6.977956216 +"Systems Prototyping and Fabrication",6.345087174 +"Organic and Macromolecular Chemistry",5.647449285 +Sociology,3.042824279 +"Physical Chemistry",2.185335508 +"Stellar Astronomy and Astrophysics",2.082928977 +"Emerging Technologies Initiation",1.844111111 +"Metals, Ceramics, and Electronic Materials",1.741571970 +"Statistics and Probability",1.652354588 +"Operations Research and Production Systems",1.453984454 +"Structures and Building Systems",1.339121212 +"Fluid, Particulate, and Hydraulic Systems",1.241095960 +"Solid State Chemistry and Polymers",1.055762731 +Biophysics,1.030328862 +"Polar Ocean and Climate Systems",0.905197285 +"Cell Biology",0.824535064 +Tectonics,0.813495818 +"Experimental Systems",0.697648253 +Arts,0.587914825 +"Design and Computer-Integrated Engineering",0.498325337 +"Algebra and Number Theory",0.492239583 +"Galactic Astronomy",0.435759242 +"Theoretical Physics",0.150465278 +"Systematic and Population Biology",0.143763994 +Economics,0.137021096 +"Global Atmospheric Research",0.136788721 +"Decision, Risk, and Management Science",0.112092014 +"Biochemistry and Molecular Structure and Function",0.096737190 +"Solid-State and Microstructures",0.096551531 +"Polar Aeronomy and Astrophysics",0.095358691 +"Volcanology and Mantle Geochemistry",0.090921717 +Seismology,0.058963016 +"Geology and Paleontology",0.055902909 +"Polar Meteorology",0.012856034 +"Computer and Computation Theory",0.009549400 +"Mechanics and Materials",0.007729745 +"Extragalactic Astronomy and Cosmology",0.005669429 +"Design, Tools, and Test",0.002664773 +Geophysics,0.002134364 +"Law and Social Sciences",0.000098485 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Day-reference.csv index 10a968bf7b..c118d179da 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Screwdriver Utilization (%)" -2016-12-22,0.210550347 -2016-12-23,0.304481047 -2016-12-24,0.312500000 -2016-12-25,0.405348958 -2016-12-26,0.783449074 -2016-12-27,3.240238484 -2016-12-28,17.080981308 -2016-12-29,35.679538194 -2016-12-30,57.316514005 -2016-12-31,46.297839525 -2017-01-01,14.537466262 +Day,"[Quantum Electronics, Waves, and Beams] Screwdriver Utilization (%)","[Systems Prototyping and Fabrication] Screwdriver Utilization (%)","[Organic and Macromolecular Chemistry] Screwdriver Utilization (%)","[Sociology] Screwdriver Utilization (%)","[Physical Chemistry] Screwdriver Utilization (%)","[Stellar Astronomy and Astrophysics] Screwdriver Utilization (%)","[Emerging Technologies Initiation] Screwdriver Utilization (%)","[Metals, Ceramics, and Electronic Materials] Screwdriver Utilization (%)","[Statistics and Probability] Screwdriver Utilization (%)","[Operations Research and Production Systems] Screwdriver Utilization (%)","[Structures and Building Systems] Screwdriver Utilization (%)","[Fluid, Particulate, and Hydraulic Systems] Screwdriver Utilization (%)","[Solid State Chemistry and Polymers] Screwdriver Utilization (%)","[Biophysics] Screwdriver Utilization (%)","[Polar Ocean and Climate Systems] Screwdriver Utilization (%)","[Cell Biology] Screwdriver Utilization (%)","[Tectonics] Screwdriver Utilization (%)","[Experimental Systems] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Design and Computer-Integrated Engineering] Screwdriver Utilization (%)","[Algebra and Number Theory] Screwdriver Utilization (%)","[Galactic Astronomy] Screwdriver Utilization (%)","[Theoretical Physics] Screwdriver Utilization (%)","[Systematic and Population Biology] Screwdriver Utilization (%)","[Economics] Screwdriver Utilization (%)","[Global Atmospheric Research] Screwdriver Utilization (%)","[Decision, Risk, and Management Science] Screwdriver Utilization (%)","[Biochemistry and Molecular Structure and Function] Screwdriver Utilization (%)","[Solid-State and Microstructures] Screwdriver Utilization (%)","[Polar Aeronomy and Astrophysics] Screwdriver Utilization (%)","[Volcanology and Mantle Geochemistry] Screwdriver Utilization (%)","[Seismology] Screwdriver Utilization (%)","[Geology and Paleontology] Screwdriver Utilization (%)","[Polar Meteorology] Screwdriver Utilization (%)","[Computer and Computation Theory] Screwdriver Utilization (%)","[Mechanics and Materials] Screwdriver Utilization (%)","[Extragalactic Astronomy and Cosmology] Screwdriver Utilization (%)","[Design, Tools, and Test] Screwdriver Utilization (%)","[Geophysics] Screwdriver Utilization (%)","[Law and Social Sciences] Screwdriver Utilization (%)" +2016-12-22,0,0,0,0,0.211770833,0,0,0,0,0,0,0,0,0.209329861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0.008962095,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0.025000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0.485697917,0,0,0,0,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0.025000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,1.800000000,0,0,0,0.225347222,0,0,0,0,0.300000000,0,0,0,0,0,0,0,0.025000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,3.895222222,0,0,0.003350694,1.194666667,1.549812500,0,0,1.002459057,0,0,0,4.477925926,0.553314815,0,0.581888889,0,0,0,0,0,0.248303241,0,0,0,0,0,0.248819444,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,22.845750000,0.992746817,30.695282407,0.025000000,5.184807870,2.438902778,0,0,1.216009259,2.044629630,0,0,3.431231481,1.900000000,0,1.469861111,0,0.366243056,0,0,0.350475694,1.012500000,0.188989583,0,0,0,0,0.300000000,0,0,0.097928241,0,0,0,0,0,0,0,0,0 +2016-12-29,51.621168981,13.107562211,41.200000000,0.467031756,5.464677083,4.652500000,1.910916667,6.063812500,3.993793981,4.064210648,1.712407407,0,4.181104938,1.900000000,0,2.295784433,0,1.406194444,0.268797454,0,2.700000000,0.891915316,0.900000000,0,0,1.081481481,0.112405093,0.300000000,0.007541667,0.790613426,0.500000000,0.054171007,0,0,0.010519097,0,0,0,0,0 +2016-12-30,24.475823061,22.673074074,20.613578704,13.020537269,5.833217207,5.043628472,6.381250000,11.436687500,3.163852431,5.701367188,9.595120370,7.712944444,2.760949074,1.900000000,0,2.196575810,3.183189236,2.740320602,3.630755932,0,2.001086806,1.917237558,0.566128472,0.543924769,0.340197338,0.419583333,1.106232928,0.207256655,0.296171875,0.500004630,0.402210648,0.070866609,0.068745660,0.112609086,0.085533275,0.028365451,0.014526331,0.029312500,0.023478009,0.001083333 +2016-12-31,11.590731771,21.372923322,5.531060185,18.307614757,5.115060571,5.910684028,7.124500000,1.656791667,12.271680266,2.876889757,3.422805556,5.939111111,1.336809606,1.903756944,0.039322917,1.497629630,5.765264757,2.158168981,2.411286314,3.618736111,0.300000000,2.959931713,0,0.130701389,0.952336806,0,0.014374132,0.008032986,0.743760417,0.307268519,0,0.511645833,0.523888889,0.026992766,0.008991030,0.028379051,0.047837384,0,0,0 +2017-01-01,1.509892940,11.649652488,0.059324074,1.763619502,2.340263117,3.316690972,4.868555556,0,5.102543981,1.306731771,0,0,0,1.767215856,9.937508681,1.028145833,0,1.003203704,0.156223380,1.862842593,0.063072917,0.387096065,0,0.906777778,0.214697917,0.003611111,0,0,0.036727431,0,0,0.011909722,0.022297454,0.001814525,0,0.028282697,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Month-reference.csv index eaa059bb65..117aa9e6ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Screwdriver Utilization (%)" -2016-12,5.179946229 -2017-01,0.468950525 +Month,"[Quantum Electronics, Waves, and Beams] Screwdriver Utilization (%)","[Systems Prototyping and Fabrication] Screwdriver Utilization (%)","[Organic and Macromolecular Chemistry] Screwdriver Utilization (%)","[Sociology] Screwdriver Utilization (%)","[Physical Chemistry] Screwdriver Utilization (%)","[Stellar Astronomy and Astrophysics] Screwdriver Utilization (%)","[Emerging Technologies Initiation] Screwdriver Utilization (%)","[Metals, Ceramics, and Electronic Materials] Screwdriver Utilization (%)","[Statistics and Probability] Screwdriver Utilization (%)","[Operations Research and Production Systems] Screwdriver Utilization (%)","[Structures and Building Systems] Screwdriver Utilization (%)","[Fluid, Particulate, and Hydraulic Systems] Screwdriver Utilization (%)","[Solid State Chemistry and Polymers] Screwdriver Utilization (%)","[Biophysics] Screwdriver Utilization (%)","[Polar Ocean and Climate Systems] Screwdriver Utilization (%)","[Cell Biology] Screwdriver Utilization (%)","[Tectonics] Screwdriver Utilization (%)","[Experimental Systems] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Design and Computer-Integrated Engineering] Screwdriver Utilization (%)","[Algebra and Number Theory] Screwdriver Utilization (%)","[Galactic Astronomy] Screwdriver Utilization (%)","[Theoretical Physics] Screwdriver Utilization (%)","[Systematic and Population Biology] Screwdriver Utilization (%)","[Economics] Screwdriver Utilization (%)","[Global Atmospheric Research] Screwdriver Utilization (%)","[Decision, Risk, and Management Science] Screwdriver Utilization (%)","[Biochemistry and Molecular Structure and Function] Screwdriver Utilization (%)","[Solid-State and Microstructures] Screwdriver Utilization (%)","[Polar Aeronomy and Astrophysics] Screwdriver Utilization (%)","[Volcanology and Mantle Geochemistry] Screwdriver Utilization (%)","[Seismology] Screwdriver Utilization (%)","[Geology and Paleontology] Screwdriver Utilization (%)","[Polar Meteorology] Screwdriver Utilization (%)","[Computer and Computation Theory] Screwdriver Utilization (%)","[Mechanics and Materials] Screwdriver Utilization (%)","[Extragalactic Astronomy and Cosmology] Screwdriver Utilization (%)","[Design, Tools, and Test] Screwdriver Utilization (%)","[Geophysics] Screwdriver Utilization (%)","[Law and Social Sciences] Screwdriver Utilization (%)" +2016-12,2.427342756,1.875687304,2.002976777,1.022820889,0.699949273,0.632113799,0.497311828,0.617977151,0.504020273,0.473777330,0.475172043,0.440388889,0.374625485,0.308593601,0.001268481,0.259410964,0.288659806,0.215191196,0.203575474,0.116733423,0.172631048,0.150461924,0.053390905,0.021762134,0.041694650,0.048421446,0.039774586,0.034326100,0.033667843,0.033836955,0.032262545,0.020538176,0.019117244,0.004503286,0.003388497,0.001830468,0.002011733,0.000945565,0.000757355,0.000034946 +2017-01,0.048706224,0.375795242,0.001913680,0.056890952,0.075492359,0.106990031,0.157050179,0,0.164598193,0.042152638,0,0,0,0.057006963,0.320564796,0.033165995,0,0.032361410,0.005039464,0.060091697,0.002034610,0.012486970,0,0.029250896,0.006925739,0.000116487,0,0,0.001184756,0,0,0.000384185,0.000719273,0.000058533,0,0.000912345,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Quarter-reference.csv index 6d5ffd11ed..5ac60eaa8d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Screwdriver Utilization (%)" -"2016 Q4",1.745416664 -"2017 Q1",0.161527403 +Quarter,"[Quantum Electronics, Waves, and Beams] Screwdriver Utilization (%)","[Systems Prototyping and Fabrication] Screwdriver Utilization (%)","[Organic and Macromolecular Chemistry] Screwdriver Utilization (%)","[Sociology] Screwdriver Utilization (%)","[Physical Chemistry] Screwdriver Utilization (%)","[Stellar Astronomy and Astrophysics] Screwdriver Utilization (%)","[Emerging Technologies Initiation] Screwdriver Utilization (%)","[Metals, Ceramics, and Electronic Materials] Screwdriver Utilization (%)","[Statistics and Probability] Screwdriver Utilization (%)","[Operations Research and Production Systems] Screwdriver Utilization (%)","[Structures and Building Systems] Screwdriver Utilization (%)","[Fluid, Particulate, and Hydraulic Systems] Screwdriver Utilization (%)","[Solid State Chemistry and Polymers] Screwdriver Utilization (%)","[Biophysics] Screwdriver Utilization (%)","[Polar Ocean and Climate Systems] Screwdriver Utilization (%)","[Cell Biology] Screwdriver Utilization (%)","[Tectonics] Screwdriver Utilization (%)","[Experimental Systems] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Design and Computer-Integrated Engineering] Screwdriver Utilization (%)","[Algebra and Number Theory] Screwdriver Utilization (%)","[Galactic Astronomy] Screwdriver Utilization (%)","[Theoretical Physics] Screwdriver Utilization (%)","[Systematic and Population Biology] Screwdriver Utilization (%)","[Economics] Screwdriver Utilization (%)","[Global Atmospheric Research] Screwdriver Utilization (%)","[Decision, Risk, and Management Science] Screwdriver Utilization (%)","[Biochemistry and Molecular Structure and Function] Screwdriver Utilization (%)","[Solid-State and Microstructures] Screwdriver Utilization (%)","[Polar Aeronomy and Astrophysics] Screwdriver Utilization (%)","[Volcanology and Mantle Geochemistry] Screwdriver Utilization (%)","[Seismology] Screwdriver Utilization (%)","[Geology and Paleontology] Screwdriver Utilization (%)","[Polar Meteorology] Screwdriver Utilization (%)","[Computer and Computation Theory] Screwdriver Utilization (%)","[Mechanics and Materials] Screwdriver Utilization (%)","[Extragalactic Astronomy and Cosmology] Screwdriver Utilization (%)","[Design, Tools, and Test] Screwdriver Utilization (%)","[Geophysics] Screwdriver Utilization (%)","[Law and Social Sciences] Screwdriver Utilization (%)" +"2016 Q4",0.817908972,0.632025070,0.674916088,0.344646169,0.235852472,0.212994867,0.167572464,0.208231431,0.169832918,0.159642361,0.160112319,0.148391908,0.126232501,0.103982626,0.000427423,0.087410216,0.097265804,0.072510077,0.068596084,0.039334088,0.058169158,0.050699126,0.017990414,0.007332893,0.014049284,0.016315922,0.013402306,0.011566403,0.011344599,0.011401583,0.010871075,0.006920472,0.006441680,0.001517411,0.001141776,0.000616788,0.000677866,0.000318614,0.000255196,0.000011775 +"2017 Q1",0.016776588,0.129440583,0.000659156,0.019595772,0.026002924,0.036852122,0.054095062,0,0.056694933,0.014519242,0,0,0,0.019635732,0.110416763,0.011423843,0,0.011146708,0.001735815,0.020698251,0.000700810,0.004301067,0,0.010075309,0.002385532,0.000040123,0,0,0.000408083,0,0,0.000132330,0.000247749,0.000020161,0,0.000314252,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Year-reference.csv index dece58ed02..a8751cae16 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/fieldofscience/utilization/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Screwdriver Utilization (%)" -2016,0.438738615 -2017,0.039828675 +Year,"[Quantum Electronics, Waves, and Beams] Screwdriver Utilization (%)","[Systems Prototyping and Fabrication] Screwdriver Utilization (%)","[Organic and Macromolecular Chemistry] Screwdriver Utilization (%)","[Sociology] Screwdriver Utilization (%)","[Physical Chemistry] Screwdriver Utilization (%)","[Stellar Astronomy and Astrophysics] Screwdriver Utilization (%)","[Emerging Technologies Initiation] Screwdriver Utilization (%)","[Metals, Ceramics, and Electronic Materials] Screwdriver Utilization (%)","[Statistics and Probability] Screwdriver Utilization (%)","[Operations Research and Production Systems] Screwdriver Utilization (%)","[Structures and Building Systems] Screwdriver Utilization (%)","[Fluid, Particulate, and Hydraulic Systems] Screwdriver Utilization (%)","[Solid State Chemistry and Polymers] Screwdriver Utilization (%)","[Biophysics] Screwdriver Utilization (%)","[Polar Ocean and Climate Systems] Screwdriver Utilization (%)","[Cell Biology] Screwdriver Utilization (%)","[Tectonics] Screwdriver Utilization (%)","[Experimental Systems] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Design and Computer-Integrated Engineering] Screwdriver Utilization (%)","[Algebra and Number Theory] Screwdriver Utilization (%)","[Galactic Astronomy] Screwdriver Utilization (%)","[Theoretical Physics] Screwdriver Utilization (%)","[Systematic and Population Biology] Screwdriver Utilization (%)","[Economics] Screwdriver Utilization (%)","[Global Atmospheric Research] Screwdriver Utilization (%)","[Decision, Risk, and Management Science] Screwdriver Utilization (%)","[Biochemistry and Molecular Structure and Function] Screwdriver Utilization (%)","[Solid-State and Microstructures] Screwdriver Utilization (%)","[Polar Aeronomy and Astrophysics] Screwdriver Utilization (%)","[Volcanology and Mantle Geochemistry] Screwdriver Utilization (%)","[Seismology] Screwdriver Utilization (%)","[Geology and Paleontology] Screwdriver Utilization (%)","[Polar Meteorology] Screwdriver Utilization (%)","[Computer and Computation Theory] Screwdriver Utilization (%)","[Mechanics and Materials] Screwdriver Utilization (%)","[Extragalactic Astronomy and Cosmology] Screwdriver Utilization (%)","[Design, Tools, and Test] Screwdriver Utilization (%)","[Geophysics] Screwdriver Utilization (%)","[Law and Social Sciences] Screwdriver Utilization (%)" +2016,0.205594605,0.158869690,0.169651039,0.086632370,0.059285321,0.053539693,0.042122040,0.052342327,0.042690242,0.040128681,0.040246812,0.037300698,0.031730574,0.026137709,0.000107440,0.021971967,0.024449328,0.018226577,0.017242731,0.009887257,0.014621755,0.012744043,0.004522180,0.001843241,0.003531514,0.004101270,0.003368886,0.002907402,0.002851648,0.002865972,0.002732620,0.001739572,0.001619220,0.000381426,0.000287004,0.000155040,0.000170393,0.000080089,0.000064148,0.000002960 +2017,0.004136693,0.031916856,0.000162532,0.004831834,0.006411680,0.009086825,0.013338508,0,0.013979573,0.003580087,0,0,0,0.004841687,0.027226051,0.002816838,0,0.002748503,0.000428009,0.005103678,0.000172803,0.001060537,0,0.002484323,0.000588213,0.000009893,0,0,0.000100623,0,0,0.000032629,0.000061089,0.000004971,0,0.000077487,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Day-reference.csv index 50f8166285..62c6dd045c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Users: Active" -Unknown,66 +"Mathematical and Physical Sciences",24 +Engineering,13 +Geosciences,9 +"Biological Sciences",6 +"Social, Behavioral, and Economic Sciences",6 +"Computer and Information Science and Engineering",5 +Humanities/Arts,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Month-reference.csv index 50f8166285..62c6dd045c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Users: Active" -Unknown,66 +"Mathematical and Physical Sciences",24 +Engineering,13 +Geosciences,9 +"Biological Sciences",6 +"Social, Behavioral, and Economic Sciences",6 +"Computer and Information Science and Engineering",5 +Humanities/Arts,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Quarter-reference.csv index 50f8166285..62c6dd045c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Users: Active" -Unknown,66 +"Mathematical and Physical Sciences",24 +Engineering,13 +Geosciences,9 +"Biological Sciences",6 +"Social, Behavioral, and Economic Sciences",6 +"Computer and Information Science and Engineering",5 +Humanities/Arts,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Year-reference.csv index 50f8166285..62c6dd045c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Users: Active" -Unknown,66 +"Mathematical and Physical Sciences",24 +Engineering,13 +Geosciences,9 +"Biological Sciences",6 +"Social, Behavioral, and Economic Sciences",6 +"Computer and Information Science and Engineering",5 +Humanities/Arts,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Day-reference.csv index ac0fef7e05..45857a20f8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Users: Active" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,4 -2016-12-26,5 -2016-12-27,16 -2016-12-28,25 -2016-12-29,43 -2016-12-30,64 -2016-12-31,55 -2017-01-01,38 +Day,"[Mathematical and Physical Sciences] Number of Users: Active","[Engineering] Number of Users: Active","[Geosciences] Number of Users: Active","[Biological Sciences] Number of Users: Active","[Social, Behavioral, and Economic Sciences] Number of Users: Active","[Computer and Information Science and Engineering] Number of Users: Active","[Humanities/Arts] Number of Users: Active" +2016-12-22,1,0,0,1,0,0,0 +2016-12-23,2,0,0,1,0,0,0 +2016-12-24,2,0,0,1,0,0,0 +2016-12-25,3,0,0,1,0,0,0 +2016-12-26,4,0,0,1,0,0,0 +2016-12-27,10,1,0,4,1,0,0 +2016-12-28,15,2,1,4,1,2,0 +2016-12-29,19,6,4,5,3,4,2 +2016-12-30,24,12,8,6,6,5,3 +2016-12-31,20,13,6,5,4,4,3 +2017-01-01,12,10,5,4,3,2,2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Month-reference.csv index b0e22e4e99..c2f2e1c0a6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Users: Active" -2016-12,66 -2017-01,38 +Month,"[Mathematical and Physical Sciences] Number of Users: Active","[Engineering] Number of Users: Active","[Geosciences] Number of Users: Active","[Biological Sciences] Number of Users: Active","[Social, Behavioral, and Economic Sciences] Number of Users: Active","[Computer and Information Science and Engineering] Number of Users: Active","[Humanities/Arts] Number of Users: Active" +2016-12,24,13,9,6,6,5,3 +2017-01,12,10,5,4,3,2,2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Quarter-reference.csv index e7e7f8a70d..6a49055b0e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Users: Active" -"2016 Q4",66 -"2017 Q1",38 +Quarter,"[Mathematical and Physical Sciences] Number of Users: Active","[Engineering] Number of Users: Active","[Geosciences] Number of Users: Active","[Biological Sciences] Number of Users: Active","[Social, Behavioral, and Economic Sciences] Number of Users: Active","[Computer and Information Science and Engineering] Number of Users: Active","[Humanities/Arts] Number of Users: Active" +"2016 Q4",24,13,9,6,6,5,3 +"2017 Q1",12,10,5,4,3,2,2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Year-reference.csv index 4eaa47b95a..7907c220f7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_person_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Users: Active" -2016,66 -2017,38 +Year,"[Mathematical and Physical Sciences] Number of Users: Active","[Engineering] Number of Users: Active","[Geosciences] Number of Users: Active","[Biological Sciences] Number of Users: Active","[Social, Behavioral, and Economic Sciences] Number of Users: Active","[Computer and Information Science and Engineering] Number of Users: Active","[Humanities/Arts] Number of Users: Active" +2016,24,13,9,6,6,5,3 +2017,12,10,5,4,3,2,2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Day-reference.csv index 02abc27f70..212bac5177 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of PIs: Active" -Unknown,41 +"Mathematical and Physical Sciences",11 +Geosciences,9 +Engineering,8 +"Biological Sciences",4 +"Computer and Information Science and Engineering",4 +"Social, Behavioral, and Economic Sciences",4 +Humanities/Arts,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Month-reference.csv index 02abc27f70..212bac5177 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of PIs: Active" -Unknown,41 +"Mathematical and Physical Sciences",11 +Geosciences,9 +Engineering,8 +"Biological Sciences",4 +"Computer and Information Science and Engineering",4 +"Social, Behavioral, and Economic Sciences",4 +Humanities/Arts,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Quarter-reference.csv index 02abc27f70..212bac5177 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of PIs: Active" -Unknown,41 +"Mathematical and Physical Sciences",11 +Geosciences,9 +Engineering,8 +"Biological Sciences",4 +"Computer and Information Science and Engineering",4 +"Social, Behavioral, and Economic Sciences",4 +Humanities/Arts,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Year-reference.csv index 02abc27f70..212bac5177 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of PIs: Active" -Unknown,41 +"Mathematical and Physical Sciences",11 +Geosciences,9 +Engineering,8 +"Biological Sciences",4 +"Computer and Information Science and Engineering",4 +"Social, Behavioral, and Economic Sciences",4 +Humanities/Arts,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Day-reference.csv index 19889d1e99..bcf2e11feb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of PIs: Active" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,3 -2016-12-26,4 -2016-12-27,11 -2016-12-28,18 -2016-12-29,28 -2016-12-30,39 -2016-12-31,34 -2017-01-01,25 +Day,"[Mathematical and Physical Sciences] Number of PIs: Active","[Geosciences] Number of PIs: Active","[Engineering] Number of PIs: Active","[Biological Sciences] Number of PIs: Active","[Computer and Information Science and Engineering] Number of PIs: Active","[Social, Behavioral, and Economic Sciences] Number of PIs: Active","[Humanities/Arts] Number of PIs: Active" +2016-12-22,1,0,0,1,0,0,0 +2016-12-23,2,0,0,1,0,0,0 +2016-12-24,2,0,0,1,0,0,0 +2016-12-25,2,0,0,1,0,0,0 +2016-12-26,3,0,0,1,0,0,0 +2016-12-27,6,0,1,3,0,1,0 +2016-12-28,9,1,2,3,2,1,0 +2016-12-29,10,4,5,3,3,2,1 +2016-12-30,11,8,7,4,4,4,1 +2016-12-31,9,6,8,4,3,3,1 +2017-01-01,6,5,6,3,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Month-reference.csv index 35e920be5c..26a787e298 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of PIs: Active" -2016-12,41 -2017-01,25 +Month,"[Mathematical and Physical Sciences] Number of PIs: Active","[Geosciences] Number of PIs: Active","[Engineering] Number of PIs: Active","[Biological Sciences] Number of PIs: Active","[Computer and Information Science and Engineering] Number of PIs: Active","[Social, Behavioral, and Economic Sciences] Number of PIs: Active","[Humanities/Arts] Number of PIs: Active" +2016-12,11,9,8,4,4,4,1 +2017-01,6,5,6,3,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Quarter-reference.csv index b1e694b445..cffe3f1eca 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of PIs: Active" -"2016 Q4",41 -"2017 Q1",25 +Quarter,"[Mathematical and Physical Sciences] Number of PIs: Active","[Geosciences] Number of PIs: Active","[Engineering] Number of PIs: Active","[Biological Sciences] Number of PIs: Active","[Computer and Information Science and Engineering] Number of PIs: Active","[Social, Behavioral, and Economic Sciences] Number of PIs: Active","[Humanities/Arts] Number of PIs: Active" +"2016 Q4",11,9,8,4,4,4,1 +"2017 Q1",6,5,6,3,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Year-reference.csv index be3768e472..2a02d91a75 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_pi_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of PIs: Active" -2016,41 -2017,25 +Year,"[Mathematical and Physical Sciences] Number of PIs: Active","[Geosciences] Number of PIs: Active","[Engineering] Number of PIs: Active","[Biological Sciences] Number of PIs: Active","[Computer and Information Science and Engineering] Number of PIs: Active","[Social, Behavioral, and Economic Sciences] Number of PIs: Active","[Humanities/Arts] Number of PIs: Active" +2016,11,9,8,4,4,4,1 +2017,6,5,6,3,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Day-reference.csv index cdd1c26fb6..0343c162c2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Resources: Active" -Unknown,5 +"Mathematical and Physical Sciences",5 +"Social, Behavioral, and Economic Sciences",5 +Engineering,3 +Geosciences,3 +"Biological Sciences",2 +Humanities/Arts,2 +"Computer and Information Science and Engineering",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Month-reference.csv index cdd1c26fb6..0343c162c2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Resources: Active" -Unknown,5 +"Mathematical and Physical Sciences",5 +"Social, Behavioral, and Economic Sciences",5 +Engineering,3 +Geosciences,3 +"Biological Sciences",2 +Humanities/Arts,2 +"Computer and Information Science and Engineering",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Quarter-reference.csv index cdd1c26fb6..0343c162c2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Resources: Active" -Unknown,5 +"Mathematical and Physical Sciences",5 +"Social, Behavioral, and Economic Sciences",5 +Engineering,3 +Geosciences,3 +"Biological Sciences",2 +Humanities/Arts,2 +"Computer and Information Science and Engineering",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Year-reference.csv index cdd1c26fb6..0343c162c2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Resources: Active" -Unknown,5 +"Mathematical and Physical Sciences",5 +"Social, Behavioral, and Economic Sciences",5 +Engineering,3 +Geosciences,3 +"Biological Sciences",2 +Humanities/Arts,2 +"Computer and Information Science and Engineering",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Day-reference.csv index 887e1c457c..c79bb1feaa 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Resources: Active" -2016-12-22,2 -2016-12-23,2 -2016-12-24,2 -2016-12-25,2 -2016-12-26,3 -2016-12-27,5 -2016-12-28,5 -2016-12-29,5 -2016-12-30,5 -2016-12-31,5 -2017-01-01,5 +Day,"[Mathematical and Physical Sciences] Number of Resources: Active","[Social, Behavioral, and Economic Sciences] Number of Resources: Active","[Engineering] Number of Resources: Active","[Geosciences] Number of Resources: Active","[Biological Sciences] Number of Resources: Active","[Humanities/Arts] Number of Resources: Active","[Computer and Information Science and Engineering] Number of Resources: Active" +2016-12-22,1,0,0,0,1,0,0 +2016-12-23,1,0,0,0,1,0,0 +2016-12-24,1,0,0,0,1,0,0 +2016-12-25,1,0,0,0,1,0,0 +2016-12-26,2,0,0,0,1,0,0 +2016-12-27,4,1,1,0,2,0,0 +2016-12-28,4,1,1,1,2,0,1 +2016-12-29,4,4,3,3,2,2,1 +2016-12-30,5,5,3,3,2,2,1 +2016-12-31,5,5,3,3,2,2,1 +2017-01-01,5,5,3,2,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Month-reference.csv index 6bd6a8c86b..63706fd663 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Resources: Active" -2016-12,5 -2017-01,5 +Month,"[Mathematical and Physical Sciences] Number of Resources: Active","[Social, Behavioral, and Economic Sciences] Number of Resources: Active","[Engineering] Number of Resources: Active","[Geosciences] Number of Resources: Active","[Biological Sciences] Number of Resources: Active","[Humanities/Arts] Number of Resources: Active","[Computer and Information Science and Engineering] Number of Resources: Active" +2016-12,5,5,3,3,2,2,1 +2017-01,5,5,3,2,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Quarter-reference.csv index df804b6785..08681ffa96 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Resources: Active" -"2016 Q4",5 -"2017 Q1",5 +Quarter,"[Mathematical and Physical Sciences] Number of Resources: Active","[Social, Behavioral, and Economic Sciences] Number of Resources: Active","[Engineering] Number of Resources: Active","[Geosciences] Number of Resources: Active","[Biological Sciences] Number of Resources: Active","[Humanities/Arts] Number of Resources: Active","[Computer and Information Science and Engineering] Number of Resources: Active" +"2016 Q4",5,5,3,3,2,2,1 +"2017 Q1",5,5,3,2,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Year-reference.csv index 23aa61963e..dacc0eda21 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/active_resource_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Resources: Active" -2016,5 -2017,5 +Year,"[Mathematical and Physical Sciences] Number of Resources: Active","[Social, Behavioral, and Economic Sciences] Number of Resources: Active","[Engineering] Number of Resources: Active","[Geosciences] Number of Resources: Active","[Biological Sciences] Number of Resources: Active","[Humanities/Arts] Number of Resources: Active","[Computer and Information Science and Engineering] Number of Resources: Active" +2016,5,5,3,3,2,2,1 +2017,5,5,3,2,2,2,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Day-reference.csv index 084c71999e..1290cf60d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Per Job" -2016-12-22,202.12833333 -2016-12-23,194.86787037 -2016-12-24,200.00000000 -2016-12-25,129.71166667 -2016-12-26,205.12121212 -2016-12-27,370.31296958 -2016-12-28,182.19713395 -2016-12-29,98.42631226 -2016-12-30,9.53454400 -2016-12-31,7.50699692 -2017-01-01,4.21223217 +Day,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +2016-12-22,0,0,200.95666667,203.30000000,0,0,0 +2016-12-23,0,0,288.00000000,148.30180556,0,0,0 +2016-12-24,0,0,288.00000000,156.00000000,0,0,0 +2016-12-25,0,0,288.00000000,98.05400000,0,0,0 +2016-12-26,0,0,288.00000000,196.83333333,0,0,0 +2016-12-27,1246.47111111,0,166.08277778,349.39508333,0,0,3.21666667 +2016-12-28,147.49854595,0,271.00512821,681.38766382,6.69041168,94.01111111,24.00000000 +2016-12-29,214.07366750,46.91737374,66.39927778,585.33533832,14.21335853,582.30381944,7.39809663 +2016-12-30,229.01666415,107.24694444,26.59341111,19.79102838,14.58756597,6.26633395,3.03737720 +2016-12-31,107.44654864,171.46924897,106.20362847,17.08886588,13.61354217,6.56568955,3.78294327 +2017-01-01,67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv index 77806f3d9a..1ace5019f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Per Job" -2016-12,13.71267944 -2017-01,4.21223217 +Month,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +2016-12,404.22454684,183.58806397,96.23316926,39.87568906,25.19334377,12.64740448,3.49505680 +2017-01,67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv index 71cb109926..82a44a8843 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Per Job" -"2016 Q4",13.71267944 -"2017 Q1",4.21223217 +Quarter,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +"2016 Q4",404.22454684,183.58806397,96.23316926,39.87568906,25.19334377,12.64740448,3.49505680 +"2017 Q1",67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv index 342f85e1e1..2761cc19c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Per Job" -2016,13.71267944 -2017,4.21223217 +Year,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +2016,404.22454684,183.58806397,96.23316926,39.87568906,25.19334377,12.64740448,3.49505680 +2017,67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Day-reference.csv index 084c71999e..1290cf60d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Per Job" -2016-12-22,202.12833333 -2016-12-23,194.86787037 -2016-12-24,200.00000000 -2016-12-25,129.71166667 -2016-12-26,205.12121212 -2016-12-27,370.31296958 -2016-12-28,182.19713395 -2016-12-29,98.42631226 -2016-12-30,9.53454400 -2016-12-31,7.50699692 -2017-01-01,4.21223217 +Day,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +2016-12-22,0,0,200.95666667,203.30000000,0,0,0 +2016-12-23,0,0,288.00000000,148.30180556,0,0,0 +2016-12-24,0,0,288.00000000,156.00000000,0,0,0 +2016-12-25,0,0,288.00000000,98.05400000,0,0,0 +2016-12-26,0,0,288.00000000,196.83333333,0,0,0 +2016-12-27,1246.47111111,0,166.08277778,349.39508333,0,0,3.21666667 +2016-12-28,147.49854595,0,271.00512821,681.38766382,6.69041168,94.01111111,24.00000000 +2016-12-29,214.07366750,46.91737374,66.39927778,585.33533832,14.21335853,582.30381944,7.39809663 +2016-12-30,229.01666415,107.24694444,26.59341111,19.79102838,14.58756597,6.26633395,3.03737720 +2016-12-31,107.44654864,171.46924897,106.20362847,17.08886588,13.61354217,6.56568955,3.78294327 +2017-01-01,67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Month-reference.csv index 77806f3d9a..1ace5019f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Per Job" -2016-12,13.71267944 -2017-01,4.21223217 +Month,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +2016-12,404.22454684,183.58806397,96.23316926,39.87568906,25.19334377,12.64740448,3.49505680 +2017-01,67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Quarter-reference.csv index 71cb109926..82a44a8843 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Per Job" -"2016 Q4",13.71267944 -"2017 Q1",4.21223217 +Quarter,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +"2016 Q4",404.22454684,183.58806397,96.23316926,39.87568906,25.19334377,12.64740448,3.49505680 +"2017 Q1",67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Year-reference.csv index 342f85e1e1..2761cc19c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Per Job" -2016,13.71267944 -2017,4.21223217 +Year,"[Engineering] CPU Hours: Per Job","[Humanities/Arts] CPU Hours: Per Job","[Biological Sciences] CPU Hours: Per Job","[Mathematical and Physical Sciences] CPU Hours: Per Job","[Computer and Information Science and Engineering] CPU Hours: Per Job","[Geosciences] CPU Hours: Per Job","[Social, Behavioral, and Economic Sciences] CPU Hours: Per Job" +2016,404.22454684,183.58806397,96.23316926,39.87568906,25.19334377,12.64740448,3.49505680 +2017,67.15728861,59.98977778,20.54366410,32.64719972,12.31921090,23.37171659,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv index 4ca70e8942..c70319d289 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +Engineering,101.2769 +"Mathematical and Physical Sciences",93.8663 +"Biological Sciences",31.3393 +Geosciences,18.1667 +Humanities/Arts,11.8252 +"Social, Behavioral, and Economic Sciences",10.8677 +"Computer and Information Science and Engineering",1.7640 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv index 4ca70e8942..c70319d289 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +Engineering,101.2769 +"Mathematical and Physical Sciences",93.8663 +"Biological Sciences",31.3393 +Geosciences,18.1667 +Humanities/Arts,11.8252 +"Social, Behavioral, and Economic Sciences",10.8677 +"Computer and Information Science and Engineering",1.7640 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv index 4ca70e8942..c70319d289 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +Engineering,101.2769 +"Mathematical and Physical Sciences",93.8663 +"Biological Sciences",31.3393 +Geosciences,18.1667 +Humanities/Arts,11.8252 +"Social, Behavioral, and Economic Sciences",10.8677 +"Computer and Information Science and Engineering",1.7640 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv index 4ca70e8942..c70319d289 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +Engineering,101.2769 +"Mathematical and Physical Sciences",93.8663 +"Biological Sciences",31.3393 +Geosciences,18.1667 +Humanities/Arts,11.8252 +"Social, Behavioral, and Economic Sciences",10.8677 +"Computer and Information Science and Engineering",1.7640 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv index 7ef4fb2c31..6dde69dcfd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016-12-22,12.0000 -2016-12-23,11.8381 -2016-12-24,11.5600 -2016-12-25,14.0099 -2016-12-26,18.3933 -2016-12-27,67.8600 -2016-12-28,107.6133 -2016-12-29,87.5874 -2016-12-30,69.1154 -2016-12-31,43.3544 -2017-01-01,22.2755 +Day,"[Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical and Physical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Biological Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Geosciences] Job Size: Weighted By CPU Hours (Core Count)","[Humanities/Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Information Science and Engineering] Job Size: Weighted By CPU Hours (Core Count)" +2016-12-22,0,12.0000,12.0000,0,0,0,0 +2016-12-23,0,11.6809,12.0000,0,0,0,0 +2016-12-24,0,11.1538,12.0000,0,0,0,0 +2016-12-25,0,15.1906,12.0000,0,0,0,0 +2016-12-26,0,19.3287,12.0000,0,0,0,0 +2016-12-27,96.0000,63.9290,19.8357,0,0,1.0000,0 +2016-12-28,88.1962,124.0581,33.0691,20.0000,0,1.0000,2.8865 +2016-12-29,89.9037,104.0892,28.0857,88.5857,11.5552,10.2034,1.6777 +2016-12-30,112.1825,99.9328,32.5776,23.1791,11.8713,10.9005,1.9011 +2016-12-31,112.3553,64.8745,36.8877,7.7053,11.8540,10.8898,1.7160 +2017-01-01,68.1385,22.6656,38.3114,12.0180,10.7741,10.5763,1.5550 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv index ab8f8472c6..21b11129d7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016-12,69.5398 -2017-01,22.2755 +Month,"[Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical and Physical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Biological Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Geosciences] Job Size: Weighted By CPU Hours (Core Count)","[Humanities/Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Information Science and Engineering] Job Size: Weighted By CPU Hours (Core Count)" +2016-12,102.9933,97.4694,30.0052,26.3413,11.8512,10.8841,1.8047 +2017-01,68.1385,22.6656,38.3114,12.0180,10.7741,10.5763,1.5550 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv index ab08ea31ad..01991de945 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -"2016 Q4",69.5398 -"2017 Q1",22.2755 +Quarter,"[Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical and Physical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Biological Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Geosciences] Job Size: Weighted By CPU Hours (Core Count)","[Humanities/Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Information Science and Engineering] Job Size: Weighted By CPU Hours (Core Count)" +"2016 Q4",102.9933,97.4694,30.0052,26.3413,11.8512,10.8841,1.8047 +"2017 Q1",68.1385,22.6656,38.3114,12.0180,10.7741,10.5763,1.5550 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv index 6cb371e9e2..e57983ebf7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016,69.5398 -2017,22.2755 +Year,"[Engineering] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical and Physical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Biological Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Geosciences] Job Size: Weighted By CPU Hours (Core Count)","[Humanities/Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Information Science and Engineering] Job Size: Weighted By CPU Hours (Core Count)" +2016,102.9933,97.4694,30.0052,26.3413,11.8512,10.8841,1.8047 +2017,68.1385,22.6656,38.3114,12.0180,10.7741,10.5763,1.5550 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Day-reference.csv index f6d8fcf27a..9d23c3f64e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,28.72362434 -2016-12-28,19.14359259 -2016-12-29,16.39568790 -2016-12-30,1.81280749 -2016-12-31,1.60081062 -2017-01-01,1.07790443 +Day,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +2016-12-22,0,0,0,16.74638889,0,16.94166667,0 +2016-12-23,0,0,0,24.00000000,0,16.30180556,0 +2016-12-24,0,0,0,24.00000000,0,24.00000000,0 +2016-12-25,0,0,0,24.00000000,0,11.30155556,0 +2016-12-26,0,0,0,24.00000000,0,13.35208333,0 +2016-12-27,103.87259259,0,0,18.01625000,0,24.91425926,3.21666667 +2016-12-28,23.39817558,5.11274929,0,32.02948718,4.70055556,43.35951567,24.00000000 +2016-12-29,31.24421888,13.00927766,4.34454545,11.06724359,50.53201389,39.47018162,1.27936230 +2016-12-30,33.89972306,13.19797834,9.68358547,5.37832698,4.08397301,1.48685926,0.33097065 +2016-12-31,16.25349374,12.51093474,15.93161523,12.94794271,5.40183243,1.53228783,0.37017739 +2017-01-01,13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Month-reference.csv index b7c1043a09..365940c0f9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Per Job" -2016-12,2.46307856 -2017-01,1.07790443 +Month,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +2016-12,59.91741394,22.90902738,16.77843434,14.23923287,8.07149077,2.91895910,0.36183462 +2017-01,13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Quarter-reference.csv index e050668ad6..6dc4f413cd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Per Job" -"2016 Q4",2.46307856 -"2017 Q1",1.07790443 +Quarter,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +"2016 Q4",59.91741394,22.90902738,16.77843434,14.23923287,8.07149077,2.91895910,0.36183462 +"2017 Q1",13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Year-reference.csv index 0eb539fc78..21efb1bc79 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Per Job" -2016,2.46307856 -2017,1.07790443 +Year,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +2016,59.91741394,22.90902738,16.77843434,14.23923287,8.07149077,2.91895910,0.36183462 +2017,13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Day-reference.csv index f6d8fcf27a..9d23c3f64e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,28.72362434 -2016-12-28,19.14359259 -2016-12-29,16.39568790 -2016-12-30,1.81280749 -2016-12-31,1.60081062 -2017-01-01,1.07790443 +Day,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +2016-12-22,0,0,0,16.74638889,0,16.94166667,0 +2016-12-23,0,0,0,24.00000000,0,16.30180556,0 +2016-12-24,0,0,0,24.00000000,0,24.00000000,0 +2016-12-25,0,0,0,24.00000000,0,11.30155556,0 +2016-12-26,0,0,0,24.00000000,0,13.35208333,0 +2016-12-27,103.87259259,0,0,18.01625000,0,24.91425926,3.21666667 +2016-12-28,23.39817558,5.11274929,0,32.02948718,4.70055556,43.35951567,24.00000000 +2016-12-29,31.24421888,13.00927766,4.34454545,11.06724359,50.53201389,39.47018162,1.27936230 +2016-12-30,33.89972306,13.19797834,9.68358547,5.37832698,4.08397301,1.48685926,0.33097065 +2016-12-31,16.25349374,12.51093474,15.93161523,12.94794271,5.40183243,1.53228783,0.37017739 +2017-01-01,13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Month-reference.csv index b7c1043a09..365940c0f9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Per Job" -2016-12,2.46307856 -2017-01,1.07790443 +Month,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +2016-12,59.91741394,22.90902738,16.77843434,14.23923287,8.07149077,2.91895910,0.36183462 +2017-01,13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Quarter-reference.csv index e050668ad6..6dc4f413cd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Per Job" -"2016 Q4",2.46307856 -"2017 Q1",1.07790443 +Quarter,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +"2016 Q4",59.91741394,22.90902738,16.77843434,14.23923287,8.07149077,2.91895910,0.36183462 +"2017 Q1",13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Year-reference.csv index 0eb539fc78..21efb1bc79 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_node_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Per Job" -2016,2.46307856 -2017,1.07790443 +Year,"[Engineering] Node Hours: Per Job","[Computer and Information Science and Engineering] Node Hours: Per Job","[Humanities/Arts] Node Hours: Per Job","[Biological Sciences] Node Hours: Per Job","[Geosciences] Node Hours: Per Job","[Mathematical and Physical Sciences] Node Hours: Per Job","[Social, Behavioral, and Economic Sciences] Node Hours: Per Job" +2016,59.91741394,22.90902738,16.77843434,14.23923287,8.07149077,2.91895910,0.36183462 +2017,13.09319008,11.46455460,6.53122222,2.39604528,1.95282464,3.14905354,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Day-reference.csv index 92e62c473a..7f9cfd050c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Per Job (Core Count)" -2016-12-22,12.0000 -2016-12-23,8.3333 -2016-12-24,8.3333 -2016-12-25,14.1667 -2016-12-26,15.0000 -2016-12-27,29.0238 -2016-12-28,11.5644 -2016-12-29,6.8638 -2016-12-30,8.0163 -2016-12-31,8.7857 -2017-01-01,9.1326 +Day,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +2016-12-22,12.0000,0,0,12.0000,0,0,0 +2016-12-23,12.0000,0,0,6.5000,0,0,0 +2016-12-24,12.0000,0,0,6.5000,0,0,0 +2016-12-25,12.0000,0,0,14.6000,0,0,0 +2016-12-26,12.0000,0,0,15.3000,0,0,0 +2016-12-27,16.0000,96.0000,0,26.7333,1.0000,0,0 +2016-12-28,12.9231,9.7963,0,41.0000,1.0000,20.0000,1.1795 +2016-12-29,3.6000,11.6015,11.2727,30.3013,9.5486,56.2500,1.1142 +2016-12-30,24.3200,14.6103,11.2000,8.4610,8.4554,1.7033,1.1780 +2016-12-31,37.6250,9.4296,10.8889,9.3074,9.5422,1.3346,1.1193 +2017-01-01,32.0520,12.9811,10.4000,11.5330,9.1618,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Month-reference.csv index 7e28933818..48cfa69fe6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Per Job (Core Count)" -2016-12,8.5390 -2017-01,9.1326 +Month,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +2016-12,27.5440,11.2471,11.0909,9.0258,8.4469,1.7194,1.1430 +2017-01,32.0520,12.9811,10.4000,9.1618,11.5330,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Quarter-reference.csv index 360b6c8ed1..582d33a807 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Per Job (Core Count)" -"2016 Q4",8.5390 -"2017 Q1",9.1326 +Quarter,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +"2016 Q4",27.5440,11.2471,11.0909,9.0258,8.4469,1.7194,1.1430 +"2017 Q1",32.0520,12.9811,10.4000,9.1618,11.5330,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Year-reference.csv index 293c846ca1..82f6119b78 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Per Job (Core Count)" -2016,8.5390 -2017,9.1326 +Year,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +2016,27.5440,11.2471,11.0909,9.0258,8.4469,1.7194,1.1430 +2017,32.0520,12.9811,10.4000,9.1618,11.5330,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Day-reference.csv index 92e62c473a..7f9cfd050c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Per Job (Core Count)" -2016-12-22,12.0000 -2016-12-23,8.3333 -2016-12-24,8.3333 -2016-12-25,14.1667 -2016-12-26,15.0000 -2016-12-27,29.0238 -2016-12-28,11.5644 -2016-12-29,6.8638 -2016-12-30,8.0163 -2016-12-31,8.7857 -2017-01-01,9.1326 +Day,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +2016-12-22,12.0000,0,0,12.0000,0,0,0 +2016-12-23,12.0000,0,0,6.5000,0,0,0 +2016-12-24,12.0000,0,0,6.5000,0,0,0 +2016-12-25,12.0000,0,0,14.6000,0,0,0 +2016-12-26,12.0000,0,0,15.3000,0,0,0 +2016-12-27,16.0000,96.0000,0,26.7333,1.0000,0,0 +2016-12-28,12.9231,9.7963,0,41.0000,1.0000,20.0000,1.1795 +2016-12-29,3.6000,11.6015,11.2727,30.3013,9.5486,56.2500,1.1142 +2016-12-30,24.3200,14.6103,11.2000,8.4610,8.4554,1.7033,1.1780 +2016-12-31,37.6250,9.4296,10.8889,9.3074,9.5422,1.3346,1.1193 +2017-01-01,32.0520,12.9811,10.4000,11.5330,9.1618,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Month-reference.csv index 7e28933818..48cfa69fe6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Per Job (Core Count)" -2016-12,8.5390 -2017-01,9.1326 +Month,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +2016-12,27.5440,11.2471,11.0909,9.0258,8.4469,1.7194,1.1430 +2017-01,32.0520,12.9811,10.4000,9.1618,11.5330,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Quarter-reference.csv index 360b6c8ed1..582d33a807 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Per Job (Core Count)" -"2016 Q4",8.5390 -"2017 Q1",9.1326 +Quarter,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +"2016 Q4",27.5440,11.2471,11.0909,9.0258,8.4469,1.7194,1.1430 +"2017 Q1",32.0520,12.9811,10.4000,9.1618,11.5330,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Year-reference.csv index 293c846ca1..82f6119b78 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Per Job (Core Count)" -2016,8.5390 -2017,9.1326 +Year,"[Biological Sciences] Job Size: Per Job (Core Count)","[Engineering] Job Size: Per Job (Core Count)","[Humanities/Arts] Job Size: Per Job (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Per Job (Core Count)","[Mathematical and Physical Sciences] Job Size: Per Job (Core Count)","[Geosciences] Job Size: Per Job (Core Count)","[Computer and Information Science and Engineering] Job Size: Per Job (Core Count)" +2016,27.5440,11.2471,11.0909,9.0258,8.4469,1.7194,1.1430 +2017,32.0520,12.9811,10.4000,9.1618,11.5330,11.3386,1.0994 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Day-reference.csv index 21782badba..ebe37b0921 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Biological Sciences",23.22531746,3.3791413016727105 +"Mathematical and Physical Sciences",21.21300381,0.7320123847068871 +Engineering,8.29298478,0.8262094447522345 +Humanities/Arts,4.87037458,0.44747381160758987 +Geosciences,4.20178504,0.10235707106304519 +"Social, Behavioral, and Economic Sciences",1.99144263,0.025430337208220542 +"Computer and Information Science and Engineering",0.20800686,0.015445917527693484 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Month-reference.csv index 21782badba..ebe37b0921 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Biological Sciences",23.22531746,3.3791413016727105 +"Mathematical and Physical Sciences",21.21300381,0.7320123847068871 +Engineering,8.29298478,0.8262094447522345 +Humanities/Arts,4.87037458,0.44747381160758987 +Geosciences,4.20178504,0.10235707106304519 +"Social, Behavioral, and Economic Sciences",1.99144263,0.025430337208220542 +"Computer and Information Science and Engineering",0.20800686,0.015445917527693484 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Quarter-reference.csv index 21782badba..ebe37b0921 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Biological Sciences",23.22531746,3.3791413016727105 +"Mathematical and Physical Sciences",21.21300381,0.7320123847068871 +Engineering,8.29298478,0.8262094447522345 +Humanities/Arts,4.87037458,0.44747381160758987 +Geosciences,4.20178504,0.10235707106304519 +"Social, Behavioral, and Economic Sciences",1.99144263,0.025430337208220542 +"Computer and Information Science and Engineering",0.20800686,0.015445917527693484 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Year-reference.csv index 21782badba..ebe37b0921 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Biological Sciences",23.22531746,3.3791413016727105 +"Mathematical and Physical Sciences",21.21300381,0.7320123847068871 +Engineering,8.29298478,0.8262094447522345 +Humanities/Arts,4.87037458,0.44747381160758987 +Geosciences,4.20178504,0.10235707106304519 +"Social, Behavioral, and Economic Sciences",1.99144263,0.025430337208220542 +"Computer and Information Science and Engineering",0.20800686,0.015445917527693484 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Day-reference.csv index 809830ef22..467e03aaf5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wait Hours: Per Job" -2016-12-22,4.66625000 -2016-12-23,9.59638889 -2016-12-24,0.00000000 -2016-12-25,36.96185185 -2016-12-26,0.00066667 -2016-12-27,63.81457885 -2016-12-28,8.81944104 -2016-12-29,4.73013286 -2016-12-30,7.20200027 -2016-12-31,2.68411411 -2017-01-01,1.71038090 +Day,"[Biological Sciences] Wait Hours: Per Job","[Mathematical and Physical Sciences] Wait Hours: Per Job","[Engineering] Wait Hours: Per Job","[Humanities/Arts] Wait Hours: Per Job","[Geosciences] Wait Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wait Hours: Per Job","[Computer and Information Science and Engineering] Wait Hours: Per Job" +2016-12-22,0.00027778,9.33222222,0,0,0,0,0 +2016-12-23,0.00000000,9.59638889,0,0,0,0,0 +2016-12-24,0.00000000,0.00000000,0,0,0,0,0 +2016-12-25,0.00000000,36.96185185,0,0,0,0,0 +2016-12-26,0.00000000,0.00066667,0,0,0,0,0 +2016-12-27,202.60396825,12.44448611,103.71148148,0,0,0.00000000,0 +2016-12-28,280.72700000,18.33165509,8.21878931,0,0.00027778,0.00000000,0.04097293 +2016-12-29,12.05893162,39.51646368,3.35201389,0.87133838,8.57675926,7.71266385,0.04345597 +2016-12-30,14.31103283,35.41370328,1.28882479,5.77518519,2.45399724,1.34893024,0.32917740 +2016-12-31,80.03162037,0.66458122,14.92100248,0.00000000,6.31360942,2.80449242,0.35112299 +2017-01-01,11.14468327,0.11044023,0.48755291,0.00000000,5.07693066,1.47296410,0.03552149 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Month-reference.csv index 0bfcdee5d0..0f5ec62122 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wait Hours: Per Job" -2016-12,4.99051340 -2017-01,1.71038090 +Month,"[Biological Sciences] Wait Hours: Per Job","[Mathematical and Physical Sciences] Wait Hours: Per Job","[Engineering] Wait Hours: Per Job","[Humanities/Arts] Wait Hours: Per Job","[Geosciences] Wait Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wait Hours: Per Job","[Computer and Information Science and Engineering] Wait Hours: Per Job" +2016-12,33.49072683,22.31151628,9.25718519,4.87037458,3.58140917,2.14923636,0.22278137 +2017-01,11.14468327,0.11044023,0.48755291,0.00000000,5.07693066,1.47296410,0.03552149 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Quarter-reference.csv index c849dc8988..a0f8564a61 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wait Hours: Per Job" -"2016 Q4",4.99051340 -"2017 Q1",1.71038090 +Quarter,"[Biological Sciences] Wait Hours: Per Job","[Mathematical and Physical Sciences] Wait Hours: Per Job","[Engineering] Wait Hours: Per Job","[Humanities/Arts] Wait Hours: Per Job","[Geosciences] Wait Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wait Hours: Per Job","[Computer and Information Science and Engineering] Wait Hours: Per Job" +"2016 Q4",33.49072683,22.31151628,9.25718519,4.87037458,3.58140917,2.14923636,0.22278137 +"2017 Q1",11.14468327,0.11044023,0.48755291,0.00000000,5.07693066,1.47296410,0.03552149 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Year-reference.csv index bdb8c69481..02290d49fb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_waitduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wait Hours: Per Job" -2016,4.99051340 -2017,1.71038090 +Year,"[Biological Sciences] Wait Hours: Per Job","[Mathematical and Physical Sciences] Wait Hours: Per Job","[Engineering] Wait Hours: Per Job","[Humanities/Arts] Wait Hours: Per Job","[Geosciences] Wait Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wait Hours: Per Job","[Computer and Information Science and Engineering] Wait Hours: Per Job" +2016,33.49072683,22.31151628,9.25718519,4.87037458,3.58140917,2.14923636,0.22278137 +2017,11.14468327,0.11044023,0.48755291,0.00000000,5.07693066,1.47296410,0.03552149 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Day-reference.csv index a0b502d68c..15020a9074 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.017929611668507588 +Engineering,32.29722077, +"Computer and Information Science and Engineering",25.30770717, +Humanities/Arts,17.27322391, +"Biological Sciences",6.21035170,0.4195997254250178 +Geosciences,5.41253102,0.0390852045071304 +"Mathematical and Physical Sciences",1.37350189,0.05067553106484687 +"Social, Behavioral, and Economic Sciences",0.28820096,0.0031231359871834977 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Month-reference.csv index 42e563d821..ae55a4a004 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +Engineering,32.29722077,1.1156835781855632 +"Computer and Information Science and Engineering",25.30770717,0.10903555194264934 +Humanities/Arts,17.27322391,1.2812633375632778 +"Biological Sciences",6.21035170,0.9872353046375569 +Geosciences,5.41253102,0.08730703376986411 +"Mathematical and Physical Sciences",1.37350189,0.08794526811918975 +"Social, Behavioral, and Economic Sciences",0.28820096,0.004430889448528951 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Quarter-reference.csv index 42e563d821..ae55a4a004 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +Engineering,32.29722077,1.1156835781855632 +"Computer and Information Science and Engineering",25.30770717,0.10903555194264934 +Humanities/Arts,17.27322391,1.2812633375632778 +"Biological Sciences",6.21035170,0.9872353046375569 +Geosciences,5.41253102,0.08730703376986411 +"Mathematical and Physical Sciences",1.37350189,0.08794526811918975 +"Social, Behavioral, and Economic Sciences",0.28820096,0.004430889448528951 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Year-reference.csv index 42e563d821..ae55a4a004 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +Engineering,32.29722077,1.1156835781855632 +"Computer and Information Science and Engineering",25.30770717,0.10903555194264934 +Humanities/Arts,17.27322391,1.2812633375632778 +"Biological Sciences",6.21035170,0.9872353046375569 +Geosciences,5.41253102,0.08730703376986411 +"Mathematical and Physical Sciences",1.37350189,0.08794526811918975 +"Social, Behavioral, and Economic Sciences",0.28820096,0.004430889448528951 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Day-reference.csv index d60b357c1c..1060304a70 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wall Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,12.71865079 -2016-12-28,10.16476358 -2016-12-29,11.78420083 -2016-12-30,1.48544495 -2016-12-31,1.42967081 -2017-01-01,1.01283296 +Day,"[Engineering] Wall Hours: Per Job","[Computer and Information Science and Engineering] Wall Hours: Per Job","[Humanities/Arts] Wall Hours: Per Job","[Biological Sciences] Wall Hours: Per Job","[Geosciences] Wall Hours: Per Job","[Mathematical and Physical Sciences] Wall Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wall Hours: Per Job" +2016-12-22,0,0,0,16.74638889,0,16.94166667,0 +2016-12-23,0,0,0,24.00000000,0,16.30180556,0 +2016-12-24,0,0,0,24.00000000,0,24.00000000,0 +2016-12-25,0,0,0,24.00000000,0,11.30155556,0 +2016-12-26,0,0,0,24.00000000,0,13.35208333,0 +2016-12-27,12.98407407,0,0,14.69149306,0,12.48275000,3.21666667 +2016-12-28,13.52655521,5.11274929,0,19.10641026,4.70055556,14.21502137,24.00000000 +2016-12-29,16.83184733,13.00927766,4.34454545,8.48262821,14.96611111,14.75875356,1.18189040 +2016-12-30,18.95314451,13.19673760,9.68358547,4.19858095,3.99121069,0.65498804,0.31886620 +2016-12-31,9.47680621,12.51093474,15.93161523,7.41091146,5.36329308,0.87636759,0.36858846 +2017-01-01,9.35957023,11.46455460,6.53122222,1.24371227,1.95232138,2.56249763,0.06733589 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Month-reference.csv index 46096eba47..a1e97382a9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wall Hours: Per Job" -2016-12,1.97829913 -2017-01,1.01283296 +Month,"[Engineering] Wall Hours: Per Job","[Computer and Information Science and Engineering] Wall Hours: Per Job","[Humanities/Arts] Wall Hours: Per Job","[Biological Sciences] Wall Hours: Per Job","[Geosciences] Wall Hours: Per Job","[Mathematical and Physical Sciences] Wall Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wall Hours: Per Job" +2016-12,33.36889379,22.90818519,16.77843434,10.37271157,7.84480993,1.28661758,0.35467017 +2017-01,9.35957023,11.46455460,6.53122222,1.24371227,1.95232138,2.56249763,0.06733589 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Quarter-reference.csv index d9829a9d09..f98166c86e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wall Hours: Per Job" -"2016 Q4",1.97829913 -"2017 Q1",1.01283296 +Quarter,"[Engineering] Wall Hours: Per Job","[Computer and Information Science and Engineering] Wall Hours: Per Job","[Humanities/Arts] Wall Hours: Per Job","[Biological Sciences] Wall Hours: Per Job","[Geosciences] Wall Hours: Per Job","[Mathematical and Physical Sciences] Wall Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wall Hours: Per Job" +"2016 Q4",33.36889379,22.90818519,16.77843434,10.37271157,7.84480993,1.28661758,0.35467017 +"2017 Q1",9.35957023,11.46455460,6.53122222,1.24371227,1.95232138,2.56249763,0.06733589 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Year-reference.csv index eb2abfc6f0..cf509ce774 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/avg_wallduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wall Hours: Per Job" -2016,1.97829913 -2017,1.01283296 +Year,"[Engineering] Wall Hours: Per Job","[Computer and Information Science and Engineering] Wall Hours: Per Job","[Humanities/Arts] Wall Hours: Per Job","[Biological Sciences] Wall Hours: Per Job","[Geosciences] Wall Hours: Per Job","[Mathematical and Physical Sciences] Wall Hours: Per Job","[Social, Behavioral, and Economic Sciences] Wall Hours: Per Job" +2016,33.36889379,22.90818519,16.77843434,10.37271157,7.84480993,1.28661758,0.35467017 +2017,9.35957023,11.46455460,6.53122222,1.24371227,1.95232138,2.56249763,0.06733589 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Day-reference.csv index 2a2a91bd7b..e8a2c4ccbd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","User Expansion Factor" -Unknown,3.1031 +"Mathematical and Physical Sciences",8.2892 +"Social, Behavioral, and Economic Sciences",7.5872 +"Biological Sciences",5.9152 +Geosciences,1.8672 +Engineering,1.5836 +Humanities/Arts,1.2820 +"Computer and Information Science and Engineering",1.0082 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Month-reference.csv index 2a2a91bd7b..e8a2c4ccbd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","User Expansion Factor" -Unknown,3.1031 +"Mathematical and Physical Sciences",8.2892 +"Social, Behavioral, and Economic Sciences",7.5872 +"Biological Sciences",5.9152 +Geosciences,1.8672 +Engineering,1.5836 +Humanities/Arts,1.2820 +"Computer and Information Science and Engineering",1.0082 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Quarter-reference.csv index 2a2a91bd7b..e8a2c4ccbd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","User Expansion Factor" -Unknown,3.1031 +"Mathematical and Physical Sciences",8.2892 +"Social, Behavioral, and Economic Sciences",7.5872 +"Biological Sciences",5.9152 +Geosciences,1.8672 +Engineering,1.5836 +Humanities/Arts,1.2820 +"Computer and Information Science and Engineering",1.0082 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Year-reference.csv index 2a2a91bd7b..e8a2c4ccbd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","User Expansion Factor" -Unknown,3.1031 +"Mathematical and Physical Sciences",8.2892 +"Social, Behavioral, and Economic Sciences",7.5872 +"Biological Sciences",5.9152 +Geosciences,1.8672 +Engineering,1.5836 +Humanities/Arts,1.2820 +"Computer and Information Science and Engineering",1.0082 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Day-reference.csv index bbee5fca29..dd7964b9be 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] User Expansion Factor" -2016-12-22,1.0249 -2016-12-23,1.0302 -2016-12-24,1.0368 -2016-12-25,1.0813 -2016-12-26,1.1760 -2016-12-27,2.0450 -2016-12-28,1.5085 -2016-12-29,1.3802 -2016-12-30,4.9345 -2016-12-31,2.5839 -2017-01-01,2.7546 +Day,"[Mathematical and Physical Sciences] User Expansion Factor","[Social, Behavioral, and Economic Sciences] User Expansion Factor","[Biological Sciences] User Expansion Factor","[Geosciences] User Expansion Factor","[Engineering] User Expansion Factor","[Humanities/Arts] User Expansion Factor","[Computer and Information Science and Engineering] User Expansion Factor" +2016-12-22,1.0495,0,1.0000,0,0,0,0 +2016-12-23,1.0525,0,1.0000,0,0,0,0 +2016-12-24,1.0552,0,1.0000,0,0,0,0 +2016-12-25,1.1158,0,1.0000,0,0,0,0 +2016-12-26,1.2076,0,1.0000,0,0,0,0 +2016-12-27,1.6540,1.0000,2.9970,0,2.5533,0,0 +2016-12-28,1.2374,1.0000,2.6841,1.0000,1.7584,0,1.0014 +2016-12-29,1.5169,3.5135,2.3663,2.8342,1.6577,1.0436,1.0012 +2016-12-30,24.3083,5.1671,6.5484,1.2462,1.4851,1.4225,1.0026 +2016-12-31,1.5676,8.2251,4.5106,1.5960,1.6434,1.1163,1.0186 +2017-01-01,1.1019,21.0966,17.6377,3.9938,1.1558,1.1040,1.0087 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Month-reference.csv index 8a4e4eae98..76a1c12bce 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] User Expansion Factor" -2016-12,3.1481 -2017-01,2.7546 +Month,"[Mathematical and Physical Sciences] User Expansion Factor","[Social, Behavioral, and Economic Sciences] User Expansion Factor","[Biological Sciences] User Expansion Factor","[Geosciences] User Expansion Factor","[Engineering] User Expansion Factor","[Humanities/Arts] User Expansion Factor","[Computer and Information Science and Engineering] User Expansion Factor" +2016-12,8.7685,6.7861,4.1471,1.4970,1.6127,1.2872,1.0081 +2017-01,1.1019,21.0966,17.6377,3.9938,1.1558,1.1040,1.0087 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Quarter-reference.csv index cc8c372b9d..58615c3d7c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] User Expansion Factor" -"2016 Q4",3.1481 -"2017 Q1",2.7546 +Quarter,"[Mathematical and Physical Sciences] User Expansion Factor","[Social, Behavioral, and Economic Sciences] User Expansion Factor","[Biological Sciences] User Expansion Factor","[Geosciences] User Expansion Factor","[Engineering] User Expansion Factor","[Humanities/Arts] User Expansion Factor","[Computer and Information Science and Engineering] User Expansion Factor" +"2016 Q4",8.7685,6.7861,4.1471,1.4970,1.6127,1.2872,1.0081 +"2017 Q1",1.1019,21.0966,17.6377,3.9938,1.1558,1.1040,1.0087 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Year-reference.csv index 5574462c84..ccfc093bb4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/expansion_factor/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] User Expansion Factor" -2016,3.1481 -2017,2.7546 +Year,"[Mathematical and Physical Sciences] User Expansion Factor","[Social, Behavioral, and Economic Sciences] User Expansion Factor","[Biological Sciences] User Expansion Factor","[Geosciences] User Expansion Factor","[Engineering] User Expansion Factor","[Humanities/Arts] User Expansion Factor","[Computer and Information Science and Engineering] User Expansion Factor" +2016,8.7685,6.7861,4.1471,1.4970,1.6127,1.2872,1.0081 +2017,1.1019,21.0966,17.6377,3.9938,1.1558,1.1040,1.0087 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Day-reference.csv index 36e983d8fd..b323209538 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Ended" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Month-reference.csv index 36e983d8fd..b323209538 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Ended" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Quarter-reference.csv index 36e983d8fd..b323209538 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Ended" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Year-reference.csv index 36e983d8fd..b323209538 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Ended" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Day-reference.csv index b6b7887701..eabe9274db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Ended" -2016-12-22,0 -2016-12-23,0 -2016-12-24,0 -2016-12-25,0 -2016-12-26,0 -2016-12-27,0 -2016-12-28,0 -2016-12-29,0 -2016-12-30,26606 -2016-12-31,28141 -2017-01-01,16566 +Day,"[Social, Behavioral, and Economic Sciences] Number of Jobs Ended","[Mathematical and Physical Sciences] Number of Jobs Ended","[Computer and Information Science and Engineering] Number of Jobs Ended","[Geosciences] Number of Jobs Ended","[Engineering] Number of Jobs Ended","[Biological Sciences] Number of Jobs Ended","[Humanities/Arts] Number of Jobs Ended" +2016-12-22,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,0 +2016-12-28,0,0,0,0,0,0,0 +2016-12-29,0,0,0,0,0,0,0 +2016-12-30,20765,4654,815,88,84,161,39 +2016-12-31,22983,2860,886,1037,330,23,22 +2017-01-01,13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Month-reference.csv index 32e351243d..12dbe9d21d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Ended" -2016-12,54747 -2017-01,16566 +Month,"[Social, Behavioral, and Economic Sciences] Number of Jobs Ended","[Mathematical and Physical Sciences] Number of Jobs Ended","[Computer and Information Science and Engineering] Number of Jobs Ended","[Geosciences] Number of Jobs Ended","[Engineering] Number of Jobs Ended","[Biological Sciences] Number of Jobs Ended","[Humanities/Arts] Number of Jobs Ended" +2016-12,43748,7514,1701,1125,414,184,61 +2017-01,13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Quarter-reference.csv index 9120c4d682..878ac6aa6a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Ended" -"2016 Q4",54747 -"2017 Q1",16566 +Quarter,"[Social, Behavioral, and Economic Sciences] Number of Jobs Ended","[Mathematical and Physical Sciences] Number of Jobs Ended","[Computer and Information Science and Engineering] Number of Jobs Ended","[Geosciences] Number of Jobs Ended","[Engineering] Number of Jobs Ended","[Biological Sciences] Number of Jobs Ended","[Humanities/Arts] Number of Jobs Ended" +"2016 Q4",43748,7514,1701,1125,414,184,61 +"2017 Q1",13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Year-reference.csv index abf23fea63..b916a78410 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Ended" -2016,54747 -2017,16566 +Year,"[Social, Behavioral, and Economic Sciences] Number of Jobs Ended","[Mathematical and Physical Sciences] Number of Jobs Ended","[Computer and Information Science and Engineering] Number of Jobs Ended","[Geosciences] Number of Jobs Ended","[Engineering] Number of Jobs Ended","[Biological Sciences] Number of Jobs Ended","[Humanities/Arts] Number of Jobs Ended" +2016,43748,7514,1701,1125,414,184,61 +2017,13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Day-reference.csv index c315f1d05c..e8670a7a96 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Max (Core Count)" -Unknown,336 +Engineering,336 +"Biological Sciences",192 +"Mathematical and Physical Sciences",192 +Geosciences,160 +"Computer and Information Science and Engineering",108 +"Social, Behavioral, and Economic Sciences",56 +Humanities/Arts,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Month-reference.csv index c315f1d05c..e8670a7a96 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Max (Core Count)" -Unknown,336 +Engineering,336 +"Biological Sciences",192 +"Mathematical and Physical Sciences",192 +Geosciences,160 +"Computer and Information Science and Engineering",108 +"Social, Behavioral, and Economic Sciences",56 +Humanities/Arts,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Quarter-reference.csv index c315f1d05c..e8670a7a96 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Max (Core Count)" -Unknown,336 +Engineering,336 +"Biological Sciences",192 +"Mathematical and Physical Sciences",192 +Geosciences,160 +"Computer and Information Science and Engineering",108 +"Social, Behavioral, and Economic Sciences",56 +Humanities/Arts,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Year-reference.csv index c315f1d05c..e8670a7a96 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Max (Core Count)" -Unknown,336 +Engineering,336 +"Biological Sciences",192 +"Mathematical and Physical Sciences",192 +Geosciences,160 +"Computer and Information Science and Engineering",108 +"Social, Behavioral, and Economic Sciences",56 +Humanities/Arts,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Day-reference.csv index 8c031fd1a3..1ca92a38b2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Max (Core Count)" -2016-12-22,12 -2016-12-23,12 -2016-12-24,12 -2016-12-25,24 -2016-12-26,24 -2016-12-27,144 -2016-12-28,192 -2016-12-29,192 -2016-12-30,336 -2016-12-31,336 -2017-01-01,192 +Day,"[Engineering] Job Size: Max (Core Count)","[Biological Sciences] Job Size: Max (Core Count)","[Mathematical and Physical Sciences] Job Size: Max (Core Count)","[Geosciences] Job Size: Max (Core Count)","[Computer and Information Science and Engineering] Job Size: Max (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Max (Core Count)","[Humanities/Arts] Job Size: Max (Core Count)" +2016-12-22,0,12,12,0,0,0,0 +2016-12-23,0,12,12,0,0,0,0 +2016-12-24,0,12,12,0,0,0,0 +2016-12-25,0,12,24,0,0,0,0 +2016-12-26,0,12,24,0,0,0,0 +2016-12-27,96,64,144,0,0,1,0 +2016-12-28,96,64,192,20,8,1,0 +2016-12-29,112,64,192,160,8,56,12 +2016-12-30,336,192,192,160,108,56,12 +2016-12-31,336,192,192,60,12,48,12 +2017-01-01,96,192,72,160,8,48,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Month-reference.csv index e3d7bb2832..fa1e58c2a0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Max (Core Count)" -2016-12,336 -2017-01,192 +Month,"[Engineering] Job Size: Max (Core Count)","[Biological Sciences] Job Size: Max (Core Count)","[Mathematical and Physical Sciences] Job Size: Max (Core Count)","[Geosciences] Job Size: Max (Core Count)","[Computer and Information Science and Engineering] Job Size: Max (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Max (Core Count)","[Humanities/Arts] Job Size: Max (Core Count)" +2016-12,336,192,192,160,108,56,12 +2017-01,96,192,72,160,8,48,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Quarter-reference.csv index b0bfb13604..72f297bff7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Max (Core Count)" -"2016 Q4",336 -"2017 Q1",192 +Quarter,"[Engineering] Job Size: Max (Core Count)","[Biological Sciences] Job Size: Max (Core Count)","[Mathematical and Physical Sciences] Job Size: Max (Core Count)","[Geosciences] Job Size: Max (Core Count)","[Computer and Information Science and Engineering] Job Size: Max (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Max (Core Count)","[Humanities/Arts] Job Size: Max (Core Count)" +"2016 Q4",336,192,192,160,108,56,12 +"2017 Q1",96,192,72,160,8,48,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Year-reference.csv index c83011f3d7..fb3915905e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/max_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Max (Core Count)" -2016,336 -2017,192 +Year,"[Engineering] Job Size: Max (Core Count)","[Biological Sciences] Job Size: Max (Core Count)","[Mathematical and Physical Sciences] Job Size: Max (Core Count)","[Geosciences] Job Size: Max (Core Count)","[Computer and Information Science and Engineering] Job Size: Max (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Max (Core Count)","[Humanities/Arts] Job Size: Max (Core Count)" +2016,336,192,192,160,108,56,12 +2017,96,192,72,160,8,48,12 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Day-reference.csv index 5e051e906b..c14f8a3734 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Min (Core Count)" -Unknown,1 +"Biological Sciences",1 +"Computer and Information Science and Engineering",1 +Engineering,1 +Geosciences,1 +Humanities/Arts,1 +"Mathematical and Physical Sciences",1 +"Social, Behavioral, and Economic Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Month-reference.csv index 5e051e906b..c14f8a3734 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Min (Core Count)" -Unknown,1 +"Biological Sciences",1 +"Computer and Information Science and Engineering",1 +Engineering,1 +Geosciences,1 +Humanities/Arts,1 +"Mathematical and Physical Sciences",1 +"Social, Behavioral, and Economic Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Quarter-reference.csv index 5e051e906b..c14f8a3734 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Min (Core Count)" -Unknown,1 +"Biological Sciences",1 +"Computer and Information Science and Engineering",1 +Engineering,1 +Geosciences,1 +Humanities/Arts,1 +"Mathematical and Physical Sciences",1 +"Social, Behavioral, and Economic Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Year-reference.csv index 5e051e906b..c14f8a3734 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Job Size: Min (Core Count)" -Unknown,1 +"Biological Sciences",1 +"Computer and Information Science and Engineering",1 +Engineering,1 +Geosciences,1 +Humanities/Arts,1 +"Mathematical and Physical Sciences",1 +"Social, Behavioral, and Economic Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Day-reference.csv index e720917fc0..91ef9f8b62 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Min (Core Count)" -2016-12-22,12 -2016-12-23,1 -2016-12-24,1 -2016-12-25,1 -2016-12-26,1 -2016-12-27,1 -2016-12-28,1 -2016-12-29,1 -2016-12-30,1 -2016-12-31,1 -2017-01-01,1 +Day,"[Biological Sciences] Job Size: Min (Core Count)","[Computer and Information Science and Engineering] Job Size: Min (Core Count)","[Engineering] Job Size: Min (Core Count)","[Geosciences] Job Size: Min (Core Count)","[Humanities/Arts] Job Size: Min (Core Count)","[Mathematical and Physical Sciences] Job Size: Min (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Min (Core Count)" +2016-12-22,12,0,0,0,0,12,0 +2016-12-23,12,0,0,0,0,1,0 +2016-12-24,12,0,0,0,0,1,0 +2016-12-25,12,0,0,0,0,1,0 +2016-12-26,12,0,0,0,0,1,0 +2016-12-27,8,0,96,0,0,1,1 +2016-12-28,8,1,1,20,0,1,1 +2016-12-29,1,1,1,5,4,1,1 +2016-12-30,1,1,1,1,1,1,1 +2016-12-31,1,1,1,1,1,1,1 +2017-01-01,1,1,1,1,4,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Month-reference.csv index 85725fe62e..9bc4416c22 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Min (Core Count)" -2016-12,1 -2017-01,1 +Month,"[Biological Sciences] Job Size: Min (Core Count)","[Computer and Information Science and Engineering] Job Size: Min (Core Count)","[Engineering] Job Size: Min (Core Count)","[Geosciences] Job Size: Min (Core Count)","[Humanities/Arts] Job Size: Min (Core Count)","[Mathematical and Physical Sciences] Job Size: Min (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Min (Core Count)" +2016-12,1,1,1,1,1,1,1 +2017-01,1,1,1,1,4,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Quarter-reference.csv index 931e555169..bbd7bed9ac 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Min (Core Count)" -"2016 Q4",1 -"2017 Q1",1 +Quarter,"[Biological Sciences] Job Size: Min (Core Count)","[Computer and Information Science and Engineering] Job Size: Min (Core Count)","[Engineering] Job Size: Min (Core Count)","[Geosciences] Job Size: Min (Core Count)","[Humanities/Arts] Job Size: Min (Core Count)","[Mathematical and Physical Sciences] Job Size: Min (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Min (Core Count)" +"2016 Q4",1,1,1,1,1,1,1 +"2017 Q1",1,1,1,1,4,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Year-reference.csv index b9cb19785e..0419087bdf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/min_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Min (Core Count)" -2016,1 -2017,1 +Year,"[Biological Sciences] Job Size: Min (Core Count)","[Computer and Information Science and Engineering] Job Size: Min (Core Count)","[Engineering] Job Size: Min (Core Count)","[Geosciences] Job Size: Min (Core Count)","[Humanities/Arts] Job Size: Min (Core Count)","[Mathematical and Physical Sciences] Job Size: Min (Core Count)","[Social, Behavioral, and Economic Sciences] Job Size: Min (Core Count)" +2016,1,1,1,1,1,1,1 +2017,1,1,1,1,4,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Day-reference.csv index 77c74042cb..d2e0b658c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12-22,0.150000000 -2016-12-23,0.104166667 -2016-12-24,0.104166667 -2016-12-25,0.177083333 -2016-12-26,0.125000000 -2016-12-27,0.145119048 -2016-12-28,0.057822222 -2016-12-29,0.034318966 -2016-12-30,0.040081442 -2016-12-31,0.043928656 -2017-01-01,0.045663105 +Day,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +2016-12-22,0.300000000,0,0,0.300000000,0,0,0 +2016-12-23,0.300000000,0,0,0.162500000,0,0,0 +2016-12-24,0.300000000,0,0,0.162500000,0,0,0 +2016-12-25,0.300000000,0,0,0.365000000,0,0,0 +2016-12-26,0.300000000,0,0,0.191250000,0,0,0 +2016-12-27,0.200000000,0,2.400000000,0.167083333,0.025000000,0,0 +2016-12-28,0.161538462,0,0.244907407,0.256250000,0.025000000,0.500000000,0.029487179 +2016-12-29,0.045000000,0.140909091,0.096679198,0.189383013,0.059678988,0.468750000,0.027854230 +2016-12-30,0.304000000,0.140000000,0.121752266,0.042305188,0.042276790,0.014194479,0.029449405 +2016-12-31,0.470312500,0.136111111,0.078579812,0.046537151,0.047710969,0.011121703,0.027981928 +2017-01-01,0.400650289,0.130000000,0.108176101,0.057665245,0.045808971,0.141732885,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Month-reference.csv index ec5045ff53..1fc6c9063e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12,0.042694764 -2017-01,0.045663105 +Month,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +2016-12,0.344300518,0.138636364,0.093725490,0.014328643,0.045129182,0.042234449,0.028575758 +2017-01,0.400650289,0.130000000,0.108176101,0.141732885,0.045808971,0.057665245,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Quarter-reference.csv index 01d53c0503..957f3b608f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Normalized (% of Total Cores)" -"2016 Q4",0.042694764 -"2017 Q1",0.045663105 +Quarter,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +"2016 Q4",0.344300518,0.138636364,0.093725490,0.014328643,0.045129182,0.042234449,0.028575758 +"2017 Q1",0.400650289,0.130000000,0.108176101,0.141732885,0.045808971,0.057665245,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Year-reference.csv index d08d2740eb..c55eda040a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016,0.042694764 -2017,0.045663105 +Year,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +2016,0.344300518,0.138636364,0.093725490,0.014328643,0.045129182,0.042234449,0.028575758 +2017,0.400650289,0.130000000,0.108176101,0.141732885,0.045808971,0.057665245,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Day-reference.csv index 77c74042cb..d2e0b658c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12-22,0.150000000 -2016-12-23,0.104166667 -2016-12-24,0.104166667 -2016-12-25,0.177083333 -2016-12-26,0.125000000 -2016-12-27,0.145119048 -2016-12-28,0.057822222 -2016-12-29,0.034318966 -2016-12-30,0.040081442 -2016-12-31,0.043928656 -2017-01-01,0.045663105 +Day,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +2016-12-22,0.300000000,0,0,0.300000000,0,0,0 +2016-12-23,0.300000000,0,0,0.162500000,0,0,0 +2016-12-24,0.300000000,0,0,0.162500000,0,0,0 +2016-12-25,0.300000000,0,0,0.365000000,0,0,0 +2016-12-26,0.300000000,0,0,0.191250000,0,0,0 +2016-12-27,0.200000000,0,2.400000000,0.167083333,0.025000000,0,0 +2016-12-28,0.161538462,0,0.244907407,0.256250000,0.025000000,0.500000000,0.029487179 +2016-12-29,0.045000000,0.140909091,0.096679198,0.189383013,0.059678988,0.468750000,0.027854230 +2016-12-30,0.304000000,0.140000000,0.121752266,0.042305188,0.042276790,0.014194479,0.029449405 +2016-12-31,0.470312500,0.136111111,0.078579812,0.046537151,0.047710969,0.011121703,0.027981928 +2017-01-01,0.400650289,0.130000000,0.108176101,0.057665245,0.045808971,0.141732885,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Month-reference.csv index ec5045ff53..1fc6c9063e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12,0.042694764 -2017-01,0.045663105 +Month,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +2016-12,0.344300518,0.138636364,0.093725490,0.014328643,0.045129182,0.042234449,0.028575758 +2017-01,0.400650289,0.130000000,0.108176101,0.141732885,0.045808971,0.057665245,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Quarter-reference.csv index 01d53c0503..957f3b608f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Normalized (% of Total Cores)" -"2016 Q4",0.042694764 -"2017 Q1",0.045663105 +Quarter,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +"2016 Q4",0.344300518,0.138636364,0.093725490,0.014328643,0.045129182,0.042234449,0.028575758 +"2017 Q1",0.400650289,0.130000000,0.108176101,0.141732885,0.045808971,0.057665245,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Year-reference.csv index d08d2740eb..c55eda040a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/normalized_avg_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016,0.042694764 -2017,0.045663105 +Year,"[Biological Sciences] Job Size: Normalized (% of Total Cores)","[Humanities/Arts] Job Size: Normalized (% of Total Cores)","[Engineering] Job Size: Normalized (% of Total Cores)","[Geosciences] Job Size: Normalized (% of Total Cores)","[Social, Behavioral, and Economic Sciences] Job Size: Normalized (% of Total Cores)","[Mathematical and Physical Sciences] Job Size: Normalized (% of Total Cores)","[Computer and Information Science and Engineering] Job Size: Normalized (% of Total Cores)" +2016,0.344300518,0.138636364,0.093725490,0.014328643,0.045129182,0.042234449,0.028575758 +2017,0.400650289,0.130000000,0.108176101,0.141732885,0.045808971,0.057665245,0.027484787 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Day-reference.csv index 97f8c58d68..64b1a46262 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Running" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Month-reference.csv index 97f8c58d68..64b1a46262 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Running" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Quarter-reference.csv index 97f8c58d68..64b1a46262 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Running" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Year-reference.csv index 97f8c58d68..64b1a46262 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Running" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Day-reference.csv index b512520a87..e3b0ae3973 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Running" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,6 -2016-12-26,11 -2016-12-27,42 -2016-12-28,450 -2016-12-29,1740 -2016-12-30,28855 -2016-12-31,29603 -2017-01-01,16566 +Day,"[Social, Behavioral, and Economic Sciences] Number of Jobs Running","[Mathematical and Physical Sciences] Number of Jobs Running","[Computer and Information Science and Engineering] Number of Jobs Running","[Geosciences] Number of Jobs Running","[Engineering] Number of Jobs Running","[Biological Sciences] Number of Jobs Running","[Humanities/Arts] Number of Jobs Running" +2016-12-22,0,1,0,0,0,1,0 +2016-12-23,0,2,0,0,0,1,0 +2016-12-24,0,2,0,0,0,1,0 +2016-12-25,0,5,0,0,0,1,0 +2016-12-26,0,10,0,0,0,1,0 +2016-12-27,1,30,0,0,3,8,0 +2016-12-28,1,78,195,1,162,13,0 +2016-12-29,257,156,981,4,266,65,11 +2016-12-30,21034,4761,1680,809,331,175,65 +2016-12-31,23475,2934,1660,1049,426,32,27 +2017-01-01,13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Month-reference.csv index 29563b7e4d..a3e864c9f6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Running" -2016-12,56209 -2017-01,16566 +Month,"[Social, Behavioral, and Economic Sciences] Number of Jobs Running","[Mathematical and Physical Sciences] Number of Jobs Running","[Computer and Information Science and Engineering] Number of Jobs Running","[Geosciences] Number of Jobs Running","[Engineering] Number of Jobs Running","[Biological Sciences] Number of Jobs Running","[Humanities/Arts] Number of Jobs Running" +2016-12,44240,7588,2475,1137,510,193,66 +2017-01,13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Quarter-reference.csv index 6e858c990b..edd0093187 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Running" -"2016 Q4",56209 -"2017 Q1",16566 +Quarter,"[Social, Behavioral, and Economic Sciences] Number of Jobs Running","[Mathematical and Physical Sciences] Number of Jobs Running","[Computer and Information Science and Engineering] Number of Jobs Running","[Geosciences] Number of Jobs Running","[Engineering] Number of Jobs Running","[Biological Sciences] Number of Jobs Running","[Humanities/Arts] Number of Jobs Running" +"2016 Q4",44240,7588,2475,1137,510,193,66 +"2017 Q1",13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Year-reference.csv index f21e152500..b0bb08cb92 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/running_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Running" -2016,56209 -2017,16566 +Year,"[Social, Behavioral, and Economic Sciences] Number of Jobs Running","[Mathematical and Physical Sciences] Number of Jobs Running","[Computer and Information Science and Engineering] Number of Jobs Running","[Geosciences] Number of Jobs Running","[Engineering] Number of Jobs Running","[Biological Sciences] Number of Jobs Running","[Humanities/Arts] Number of Jobs Running" +2016,44240,7588,2475,1137,510,193,66 +2017,13956,469,986,818,159,173,5 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Day-reference.csv index 3e61e87e8d..d47823526f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Started" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Month-reference.csv index 3e61e87e8d..d47823526f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Started" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Quarter-reference.csv index 3e61e87e8d..d47823526f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Started" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Year-reference.csv index 3e61e87e8d..d47823526f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Started" -Unknown,71313 +"Social, Behavioral, and Economic Sciences",57704 +"Mathematical and Physical Sciences",7983 +"Computer and Information Science and Engineering",2687 +Geosciences,1943 +Engineering,573 +"Biological Sciences",357 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Day-reference.csv index 0d8079996f..7a7373f631 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Started" -2016-12-22,2 -2016-12-23,1 -2016-12-24,0 -2016-12-25,3 -2016-12-26,5 -2016-12-27,31 -2016-12-28,408 -2016-12-29,1290 -2016-12-30,27115 -2016-12-31,27354 -2017-01-01,15104 +Day,"[Social, Behavioral, and Economic Sciences] Number of Jobs Started","[Mathematical and Physical Sciences] Number of Jobs Started","[Computer and Information Science and Engineering] Number of Jobs Started","[Geosciences] Number of Jobs Started","[Engineering] Number of Jobs Started","[Biological Sciences] Number of Jobs Started","[Humanities/Arts] Number of Jobs Started" +2016-12-22,0,1,0,0,0,1,0 +2016-12-23,0,1,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0 +2016-12-25,0,3,0,0,0,0,0 +2016-12-26,0,5,0,0,0,0,0 +2016-12-27,1,20,0,0,3,7,0 +2016-12-28,0,48,195,1,159,5,0 +2016-12-29,256,78,786,3,104,52,11 +2016-12-30,20777,4605,699,805,65,110,54 +2016-12-31,23206,2827,795,328,179,18,1 +2017-01-01,13464,395,212,806,63,164,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Month-reference.csv index 3f670296ed..06a1f904a7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Started" -2016-12,56209 -2017-01,15104 +Month,"[Social, Behavioral, and Economic Sciences] Number of Jobs Started","[Mathematical and Physical Sciences] Number of Jobs Started","[Computer and Information Science and Engineering] Number of Jobs Started","[Geosciences] Number of Jobs Started","[Engineering] Number of Jobs Started","[Biological Sciences] Number of Jobs Started","[Humanities/Arts] Number of Jobs Started" +2016-12,44240,7588,2475,1137,510,193,66 +2017-01,13464,395,212,806,63,164,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Quarter-reference.csv index 5a23ca3a9b..9fb5789e09 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Started" -"2016 Q4",56209 -"2017 Q1",15104 +Quarter,"[Social, Behavioral, and Economic Sciences] Number of Jobs Started","[Mathematical and Physical Sciences] Number of Jobs Started","[Computer and Information Science and Engineering] Number of Jobs Started","[Geosciences] Number of Jobs Started","[Engineering] Number of Jobs Started","[Biological Sciences] Number of Jobs Started","[Humanities/Arts] Number of Jobs Started" +"2016 Q4",44240,7588,2475,1137,510,193,66 +"2017 Q1",13464,395,212,806,63,164,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Year-reference.csv index ffb4acbd78..f685ea7158 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/started_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Started" -2016,56209 -2017,15104 +Year,"[Social, Behavioral, and Economic Sciences] Number of Jobs Started","[Mathematical and Physical Sciences] Number of Jobs Started","[Computer and Information Science and Engineering] Number of Jobs Started","[Geosciences] Number of Jobs Started","[Engineering] Number of Jobs Started","[Biological Sciences] Number of Jobs Started","[Humanities/Arts] Number of Jobs Started" +2016,44240,7588,2475,1137,510,193,66 +2017,13464,395,212,806,63,164,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Day-reference.csv index 78746ee981..17f78a27df 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Submitted" -Unknown,64416 +"Social, Behavioral, and Economic Sciences",52367 +"Mathematical and Physical Sciences",7107 +"Computer and Information Science and Engineering",2644 +Geosciences,1596 +Engineering,448 +"Biological Sciences",223 +Humanities/Arts,31 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Month-reference.csv index c6dab84ce5..5f64ed38aa 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Submitted" -Unknown,69243 +"Social, Behavioral, and Economic Sciences",55774 +"Mathematical and Physical Sciences",7982 +"Computer and Information Science and Engineering",2687 +Geosciences,1879 +Engineering,573 +"Biological Sciences",282 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Quarter-reference.csv index c6dab84ce5..5f64ed38aa 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Submitted" -Unknown,69243 +"Social, Behavioral, and Economic Sciences",55774 +"Mathematical and Physical Sciences",7982 +"Computer and Information Science and Engineering",2687 +Geosciences,1879 +Engineering,573 +"Biological Sciences",282 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Year-reference.csv index c6dab84ce5..5f64ed38aa 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Number of Jobs Submitted" -Unknown,69243 +"Social, Behavioral, and Economic Sciences",55774 +"Mathematical and Physical Sciences",7982 +"Computer and Information Science and Engineering",2687 +Geosciences,1879 +Engineering,573 +"Biological Sciences",282 +Humanities/Arts,66 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Day-reference.csv index c99ce93dc1..c51fb0b4c5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Submitted" -2016-12-22,1 -2016-12-23,1 -2016-12-24,0 -2016-12-25,1 -2016-12-26,5 -2016-12-27,18 -2016-12-28,379 -2016-12-29,1206 -2016-12-30,25660 -2016-12-31,24111 -2017-01-01,13034 +Day,"[Social, Behavioral, and Economic Sciences] Number of Jobs Submitted","[Mathematical and Physical Sciences] Number of Jobs Submitted","[Computer and Information Science and Engineering] Number of Jobs Submitted","[Geosciences] Number of Jobs Submitted","[Engineering] Number of Jobs Submitted","[Biological Sciences] Number of Jobs Submitted","[Humanities/Arts] Number of Jobs Submitted" +2016-12-22,0,0,0,0,0,1,0 +2016-12-23,0,1,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0 +2016-12-25,0,1,0,0,0,0,0 +2016-12-26,0,5,0,0,0,0,0 +2016-12-27,1,16,0,0,0,1,0 +2016-12-28,0,36,195,1,147,0,0 +2016-12-29,206,54,786,2,97,50,11 +2016-12-30,20182,3828,699,804,59,69,19 +2016-12-31,20444,2772,752,47,82,13,1 +2017-01-01,11534,394,212,742,63,89,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Month-reference.csv index 3bedc0d163..8973852316 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Submitted" -2016-12,56209 -2017-01,13034 +Month,"[Social, Behavioral, and Economic Sciences] Number of Jobs Submitted","[Mathematical and Physical Sciences] Number of Jobs Submitted","[Computer and Information Science and Engineering] Number of Jobs Submitted","[Geosciences] Number of Jobs Submitted","[Engineering] Number of Jobs Submitted","[Biological Sciences] Number of Jobs Submitted","[Humanities/Arts] Number of Jobs Submitted" +2016-12,44240,7588,2475,1137,510,193,66 +2017-01,11534,394,212,742,63,89,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Quarter-reference.csv index ab6bd54397..87b9f58bdf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Submitted" -"2016 Q4",56209 -"2017 Q1",13034 +Quarter,"[Social, Behavioral, and Economic Sciences] Number of Jobs Submitted","[Mathematical and Physical Sciences] Number of Jobs Submitted","[Computer and Information Science and Engineering] Number of Jobs Submitted","[Geosciences] Number of Jobs Submitted","[Engineering] Number of Jobs Submitted","[Biological Sciences] Number of Jobs Submitted","[Humanities/Arts] Number of Jobs Submitted" +"2016 Q4",44240,7588,2475,1137,510,193,66 +"2017 Q1",11534,394,212,742,63,89,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Year-reference.csv index 9853b2705b..070363d279 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/submitted_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Submitted" -2016,56209 -2017,13034 +Year,"[Social, Behavioral, and Economic Sciences] Number of Jobs Submitted","[Mathematical and Physical Sciences] Number of Jobs Submitted","[Computer and Information Science and Engineering] Number of Jobs Submitted","[Geosciences] Number of Jobs Submitted","[Engineering] Number of Jobs Submitted","[Biological Sciences] Number of Jobs Submitted","[Humanities/Arts] Number of Jobs Submitted" +2016,44240,7588,2475,1137,510,193,66 +2017,11534,394,212,742,63,89,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Day-reference.csv index 3fa6163945..dfc86a43d1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","CPU Hours: Total" -Unknown,840555.8369 +"Mathematical and Physical Sciences",317888.2653 +Engineering,216832.5278 +"Social, Behavioral, and Economic Sciences",163292.7964 +"Computer and Information Science and Engineering",74500.2678 +Geosciences,33498.1631 +"Biological Sciences",22127.0556 +Humanities/Arts,12416.7611 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Month-reference.csv index 3fa6163945..dfc86a43d1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","CPU Hours: Total" -Unknown,840555.8369 +"Mathematical and Physical Sciences",317888.2653 +Engineering,216832.5278 +"Social, Behavioral, and Economic Sciences",163292.7964 +"Computer and Information Science and Engineering",74500.2678 +Geosciences,33498.1631 +"Biological Sciences",22127.0556 +Humanities/Arts,12416.7611 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Quarter-reference.csv index 3fa6163945..dfc86a43d1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","CPU Hours: Total" -Unknown,840555.8369 +"Mathematical and Physical Sciences",317888.2653 +Engineering,216832.5278 +"Social, Behavioral, and Economic Sciences",163292.7964 +"Computer and Information Science and Engineering",74500.2678 +Geosciences,33498.1631 +"Biological Sciences",22127.0556 +Humanities/Arts,12416.7611 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Year-reference.csv index 3fa6163945..dfc86a43d1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","CPU Hours: Total" -Unknown,840555.8369 +"Mathematical and Physical Sciences",317888.2653 +Engineering,216832.5278 +"Social, Behavioral, and Economic Sciences",163292.7964 +"Computer and Information Science and Engineering",74500.2678 +Geosciences,33498.1631 +"Biological Sciences",22127.0556 +Humanities/Arts,12416.7611 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Day-reference.csv index de78507036..6e723d47b1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Total" -2016-12-22,404.2567 -2016-12-23,584.6036 -2016-12-24,600.0000 -2016-12-25,778.2700 -2016-12-26,2256.3333 -2016-12-27,15553.1447 -2016-12-28,81988.7103 -2016-12-29,171261.7833 -2016-12-30,275119.2672 -2016-12-31,222229.6297 -2017-01-01,69779.8381 +Day,"[Mathematical and Physical Sciences] CPU Hours: Total","[Engineering] CPU Hours: Total","[Social, Behavioral, and Economic Sciences] CPU Hours: Total","[Computer and Information Science and Engineering] CPU Hours: Total","[Geosciences] CPU Hours: Total","[Biological Sciences] CPU Hours: Total","[Humanities/Arts] CPU Hours: Total" +2016-12-22,203.3000,0,0,0,0,200.9567,0 +2016-12-23,296.6036,0,0,0,0,288.0000,0 +2016-12-24,312.0000,0,0,0,0,288.0000,0 +2016-12-25,490.2700,0,0,0,0,288.0000,0 +2016-12-26,1968.3333,0,0,0,0,288.0000,0 +2016-12-27,10481.8525,3739.4133,3.2167,0,0,1328.6622,0 +2016-12-28,53148.2378,23894.7644,24.0000,1304.6303,94.0111,3523.0667,0 +2016-12-29,91312.3128,56943.5956,1901.3108,13943.3047,2329.2153,4315.9531,516.0911 +2016-12-30,94225.0861,75804.5158,63888.1919,24507.1108,5069.4642,4653.8469,6971.0514 +2016-12-31,50138.7325,45772.2297,88804.5933,22598.4800,6887.4083,3398.5161,4629.6697 +2017-01-01,15311.5367,10678.0089,8671.4836,12146.7419,19118.0642,3554.0539,299.9489 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Month-reference.csv index 9d889cc5e7..fa28f127d1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Total" -2016-12,770775.9989 -2017-01,69779.8381 +Month,"[Mathematical and Physical Sciences] CPU Hours: Total","[Engineering] CPU Hours: Total","[Social, Behavioral, and Economic Sciences] CPU Hours: Total","[Computer and Information Science and Engineering] CPU Hours: Total","[Geosciences] CPU Hours: Total","[Biological Sciences] CPU Hours: Total","[Humanities/Arts] CPU Hours: Total" +2016-12,302576.7286,206154.5189,154621.3128,62353.5258,14380.0989,18573.0017,12116.8122 +2017-01,15311.5367,10678.0089,8671.4836,12146.7419,19118.0642,3554.0539,299.9489 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Quarter-reference.csv index 26f3ac9312..e95ee302f8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Total" -"2016 Q4",770775.9989 -"2017 Q1",69779.8381 +Quarter,"[Mathematical and Physical Sciences] CPU Hours: Total","[Engineering] CPU Hours: Total","[Social, Behavioral, and Economic Sciences] CPU Hours: Total","[Computer and Information Science and Engineering] CPU Hours: Total","[Geosciences] CPU Hours: Total","[Biological Sciences] CPU Hours: Total","[Humanities/Arts] CPU Hours: Total" +"2016 Q4",302576.7286,206154.5189,154621.3128,62353.5258,14380.0989,18573.0017,12116.8122 +"2017 Q1",15311.5367,10678.0089,8671.4836,12146.7419,19118.0642,3554.0539,299.9489 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Year-reference.csv index 72a1579031..3ba94e38df 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Total" -2016,770775.9989 -2017,69779.8381 +Year,"[Mathematical and Physical Sciences] CPU Hours: Total","[Engineering] CPU Hours: Total","[Social, Behavioral, and Economic Sciences] CPU Hours: Total","[Computer and Information Science and Engineering] CPU Hours: Total","[Geosciences] CPU Hours: Total","[Biological Sciences] CPU Hours: Total","[Humanities/Arts] CPU Hours: Total" +2016,302576.7286,206154.5189,154621.3128,62353.5258,14380.0989,18573.0017,12116.8122 +2017,15311.5367,10678.0089,8671.4836,12146.7419,19118.0642,3554.0539,299.9489 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Day-reference.csv index 665188e89a..9230cb19b8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Node Hours: Total" -Unknown,156303.7475 +"Computer and Information Science and Engineering",68003.8936 +Engineering,32639.6983 +"Mathematical and Physical Sciences",23625.9678 +"Social, Behavioral, and Economic Sciences",16956.7717 +Geosciences,10774.6956 +"Biological Sciences",3162.6878 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Month-reference.csv index 665188e89a..9230cb19b8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Node Hours: Total" -Unknown,156303.7475 +"Computer and Information Science and Engineering",68003.8936 +Engineering,32639.6983 +"Mathematical and Physical Sciences",23625.9678 +"Social, Behavioral, and Economic Sciences",16956.7717 +Geosciences,10774.6956 +"Biological Sciences",3162.6878 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Quarter-reference.csv index 665188e89a..9230cb19b8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Node Hours: Total" -Unknown,156303.7475 +"Computer and Information Science and Engineering",68003.8936 +Engineering,32639.6983 +"Mathematical and Physical Sciences",23625.9678 +"Social, Behavioral, and Economic Sciences",16956.7717 +Geosciences,10774.6956 +"Biological Sciences",3162.6878 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Year-reference.csv index 665188e89a..9230cb19b8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Node Hours: Total" -Unknown,156303.7475 +"Computer and Information Science and Engineering",68003.8936 +Engineering,32639.6983 +"Mathematical and Physical Sciences",23625.9678 +"Social, Behavioral, and Economic Sciences",16956.7717 +Geosciences,10774.6956 +"Biological Sciences",3162.6878 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Day-reference.csv index bf4fbf45d3..0d79eff31f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Total" -2016-12-22,33.6881 -2016-12-23,56.6036 -2016-12-24,72.0000 -2016-12-25,80.5078 -2016-12-26,157.5208 -2016-12-27,1206.3922 -2016-12-28,8614.6167 -2016-12-29,28528.4969 -2016-12-30,52308.5600 -2016-12-31,47388.7967 -2017-01-01,17856.5647 +Day,"[Computer and Information Science and Engineering] Node Hours: Total","[Engineering] Node Hours: Total","[Mathematical and Physical Sciences] Node Hours: Total","[Social, Behavioral, and Economic Sciences] Node Hours: Total","[Geosciences] Node Hours: Total","[Biological Sciences] Node Hours: Total","[Humanities/Arts] Node Hours: Total" +2016-12-22,0,0,16.9417,0,0,16.7464,0 +2016-12-23,0,0,32.6036,0,0,24.0000,0 +2016-12-24,0,0,48.0000,0,0,24.0000,0 +2016-12-25,0,0,56.5078,0,0,24.0000,0 +2016-12-26,0,0,133.5208,0,0,24.0000,0 +2016-12-27,0,311.6178,747.4278,3.2167,0,144.1300,0 +2016-12-28,996.9861,3790.5044,3382.0422,24.0000,4.7006,416.3833,0 +2016-12-29,12762.1014,8310.9622,6157.3483,328.7961,202.1281,719.3708,47.7900 +2016-12-30,22172.6036,11220.8083,7078.9369,6961.6367,3303.9342,941.2072,629.4331 +2016-12-31,20768.1517,6923.9883,4495.7325,8689.9142,5666.5222,414.3342,430.1536 +2017-01-01,11304.0508,2081.8172,1476.9061,949.2081,1597.4106,414.5158,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Month-reference.csv index f0de629d58..534ce8c75a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Total" -2016-12,138447.1828 -2017-01,17856.5647 +Month,"[Computer and Information Science and Engineering] Node Hours: Total","[Engineering] Node Hours: Total","[Mathematical and Physical Sciences] Node Hours: Total","[Social, Behavioral, and Economic Sciences] Node Hours: Total","[Geosciences] Node Hours: Total","[Biological Sciences] Node Hours: Total","[Humanities/Arts] Node Hours: Total" +2016-12,56699.8428,30557.8811,22149.0617,16007.5636,9177.2850,2748.1719,1107.3767 +2017-01,11304.0508,2081.8172,1476.9061,949.2081,1597.4106,414.5158,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Quarter-reference.csv index e99d680a61..312c547914 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Total" -"2016 Q4",138447.1828 -"2017 Q1",17856.5647 +Quarter,"[Computer and Information Science and Engineering] Node Hours: Total","[Engineering] Node Hours: Total","[Mathematical and Physical Sciences] Node Hours: Total","[Social, Behavioral, and Economic Sciences] Node Hours: Total","[Geosciences] Node Hours: Total","[Biological Sciences] Node Hours: Total","[Humanities/Arts] Node Hours: Total" +"2016 Q4",56699.8428,30557.8811,22149.0617,16007.5636,9177.2850,2748.1719,1107.3767 +"2017 Q1",11304.0508,2081.8172,1476.9061,949.2081,1597.4106,414.5158,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Year-reference.csv index 6fec8921bc..a605fbb2c1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_node_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Total" -2016,138447.1828 -2017,17856.5647 +Year,"[Computer and Information Science and Engineering] Node Hours: Total","[Engineering] Node Hours: Total","[Mathematical and Physical Sciences] Node Hours: Total","[Social, Behavioral, and Economic Sciences] Node Hours: Total","[Geosciences] Node Hours: Total","[Biological Sciences] Node Hours: Total","[Humanities/Arts] Node Hours: Total" +2016,56699.8428,30557.8811,22149.0617,16007.5636,9177.2850,2748.1719,1107.3767 +2017,11304.0508,2081.8172,1476.9061,949.2081,1597.4106,414.5158,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Day-reference.csv index e3fbf68854..809da632ff 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Total" -Unknown,306345.3608 +"Mathematical and Physical Sciences",169343.4094 +"Social, Behavioral, and Economic Sciences",114914.2053 +"Biological Sciences",8291.4383 +Geosciences,8164.0683 +Engineering,4751.8803 +"Computer and Information Science and Engineering",558.9144 +Humanities/Arts,321.4447 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Month-reference.csv index e3fbf68854..809da632ff 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Total" -Unknown,306345.3608 +"Mathematical and Physical Sciences",169343.4094 +"Social, Behavioral, and Economic Sciences",114914.2053 +"Biological Sciences",8291.4383 +Geosciences,8164.0683 +Engineering,4751.8803 +"Computer and Information Science and Engineering",558.9144 +Humanities/Arts,321.4447 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Quarter-reference.csv index e3fbf68854..809da632ff 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Total" -Unknown,306345.3608 +"Mathematical and Physical Sciences",169343.4094 +"Social, Behavioral, and Economic Sciences",114914.2053 +"Biological Sciences",8291.4383 +Geosciences,8164.0683 +Engineering,4751.8803 +"Computer and Information Science and Engineering",558.9144 +Humanities/Arts,321.4447 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Year-reference.csv index e3fbf68854..809da632ff 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wait Hours: Total" -Unknown,306345.3608 +"Mathematical and Physical Sciences",169343.4094 +"Social, Behavioral, and Economic Sciences",114914.2053 +"Biological Sciences",8291.4383 +Geosciences,8164.0683 +Engineering,4751.8803 +"Computer and Information Science and Engineering",558.9144 +Humanities/Arts,321.4447 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Day-reference.csv index 3aba4ddb30..dd78dd2798 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wait Hours: Total" -2016-12-22,9.3325 -2016-12-23,9.5964 -2016-12-24,0.0000 -2016-12-25,110.8856 -2016-12-26,0.0033 -2016-12-27,1978.2519 -2016-12-28,3598.3319 -2016-12-29,6101.8714 -2016-12-30,195282.2372 -2016-12-31,73421.2575 -2017-01-01,25833.5931 +Day,"[Mathematical and Physical Sciences] Wait Hours: Total","[Social, Behavioral, and Economic Sciences] Wait Hours: Total","[Biological Sciences] Wait Hours: Total","[Geosciences] Wait Hours: Total","[Engineering] Wait Hours: Total","[Computer and Information Science and Engineering] Wait Hours: Total","[Humanities/Arts] Wait Hours: Total" +2016-12-22,9.3322,0,0.0003,0,0,0,0 +2016-12-23,9.5964,0,0.0000,0,0,0,0 +2016-12-24,0.0000,0,0.0000,0,0,0,0 +2016-12-25,110.8856,0,0.0000,0,0,0,0 +2016-12-26,0.0033,0,0.0000,0,0,0,0 +2016-12-27,248.8897,0.0000,1418.2278,0,311.1344,0,0 +2016-12-28,879.9194,0.0000,1403.6350,0.0003,1306.7875,7.9897,0 +2016-12-29,3082.2842,1974.4419,627.0644,25.7303,348.6094,34.1564,9.5847 +2016-12-30,163080.1036,28026.7236,1574.2136,1975.4678,83.7736,230.0950,311.8600 +2016-12-31,1878.7711,65081.0511,1440.5692,2070.8639,2670.8594,279.1428,0.0000 +2017-01-01,43.6239,19831.9886,1827.7281,4092.0061,30.7158,7.5306,0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Month-reference.csv index 24db674841..b59a2b22e9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wait Hours: Total" -2016-12,280511.7678 -2017-01,25833.5931 +Month,"[Mathematical and Physical Sciences] Wait Hours: Total","[Social, Behavioral, and Economic Sciences] Wait Hours: Total","[Biological Sciences] Wait Hours: Total","[Geosciences] Wait Hours: Total","[Engineering] Wait Hours: Total","[Computer and Information Science and Engineering] Wait Hours: Total","[Humanities/Arts] Wait Hours: Total" +2016-12,169299.7856,95082.2167,6463.7103,4072.0622,4721.1644,551.3839,321.4447 +2017-01,43.6239,19831.9886,1827.7281,4092.0061,30.7158,7.5306,0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Quarter-reference.csv index a56241c55e..34f4a1406c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wait Hours: Total" -"2016 Q4",280511.7678 -"2017 Q1",25833.5931 +Quarter,"[Mathematical and Physical Sciences] Wait Hours: Total","[Social, Behavioral, and Economic Sciences] Wait Hours: Total","[Biological Sciences] Wait Hours: Total","[Geosciences] Wait Hours: Total","[Engineering] Wait Hours: Total","[Computer and Information Science and Engineering] Wait Hours: Total","[Humanities/Arts] Wait Hours: Total" +"2016 Q4",169299.7856,95082.2167,6463.7103,4072.0622,4721.1644,551.3839,321.4447 +"2017 Q1",43.6239,19831.9886,1827.7281,4092.0061,30.7158,7.5306,0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Year-reference.csv index 4e29af1cdb..ef9f54ac74 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_waitduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wait Hours: Total" -2016,280511.7678 -2017,25833.5931 +Year,"[Mathematical and Physical Sciences] Wait Hours: Total","[Social, Behavioral, and Economic Sciences] Wait Hours: Total","[Biological Sciences] Wait Hours: Total","[Geosciences] Wait Hours: Total","[Engineering] Wait Hours: Total","[Computer and Information Science and Engineering] Wait Hours: Total","[Humanities/Arts] Wait Hours: Total" +2016,169299.7856,95082.2167,6463.7103,4072.0622,4721.1644,551.3839,321.4447 +2017,43.6239,19831.9886,1827.7281,4092.0061,30.7158,7.5306,0.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Day-reference.csv index b17034729d..1ce61bb678 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Total" -Unknown,127976.8064 +"Computer and Information Science and Engineering",68001.8092 +Engineering,18506.3075 +"Social, Behavioral, and Economic Sciences",16630.3481 +"Mathematical and Physical Sciences",10964.6656 +Geosciences,10516.5478 +"Biological Sciences",2217.0956 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Month-reference.csv index b17034729d..1ce61bb678 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Total" -Unknown,127976.8064 +"Computer and Information Science and Engineering",68001.8092 +Engineering,18506.3075 +"Social, Behavioral, and Economic Sciences",16630.3481 +"Mathematical and Physical Sciences",10964.6656 +Geosciences,10516.5478 +"Biological Sciences",2217.0956 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Quarter-reference.csv index b17034729d..1ce61bb678 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Total" -Unknown,127976.8064 +"Computer and Information Science and Engineering",68001.8092 +Engineering,18506.3075 +"Social, Behavioral, and Economic Sciences",16630.3481 +"Mathematical and Physical Sciences",10964.6656 +Geosciences,10516.5478 +"Biological Sciences",2217.0956 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Year-reference.csv index b17034729d..1ce61bb678 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Wall Hours: Total" -Unknown,127976.8064 +"Computer and Information Science and Engineering",68001.8092 +Engineering,18506.3075 +"Social, Behavioral, and Economic Sciences",16630.3481 +"Mathematical and Physical Sciences",10964.6656 +Geosciences,10516.5478 +"Biological Sciences",2217.0956 +Humanities/Arts,1140.0328 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Day-reference.csv index 83fad83405..f5bbdcc673 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wall Hours: Total" -2016-12-22,33.6881 -2016-12-23,56.6036 -2016-12-24,72.0000 -2016-12-25,80.5078 -2016-12-26,157.5208 -2016-12-27,534.1833 -2016-12-28,4574.1436 -2016-12-29,20504.5094 -2016-12-30,42862.5139 -2016-12-31,42322.5450 -2017-01-01,16778.5908 +Day,"[Computer and Information Science and Engineering] Wall Hours: Total","[Engineering] Wall Hours: Total","[Social, Behavioral, and Economic Sciences] Wall Hours: Total","[Mathematical and Physical Sciences] Wall Hours: Total","[Geosciences] Wall Hours: Total","[Biological Sciences] Wall Hours: Total","[Humanities/Arts] Wall Hours: Total" +2016-12-22,0,0,0,16.9417,0,16.7464,0 +2016-12-23,0,0,0,32.6036,0,24.0000,0 +2016-12-24,0,0,0,48.0000,0,24.0000,0 +2016-12-25,0,0,0,56.5078,0,24.0000,0 +2016-12-26,0,0,0,133.5208,0,24.0000,0 +2016-12-27,0,38.9522,3.2167,374.4825,0,117.5319,0 +2016-12-28,996.9861,2191.3019,24.0000,1108.7717,4.7006,248.3833,0 +2016-12-29,12762.1014,4477.2714,303.7458,2302.3656,59.8644,551.3708,47.7900 +2016-12-30,22170.5192,6273.4908,6707.0317,3118.3981,3228.8894,734.7517,629.4331 +2016-12-31,20768.1517,4037.1194,8652.6142,2571.2625,5626.0944,237.1492,430.1536 +2017-01-01,11304.0508,1488.1717,939.7397,1201.8114,1596.9989,215.1622,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Month-reference.csv index 8fc20a89ca..6183051fbd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wall Hours: Total" -2016-12,111198.2156 -2017-01,16778.5908 +Month,"[Computer and Information Science and Engineering] Wall Hours: Total","[Engineering] Wall Hours: Total","[Social, Behavioral, and Economic Sciences] Wall Hours: Total","[Mathematical and Physical Sciences] Wall Hours: Total","[Geosciences] Wall Hours: Total","[Biological Sciences] Wall Hours: Total","[Humanities/Arts] Wall Hours: Total" +2016-12,56697.7583,17018.1358,15690.6083,9762.8542,8919.5489,2001.9333,1107.3767 +2017-01,11304.0508,1488.1717,939.7397,1201.8114,1596.9989,215.1622,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Quarter-reference.csv index ca302bc676..7b33fa2fc1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wall Hours: Total" -"2016 Q4",111198.2156 -"2017 Q1",16778.5908 +Quarter,"[Computer and Information Science and Engineering] Wall Hours: Total","[Engineering] Wall Hours: Total","[Social, Behavioral, and Economic Sciences] Wall Hours: Total","[Mathematical and Physical Sciences] Wall Hours: Total","[Geosciences] Wall Hours: Total","[Biological Sciences] Wall Hours: Total","[Humanities/Arts] Wall Hours: Total" +"2016 Q4",56697.7583,17018.1358,15690.6083,9762.8542,8919.5489,2001.9333,1107.3767 +"2017 Q1",11304.0508,1488.1717,939.7397,1201.8114,1596.9989,215.1622,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Year-reference.csv index 0a75c8aba7..290de0c1bd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/total_wallduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wall Hours: Total" -2016,111198.2156 -2017,16778.5908 +Year,"[Computer and Information Science and Engineering] Wall Hours: Total","[Engineering] Wall Hours: Total","[Social, Behavioral, and Economic Sciences] Wall Hours: Total","[Mathematical and Physical Sciences] Wall Hours: Total","[Geosciences] Wall Hours: Total","[Biological Sciences] Wall Hours: Total","[Humanities/Arts] Wall Hours: Total" +2016,56697.7583,17018.1358,15690.6083,9762.8542,8919.5489,2001.9333,1107.3767 +2017,11304.0508,1488.1717,939.7397,1201.8114,1596.9989,215.1622,32.6561 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Day-reference.csv index c946b81d33..aaa8a91b97 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Day-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Computer and Information Science and Engineering",7.054949600 +Engineering,6.844461104 +"Mathematical and Physical Sciences",6.020611085 +"Social, Behavioral, and Economic Sciences",3.092666598 +Geosciences,1.057391511 +"Biological Sciences",1.047682555 +Humanities/Arts,0.587914825 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Month-reference.csv index c946b81d33..aaa8a91b97 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Month-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Computer and Information Science and Engineering",7.054949600 +Engineering,6.844461104 +"Mathematical and Physical Sciences",6.020611085 +"Social, Behavioral, and Economic Sciences",3.092666598 +Geosciences,1.057391511 +"Biological Sciences",1.047682555 +Humanities/Arts,0.587914825 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Quarter-reference.csv index c946b81d33..aaa8a91b97 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Computer and Information Science and Engineering",7.054949600 +Engineering,6.844461104 +"Mathematical and Physical Sciences",6.020611085 +"Social, Behavioral, and Economic Sciences",3.092666598 +Geosciences,1.057391511 +"Biological Sciences",1.047682555 +Humanities/Arts,0.587914825 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Year-reference.csv index c946b81d33..aaa8a91b97 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/aggregate-Year-reference.csv @@ -6,5 +6,11 @@ start,end 2016-12-22,2017-01-01 --------- "Decanal Unit","Screwdriver Utilization (%)" -Unknown,15.919618124 +"Computer and Information Science and Engineering",7.054949600 +Engineering,6.844461104 +"Mathematical and Physical Sciences",6.020611085 +"Social, Behavioral, and Economic Sciences",3.092666598 +Geosciences,1.057391511 +"Biological Sciences",1.047682555 +Humanities/Arts,0.587914825 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Day-reference.csv index 8ba939c7f7..52e55064bb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Screwdriver Utilization (%)" -2016-12-22,0.210550347 -2016-12-23,0.304481047 -2016-12-24,0.312500000 -2016-12-25,0.405348958 -2016-12-26,0.783449074 -2016-12-27,3.240238484 -2016-12-28,17.080981308 -2016-12-29,35.679538194 -2016-12-30,57.316514005 -2016-12-31,46.297839525 -2017-01-01,14.537466262 +Day,"[Computer and Information Science and Engineering] Screwdriver Utilization (%)","[Engineering] Screwdriver Utilization (%)","[Mathematical and Physical Sciences] Screwdriver Utilization (%)","[Social, Behavioral, and Economic Sciences] Screwdriver Utilization (%)","[Geosciences] Screwdriver Utilization (%)","[Biological Sciences] Screwdriver Utilization (%)","[Humanities/Arts] Screwdriver Utilization (%)" +2016-12-22,0,0,0.211770833,0,0,0.209329861,0 +2016-12-23,0,0,0.308962095,0,0,0.300000000,0 +2016-12-24,0,0,0.325000000,0,0,0.300000000,0 +2016-12-25,0,0,0.510697917,0,0,0.300000000,0 +2016-12-26,0,0,1.025173611,0,0,0.300000000,0 +2016-12-27,0,3.895222222,2.729649089,0.003350694,0,0.692011574,0 +2016-12-28,1.358989873,24.890379630,13.840686921,0.025000000,0.097928241,1.834930556,0 +2016-12-29,14.524275752,19.772081790,23.779248119,0.495133030,0.808755305,2.247892216,0.268797454 +2016-12-30,25.528240451,26.321012442,19.630226273,13.310039988,1.760230613,2.423878617,3.630755932 +2016-12-31,23.540083333,15.893135320,10.445569271,18.500956944,2.391461227,1.770060475,2.411286314 +2017-01-01,12.652856192,3.707641975,3.189903472,1.806559086,9.957325087,1.851069734,0.156223380 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Month-reference.csv index db3af674e6..0a1ef38c3f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Screwdriver Utilization (%)" -2016-12,5.179946229 -2017-01,0.468950525 +Month,"[Computer and Information Science and Engineering] Screwdriver Utilization (%)","[Engineering] Screwdriver Utilization (%)","[Mathematical and Physical Sciences] Screwdriver Utilization (%)","[Social, Behavioral, and Economic Sciences] Screwdriver Utilization (%)","[Geosciences] Screwdriver Utilization (%)","[Biological Sciences] Screwdriver Utilization (%)","[Humanities/Arts] Screwdriver Utilization (%)" +2016-12,2.095212562,2.309078393,2.033445757,1.039121726,0.161067416,0.312046399,0.203575474 +2017-01,0.408156651,0.119601354,0.102900112,0.058276100,0.321204035,0.059711927,0.005039464 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Quarter-reference.csv index 8b3d517d55..692b2ce70d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Screwdriver Utilization (%)" -"2016 Q4",1.745416664 -"2017 Q1",0.161527403 +Quarter,"[Computer and Information Science and Engineering] Screwdriver Utilization (%)","[Engineering] Screwdriver Utilization (%)","[Mathematical and Physical Sciences] Screwdriver Utilization (%)","[Social, Behavioral, and Economic Sciences] Screwdriver Utilization (%)","[Geosciences] Screwdriver Utilization (%)","[Biological Sciences] Screwdriver Utilization (%)","[Humanities/Arts] Screwdriver Utilization (%)" +"2016 Q4",0.705995537,0.778059024,0.685182809,0.350138842,0.054272716,0.105146069,0.068596084 +"2017 Q1",0.140587291,0.041196022,0.035443372,0.020072879,0.110636945,0.020567441,0.001735815 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Year-reference.csv index 76bcae1de2..a22da1a4b9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/nsfdirectorate/utilization/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Screwdriver Utilization (%)" -2016,0.438738615 -2017,0.039828675 +Year,"[Computer and Information Science and Engineering] Screwdriver Utilization (%)","[Engineering] Screwdriver Utilization (%)","[Mathematical and Physical Sciences] Screwdriver Utilization (%)","[Social, Behavioral, and Economic Sciences] Screwdriver Utilization (%)","[Geosciences] Screwdriver Utilization (%)","[Biological Sciences] Screwdriver Utilization (%)","[Humanities/Arts] Screwdriver Utilization (%)" +2016,0.177463359,0.195577678,0.172231744,0.088013042,0.013642322,0.026430159,0.017242731 +2017,0.034665359,0.010157923,0.008739462,0.004949477,0.027280343,0.005071424,0.000428009 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Day-reference.csv index 5a22046568..7c30552d78 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Users: Active" -Unknown,66 +"Astronomical Sciences",11 +Chemistry,6 +"Electrical and Communication Systems",6 +"Social and Economic Science",6 +"Earth Sciences",5 +"Molecular Biosciences",5 +"Mechanical and Structural Systems",4 +"Microelectronic Information Processing Systems",4 +Arts,3 +"Materials Research",3 +"Mathematical Sciences",3 +"Polar Programs",3 +"Design and Manufacturing Systems",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Month-reference.csv index 5a22046568..7c30552d78 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Users: Active" -Unknown,66 +"Astronomical Sciences",11 +Chemistry,6 +"Electrical and Communication Systems",6 +"Social and Economic Science",6 +"Earth Sciences",5 +"Molecular Biosciences",5 +"Mechanical and Structural Systems",4 +"Microelectronic Information Processing Systems",4 +Arts,3 +"Materials Research",3 +"Mathematical Sciences",3 +"Polar Programs",3 +"Design and Manufacturing Systems",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Quarter-reference.csv index 5a22046568..7c30552d78 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Users: Active" -Unknown,66 +"Astronomical Sciences",11 +Chemistry,6 +"Electrical and Communication Systems",6 +"Social and Economic Science",6 +"Earth Sciences",5 +"Molecular Biosciences",5 +"Mechanical and Structural Systems",4 +"Microelectronic Information Processing Systems",4 +Arts,3 +"Materials Research",3 +"Mathematical Sciences",3 +"Polar Programs",3 +"Design and Manufacturing Systems",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Year-reference.csv index 5a22046568..7c30552d78 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Users: Active" -Unknown,66 +"Astronomical Sciences",11 +Chemistry,6 +"Electrical and Communication Systems",6 +"Social and Economic Science",6 +"Earth Sciences",5 +"Molecular Biosciences",5 +"Mechanical and Structural Systems",4 +"Microelectronic Information Processing Systems",4 +Arts,3 +"Materials Research",3 +"Mathematical Sciences",3 +"Polar Programs",3 +"Design and Manufacturing Systems",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Day-reference.csv index 00a0f7d7e7..9aee54cb69 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Users: Active" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,4 -2016-12-26,5 -2016-12-27,16 -2016-12-28,25 -2016-12-29,43 -2016-12-30,64 -2016-12-31,55 -2017-01-01,38 +Day,"[Astronomical Sciences] Number of Users: Active","[Chemistry] Number of Users: Active","[Electrical and Communication Systems] Number of Users: Active","[Social and Economic Science] Number of Users: Active","[Earth Sciences] Number of Users: Active","[Molecular Biosciences] Number of Users: Active","[Mechanical and Structural Systems] Number of Users: Active","[Microelectronic Information Processing Systems] Number of Users: Active","[Arts] Number of Users: Active","[Materials Research] Number of Users: Active","[Mathematical Sciences] Number of Users: Active","[Polar Programs] Number of Users: Active","[Design and Manufacturing Systems] Number of Users: Active","[Atmospheric Sciences] Number of Users: Active","[Chemical, Thermal Systems] Number of Users: Active","[Computer and Computation Research] Number of Users: Active","[Environmental Biology] Number of Users: Active","[Physics] Number of Users: Active" +2016-12-22,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,1,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,1,2,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0 +2016-12-27,4,2,1,1,0,4,0,0,0,2,2,0,0,0,0,0,0,0 +2016-12-28,4,5,1,1,1,4,0,2,0,2,3,0,1,0,0,0,0,1 +2016-12-29,7,5,4,3,2,5,1,3,2,3,3,1,1,1,0,1,0,1 +2016-12-30,11,6,6,6,5,5,4,4,3,3,3,2,1,1,1,1,1,1 +2016-12-31,10,6,6,4,3,4,4,3,3,2,2,3,2,0,1,1,1,0 +2017-01-01,5,5,5,3,2,3,3,2,2,0,2,2,2,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Month-reference.csv index 320a454744..9fabaffb83 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Users: Active" -2016-12,66 -2017-01,38 +Month,"[Astronomical Sciences] Number of Users: Active","[Chemistry] Number of Users: Active","[Electrical and Communication Systems] Number of Users: Active","[Social and Economic Science] Number of Users: Active","[Earth Sciences] Number of Users: Active","[Molecular Biosciences] Number of Users: Active","[Mechanical and Structural Systems] Number of Users: Active","[Microelectronic Information Processing Systems] Number of Users: Active","[Arts] Number of Users: Active","[Materials Research] Number of Users: Active","[Mathematical Sciences] Number of Users: Active","[Polar Programs] Number of Users: Active","[Design and Manufacturing Systems] Number of Users: Active","[Atmospheric Sciences] Number of Users: Active","[Chemical, Thermal Systems] Number of Users: Active","[Computer and Computation Research] Number of Users: Active","[Environmental Biology] Number of Users: Active","[Physics] Number of Users: Active" +2016-12,11,6,6,6,5,5,4,4,3,3,3,3,2,1,1,1,1,1 +2017-01,5,5,5,3,2,3,3,2,2,0,2,2,2,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Quarter-reference.csv index fb466be034..914f8568f3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Users: Active" -"2016 Q4",66 -"2017 Q1",38 +Quarter,"[Astronomical Sciences] Number of Users: Active","[Chemistry] Number of Users: Active","[Electrical and Communication Systems] Number of Users: Active","[Social and Economic Science] Number of Users: Active","[Earth Sciences] Number of Users: Active","[Molecular Biosciences] Number of Users: Active","[Mechanical and Structural Systems] Number of Users: Active","[Microelectronic Information Processing Systems] Number of Users: Active","[Arts] Number of Users: Active","[Materials Research] Number of Users: Active","[Mathematical Sciences] Number of Users: Active","[Polar Programs] Number of Users: Active","[Design and Manufacturing Systems] Number of Users: Active","[Atmospheric Sciences] Number of Users: Active","[Chemical, Thermal Systems] Number of Users: Active","[Computer and Computation Research] Number of Users: Active","[Environmental Biology] Number of Users: Active","[Physics] Number of Users: Active" +"2016 Q4",11,6,6,6,5,5,4,4,3,3,3,3,2,1,1,1,1,1 +"2017 Q1",5,5,5,3,2,3,3,2,2,0,2,2,2,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Year-reference.csv index 296484ddc9..81f031f65c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_person_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Users: Active" -2016,66 -2017,38 +Year,"[Astronomical Sciences] Number of Users: Active","[Chemistry] Number of Users: Active","[Electrical and Communication Systems] Number of Users: Active","[Social and Economic Science] Number of Users: Active","[Earth Sciences] Number of Users: Active","[Molecular Biosciences] Number of Users: Active","[Mechanical and Structural Systems] Number of Users: Active","[Microelectronic Information Processing Systems] Number of Users: Active","[Arts] Number of Users: Active","[Materials Research] Number of Users: Active","[Mathematical Sciences] Number of Users: Active","[Polar Programs] Number of Users: Active","[Design and Manufacturing Systems] Number of Users: Active","[Atmospheric Sciences] Number of Users: Active","[Chemical, Thermal Systems] Number of Users: Active","[Computer and Computation Research] Number of Users: Active","[Environmental Biology] Number of Users: Active","[Physics] Number of Users: Active" +2016,11,6,6,6,5,5,4,4,3,3,3,3,2,1,1,1,1,1 +2017,5,5,5,3,2,3,3,2,2,0,2,2,2,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Day-reference.csv index 2bc832f79b..e7789f8ef2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of PIs: Active" -Unknown,41 +"Earth Sciences",5 +"Social and Economic Science",4 +"Astronomical Sciences",3 +"Electrical and Communication Systems",3 +"Mathematical Sciences",3 +"Microelectronic Information Processing Systems",3 +"Molecular Biosciences",3 +"Polar Programs",3 +Chemistry,2 +"Design and Manufacturing Systems",2 +"Materials Research",2 +"Mechanical and Structural Systems",2 +Arts,1 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Month-reference.csv index 2bc832f79b..e7789f8ef2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of PIs: Active" -Unknown,41 +"Earth Sciences",5 +"Social and Economic Science",4 +"Astronomical Sciences",3 +"Electrical and Communication Systems",3 +"Mathematical Sciences",3 +"Microelectronic Information Processing Systems",3 +"Molecular Biosciences",3 +"Polar Programs",3 +Chemistry,2 +"Design and Manufacturing Systems",2 +"Materials Research",2 +"Mechanical and Structural Systems",2 +Arts,1 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Quarter-reference.csv index 2bc832f79b..e7789f8ef2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of PIs: Active" -Unknown,41 +"Earth Sciences",5 +"Social and Economic Science",4 +"Astronomical Sciences",3 +"Electrical and Communication Systems",3 +"Mathematical Sciences",3 +"Microelectronic Information Processing Systems",3 +"Molecular Biosciences",3 +"Polar Programs",3 +Chemistry,2 +"Design and Manufacturing Systems",2 +"Materials Research",2 +"Mechanical and Structural Systems",2 +Arts,1 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Year-reference.csv index 2bc832f79b..e7789f8ef2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of PIs: Active" -Unknown,41 +"Earth Sciences",5 +"Social and Economic Science",4 +"Astronomical Sciences",3 +"Electrical and Communication Systems",3 +"Mathematical Sciences",3 +"Microelectronic Information Processing Systems",3 +"Molecular Biosciences",3 +"Polar Programs",3 +Chemistry,2 +"Design and Manufacturing Systems",2 +"Materials Research",2 +"Mechanical and Structural Systems",2 +Arts,1 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Environmental Biology",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Day-reference.csv index 42b20cf42e..fd738c89d5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of PIs: Active" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,3 -2016-12-26,4 -2016-12-27,11 -2016-12-28,18 -2016-12-29,28 -2016-12-30,39 -2016-12-31,34 -2017-01-01,25 +Day,"[Earth Sciences] Number of PIs: Active","[Social and Economic Science] Number of PIs: Active","[Astronomical Sciences] Number of PIs: Active","[Electrical and Communication Systems] Number of PIs: Active","[Mathematical Sciences] Number of PIs: Active","[Microelectronic Information Processing Systems] Number of PIs: Active","[Molecular Biosciences] Number of PIs: Active","[Polar Programs] Number of PIs: Active","[Chemistry] Number of PIs: Active","[Design and Manufacturing Systems] Number of PIs: Active","[Materials Research] Number of PIs: Active","[Mechanical and Structural Systems] Number of PIs: Active","[Arts] Number of PIs: Active","[Atmospheric Sciences] Number of PIs: Active","[Chemical, Thermal Systems] Number of PIs: Active","[Computer and Computation Research] Number of PIs: Active","[Environmental Biology] Number of PIs: Active","[Physics] Number of PIs: Active" +2016-12-22,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0 +2016-12-27,0,1,2,1,2,0,3,0,1,0,1,0,0,0,0,0,0,0 +2016-12-28,1,1,2,1,3,2,3,0,2,1,1,0,0,0,0,0,0,1 +2016-12-29,2,2,2,3,3,2,3,1,2,1,2,1,1,1,0,1,0,1 +2016-12-30,5,4,3,3,3,3,3,2,2,1,2,2,1,1,1,1,1,1 +2016-12-31,3,3,3,3,2,2,3,3,2,2,2,2,1,0,1,1,1,0 +2017-01-01,2,2,2,3,2,2,2,2,2,2,0,1,1,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Month-reference.csv index eb4bcb3d18..e3262f2186 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of PIs: Active" -2016-12,41 -2017-01,25 +Month,"[Earth Sciences] Number of PIs: Active","[Social and Economic Science] Number of PIs: Active","[Astronomical Sciences] Number of PIs: Active","[Electrical and Communication Systems] Number of PIs: Active","[Mathematical Sciences] Number of PIs: Active","[Microelectronic Information Processing Systems] Number of PIs: Active","[Molecular Biosciences] Number of PIs: Active","[Polar Programs] Number of PIs: Active","[Chemistry] Number of PIs: Active","[Design and Manufacturing Systems] Number of PIs: Active","[Materials Research] Number of PIs: Active","[Mechanical and Structural Systems] Number of PIs: Active","[Arts] Number of PIs: Active","[Atmospheric Sciences] Number of PIs: Active","[Chemical, Thermal Systems] Number of PIs: Active","[Computer and Computation Research] Number of PIs: Active","[Environmental Biology] Number of PIs: Active","[Physics] Number of PIs: Active" +2016-12,5,4,3,3,3,3,3,3,2,2,2,2,1,1,1,1,1,1 +2017-01,2,2,2,3,2,2,2,2,2,2,0,1,1,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Quarter-reference.csv index 5361974454..732bf2f8e3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of PIs: Active" -"2016 Q4",41 -"2017 Q1",25 +Quarter,"[Earth Sciences] Number of PIs: Active","[Social and Economic Science] Number of PIs: Active","[Astronomical Sciences] Number of PIs: Active","[Electrical and Communication Systems] Number of PIs: Active","[Mathematical Sciences] Number of PIs: Active","[Microelectronic Information Processing Systems] Number of PIs: Active","[Molecular Biosciences] Number of PIs: Active","[Polar Programs] Number of PIs: Active","[Chemistry] Number of PIs: Active","[Design and Manufacturing Systems] Number of PIs: Active","[Materials Research] Number of PIs: Active","[Mechanical and Structural Systems] Number of PIs: Active","[Arts] Number of PIs: Active","[Atmospheric Sciences] Number of PIs: Active","[Chemical, Thermal Systems] Number of PIs: Active","[Computer and Computation Research] Number of PIs: Active","[Environmental Biology] Number of PIs: Active","[Physics] Number of PIs: Active" +"2016 Q4",5,4,3,3,3,3,3,3,2,2,2,2,1,1,1,1,1,1 +"2017 Q1",2,2,2,3,2,2,2,2,2,2,0,1,1,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Year-reference.csv index 1f1c138c6a..a460afc588 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_pi_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of PIs: Active" -2016,41 -2017,25 +Year,"[Earth Sciences] Number of PIs: Active","[Social and Economic Science] Number of PIs: Active","[Astronomical Sciences] Number of PIs: Active","[Electrical and Communication Systems] Number of PIs: Active","[Mathematical Sciences] Number of PIs: Active","[Microelectronic Information Processing Systems] Number of PIs: Active","[Molecular Biosciences] Number of PIs: Active","[Polar Programs] Number of PIs: Active","[Chemistry] Number of PIs: Active","[Design and Manufacturing Systems] Number of PIs: Active","[Materials Research] Number of PIs: Active","[Mechanical and Structural Systems] Number of PIs: Active","[Arts] Number of PIs: Active","[Atmospheric Sciences] Number of PIs: Active","[Chemical, Thermal Systems] Number of PIs: Active","[Computer and Computation Research] Number of PIs: Active","[Environmental Biology] Number of PIs: Active","[Physics] Number of PIs: Active" +2016,5,4,3,3,3,3,3,3,2,2,2,2,1,1,1,1,1,1 +2017,2,2,2,3,2,2,2,2,2,2,0,1,1,1,0,0,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Day-reference.csv index cec72617a3..dd459d5fc8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Resources: Active" -Unknown,5 +"Social and Economic Science",5 +Chemistry,4 +"Astronomical Sciences",3 +"Materials Research",3 +"Polar Programs",3 +Arts,2 +"Earth Sciences",2 +"Electrical and Communication Systems",2 +"Mathematical Sciences",2 +"Molecular Biosciences",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Environmental Biology",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Month-reference.csv index cec72617a3..dd459d5fc8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Resources: Active" -Unknown,5 +"Social and Economic Science",5 +Chemistry,4 +"Astronomical Sciences",3 +"Materials Research",3 +"Polar Programs",3 +Arts,2 +"Earth Sciences",2 +"Electrical and Communication Systems",2 +"Mathematical Sciences",2 +"Molecular Biosciences",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Environmental Biology",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Quarter-reference.csv index cec72617a3..dd459d5fc8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Resources: Active" -Unknown,5 +"Social and Economic Science",5 +Chemistry,4 +"Astronomical Sciences",3 +"Materials Research",3 +"Polar Programs",3 +Arts,2 +"Earth Sciences",2 +"Electrical and Communication Systems",2 +"Mathematical Sciences",2 +"Molecular Biosciences",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Environmental Biology",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Year-reference.csv index cec72617a3..dd459d5fc8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Resources: Active" -Unknown,5 +"Social and Economic Science",5 +Chemistry,4 +"Astronomical Sciences",3 +"Materials Research",3 +"Polar Programs",3 +Arts,2 +"Earth Sciences",2 +"Electrical and Communication Systems",2 +"Mathematical Sciences",2 +"Molecular Biosciences",2 +"Atmospheric Sciences",1 +"Chemical, Thermal Systems",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Environmental Biology",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +Physics,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Day-reference.csv index 5c943ea07f..61509e4a85 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Resources: Active" -2016-12-22,2 -2016-12-23,2 -2016-12-24,2 -2016-12-25,2 -2016-12-26,3 -2016-12-27,5 -2016-12-28,5 -2016-12-29,5 -2016-12-30,5 -2016-12-31,5 -2017-01-01,5 +Day,"[Social and Economic Science] Number of Resources: Active","[Chemistry] Number of Resources: Active","[Astronomical Sciences] Number of Resources: Active","[Materials Research] Number of Resources: Active","[Polar Programs] Number of Resources: Active","[Arts] Number of Resources: Active","[Earth Sciences] Number of Resources: Active","[Electrical and Communication Systems] Number of Resources: Active","[Mathematical Sciences] Number of Resources: Active","[Molecular Biosciences] Number of Resources: Active","[Atmospheric Sciences] Number of Resources: Active","[Chemical, Thermal Systems] Number of Resources: Active","[Computer and Computation Research] Number of Resources: Active","[Design and Manufacturing Systems] Number of Resources: Active","[Environmental Biology] Number of Resources: Active","[Mechanical and Structural Systems] Number of Resources: Active","[Microelectronic Information Processing Systems] Number of Resources: Active","[Physics] Number of Resources: Active" +2016-12-22,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-23,0,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-24,0,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-25,0,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-26,0,1,1,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0 +2016-12-27,1,2,3,1,0,0,0,1,2,2,0,0,0,0,0,0,0,0 +2016-12-28,1,3,3,2,0,0,1,1,2,2,0,0,0,1,0,0,1,1 +2016-12-29,4,3,3,3,1,2,2,2,2,2,1,0,1,1,0,1,1,1 +2016-12-30,5,4,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1 +2016-12-31,5,4,2,2,3,2,1,2,2,2,0,1,1,1,1,1,1,0 +2017-01-01,5,4,2,0,2,2,1,2,2,2,1,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Month-reference.csv index 1f8bf125aa..75ca8d9f96 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Resources: Active" -2016-12,5 -2017-01,5 +Month,"[Social and Economic Science] Number of Resources: Active","[Chemistry] Number of Resources: Active","[Astronomical Sciences] Number of Resources: Active","[Materials Research] Number of Resources: Active","[Polar Programs] Number of Resources: Active","[Arts] Number of Resources: Active","[Earth Sciences] Number of Resources: Active","[Electrical and Communication Systems] Number of Resources: Active","[Mathematical Sciences] Number of Resources: Active","[Molecular Biosciences] Number of Resources: Active","[Atmospheric Sciences] Number of Resources: Active","[Chemical, Thermal Systems] Number of Resources: Active","[Computer and Computation Research] Number of Resources: Active","[Design and Manufacturing Systems] Number of Resources: Active","[Environmental Biology] Number of Resources: Active","[Mechanical and Structural Systems] Number of Resources: Active","[Microelectronic Information Processing Systems] Number of Resources: Active","[Physics] Number of Resources: Active" +2016-12,5,4,3,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1 +2017-01,5,4,2,0,2,2,1,2,2,2,1,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Quarter-reference.csv index 4711c59c28..5eedf721c4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Resources: Active" -"2016 Q4",5 -"2017 Q1",5 +Quarter,"[Social and Economic Science] Number of Resources: Active","[Chemistry] Number of Resources: Active","[Astronomical Sciences] Number of Resources: Active","[Materials Research] Number of Resources: Active","[Polar Programs] Number of Resources: Active","[Arts] Number of Resources: Active","[Earth Sciences] Number of Resources: Active","[Electrical and Communication Systems] Number of Resources: Active","[Mathematical Sciences] Number of Resources: Active","[Molecular Biosciences] Number of Resources: Active","[Atmospheric Sciences] Number of Resources: Active","[Chemical, Thermal Systems] Number of Resources: Active","[Computer and Computation Research] Number of Resources: Active","[Design and Manufacturing Systems] Number of Resources: Active","[Environmental Biology] Number of Resources: Active","[Mechanical and Structural Systems] Number of Resources: Active","[Microelectronic Information Processing Systems] Number of Resources: Active","[Physics] Number of Resources: Active" +"2016 Q4",5,4,3,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1 +"2017 Q1",5,4,2,0,2,2,1,2,2,2,1,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Year-reference.csv index 9633ccf101..3a28a5d13a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/active_resource_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Resources: Active" -2016,5 -2017,5 +Year,"[Social and Economic Science] Number of Resources: Active","[Chemistry] Number of Resources: Active","[Astronomical Sciences] Number of Resources: Active","[Materials Research] Number of Resources: Active","[Polar Programs] Number of Resources: Active","[Arts] Number of Resources: Active","[Earth Sciences] Number of Resources: Active","[Electrical and Communication Systems] Number of Resources: Active","[Mathematical Sciences] Number of Resources: Active","[Molecular Biosciences] Number of Resources: Active","[Atmospheric Sciences] Number of Resources: Active","[Chemical, Thermal Systems] Number of Resources: Active","[Computer and Computation Research] Number of Resources: Active","[Design and Manufacturing Systems] Number of Resources: Active","[Environmental Biology] Number of Resources: Active","[Mechanical and Structural Systems] Number of Resources: Active","[Microelectronic Information Processing Systems] Number of Resources: Active","[Physics] Number of Resources: Active" +2016,5,4,3,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1 +2017,5,4,2,0,2,2,1,2,2,2,1,0,0,1,1,1,1,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Day-reference.csv index 435cda7f5b..319a6285bf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Per Job" -2016-12-22,202.12833333 -2016-12-23,194.86787037 -2016-12-24,200.00000000 -2016-12-25,129.71166667 -2016-12-26,205.12121212 -2016-12-27,370.31296958 -2016-12-28,182.19713395 -2016-12-29,98.42631226 -2016-12-30,9.53454400 -2016-12-31,7.50699692 -2017-01-01,4.21223217 +Day,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,200.95666667,0,203.30000000,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,288.00000000,8.60361111,288.00000000,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,288.00000000,24.00000000,288.00000000,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,288.00000000,24.00000000,116.56750000,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,43.26666667,0,0,0,288.00000000,24.00000000,432.00000000,0,0,0,0,0,0,0 +2016-12-27,0,1246.47111111,0,1432.93629630,320.78689815,0,0,0,166.08277778,280.65174603,163.84000000,0,0,0,0,0,0,3.21666667 +2016-12-28,0,1462.12800000,0,548.99703704,102.73824786,60.47666667,0,0,271.00512821,535.66833333,1359.38973180,0,13.35268330,6.69041168,0,94.01111111,0,24.00000000 +2016-12-29,0,1903.63119342,1038.22222222,558.21381944,342.00281481,288.00000000,410.97777778,46.91737374,66.39927778,251.25414683,877.62333333,758.98888889,16.60273286,14.27582622,0,266.00208333,2.01966667,7.39809663 +2016-12-30,2468.14222222,1342.20575694,402.80000000,183.79372168,249.86375000,181.16111111,256.62628858,107.24694444,48.60799020,13.81820610,14.56036587,15.25876587,21.71949405,14.71385475,5.80186420,4.87608476,4.10559722,3.03737720 +2016-12-31,5701.54666667,236.60267442,0,49.49041005,246.30230726,0,103.53553819,171.46924897,148.77467172,178.36906250,9.20850345,8.74733740,23.62045770,13.61654527,12.54733333,6.47695188,8.63138889,3.78294327 +2017-01-01,0,271.71664683,3.46666667,0,103.31233796,0,0.96969246,59.98977778,78.92785948,323.23959596,16.57782656,23.44196390,29.54166397,12.31921090,6.26263789,10.94629630,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Month-reference.csv index f803bcc139..1f3c517042 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Per Job" -2016-12,13.71267944 -2017-01,4.21223217 +Month,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +2016-12,4368.65777778,1112.27138506,1441.02222222,529.63777778,540.56594872,338.80760349,183.58806397,192.74581243,221.80616753,58.97181208,41.04805132,27.61529618,19.87039394,25.35750883,10.48083171,6.47641111,5.04208333,3.49505680 +2017-01,0,271.71664683,3.46666667,0,103.31233796,0,59.98977778,78.92785948,0.96969246,29.54166397,323.23959596,16.57782656,23.44196390,12.31921090,10.94629630,6.26263789,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Quarter-reference.csv index 2beaed426d..f7334cc1bd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Per Job" -"2016 Q4",13.71267944 -"2017 Q1",4.21223217 +Quarter,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +"2016 Q4",4368.65777778,1112.27138506,1441.02222222,529.63777778,540.56594872,338.80760349,183.58806397,192.74581243,221.80616753,58.97181208,41.04805132,27.61529618,19.87039394,25.35750883,10.48083171,6.47641111,5.04208333,3.49505680 +"2017 Q1",0,271.71664683,3.46666667,0,103.31233796,0,59.98977778,78.92785948,0.96969246,29.54166397,323.23959596,16.57782656,23.44196390,12.31921090,10.94629630,6.26263789,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Year-reference.csv index cae253b4cd..ac0021fe3c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Per Job" -2016,13.71267944 -2017,4.21223217 +Year,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +2016,4368.65777778,1112.27138506,1441.02222222,529.63777778,540.56594872,338.80760349,183.58806397,192.74581243,221.80616753,58.97181208,41.04805132,27.61529618,19.87039394,25.35750883,10.48083171,6.47641111,5.04208333,3.49505680 +2017,0,271.71664683,3.46666667,0,103.31233796,0,59.98977778,78.92785948,0.96969246,29.54166397,323.23959596,16.57782656,23.44196390,12.31921090,10.94629630,6.26263789,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Day-reference.csv index 435cda7f5b..319a6285bf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Per Job" -2016-12-22,202.12833333 -2016-12-23,194.86787037 -2016-12-24,200.00000000 -2016-12-25,129.71166667 -2016-12-26,205.12121212 -2016-12-27,370.31296958 -2016-12-28,182.19713395 -2016-12-29,98.42631226 -2016-12-30,9.53454400 -2016-12-31,7.50699692 -2017-01-01,4.21223217 +Day,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,0,200.95666667,0,203.30000000,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,288.00000000,8.60361111,288.00000000,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,288.00000000,24.00000000,288.00000000,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,288.00000000,24.00000000,116.56750000,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,43.26666667,0,0,0,288.00000000,24.00000000,432.00000000,0,0,0,0,0,0,0 +2016-12-27,0,1246.47111111,0,1432.93629630,320.78689815,0,0,0,166.08277778,280.65174603,163.84000000,0,0,0,0,0,0,3.21666667 +2016-12-28,0,1462.12800000,0,548.99703704,102.73824786,60.47666667,0,0,271.00512821,535.66833333,1359.38973180,0,13.35268330,6.69041168,0,94.01111111,0,24.00000000 +2016-12-29,0,1903.63119342,1038.22222222,558.21381944,342.00281481,288.00000000,410.97777778,46.91737374,66.39927778,251.25414683,877.62333333,758.98888889,16.60273286,14.27582622,0,266.00208333,2.01966667,7.39809663 +2016-12-30,2468.14222222,1342.20575694,402.80000000,183.79372168,249.86375000,181.16111111,256.62628858,107.24694444,48.60799020,13.81820610,14.56036587,15.25876587,21.71949405,14.71385475,5.80186420,4.87608476,4.10559722,3.03737720 +2016-12-31,5701.54666667,236.60267442,0,49.49041005,246.30230726,0,103.53553819,171.46924897,148.77467172,178.36906250,9.20850345,8.74733740,23.62045770,13.61654527,12.54733333,6.47695188,8.63138889,3.78294327 +2017-01-01,0,271.71664683,3.46666667,0,103.31233796,0,0.96969246,59.98977778,78.92785948,323.23959596,16.57782656,23.44196390,29.54166397,12.31921090,6.26263789,10.94629630,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Month-reference.csv index f803bcc139..1f3c517042 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Per Job" -2016-12,13.71267944 -2017-01,4.21223217 +Month,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +2016-12,4368.65777778,1112.27138506,1441.02222222,529.63777778,540.56594872,338.80760349,183.58806397,192.74581243,221.80616753,58.97181208,41.04805132,27.61529618,19.87039394,25.35750883,10.48083171,6.47641111,5.04208333,3.49505680 +2017-01,0,271.71664683,3.46666667,0,103.31233796,0,59.98977778,78.92785948,0.96969246,29.54166397,323.23959596,16.57782656,23.44196390,12.31921090,10.94629630,6.26263789,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Quarter-reference.csv index 2beaed426d..f7334cc1bd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Per Job" -"2016 Q4",13.71267944 -"2017 Q1",4.21223217 +Quarter,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +"2016 Q4",4368.65777778,1112.27138506,1441.02222222,529.63777778,540.56594872,338.80760349,183.58806397,192.74581243,221.80616753,58.97181208,41.04805132,27.61529618,19.87039394,25.35750883,10.48083171,6.47641111,5.04208333,3.49505680 +"2017 Q1",0,271.71664683,3.46666667,0,103.31233796,0,59.98977778,78.92785948,0.96969246,29.54166397,323.23959596,16.57782656,23.44196390,12.31921090,10.94629630,6.26263789,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Year-reference.csv index cae253b4cd..ac0021fe3c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Per Job" -2016,13.71267944 -2017,4.21223217 +Year,"[Chemical, Thermal Systems] CPU Hours: Per Job","[Electrical and Communication Systems] CPU Hours: Per Job","[Atmospheric Sciences] CPU Hours: Per Job","[Physics] CPU Hours: Per Job","[Mathematical Sciences] CPU Hours: Per Job","[Materials Research] CPU Hours: Per Job","[Arts] CPU Hours: Per Job","[Molecular Biosciences] CPU Hours: Per Job","[Mechanical and Structural Systems] CPU Hours: Per Job","[Design and Manufacturing Systems] CPU Hours: Per Job","[Astronomical Sciences] CPU Hours: Per Job","[Chemistry] CPU Hours: Per Job","[Polar Programs] CPU Hours: Per Job","[Microelectronic Information Processing Systems] CPU Hours: Per Job","[Earth Sciences] CPU Hours: Per Job","[Environmental Biology] CPU Hours: Per Job","[Computer and Computation Research] CPU Hours: Per Job","[Social and Economic Science] CPU Hours: Per Job" +2016,4368.65777778,1112.27138506,1441.02222222,529.63777778,540.56594872,338.80760349,183.58806397,192.74581243,221.80616753,58.97181208,41.04805132,27.61529618,19.87039394,25.35750883,10.48083171,6.47641111,5.04208333,3.49505680 +2017,0,271.71664683,3.46666667,0,103.31233796,0,59.98977778,78.92785948,0.96969246,29.54166397,323.23959596,16.57782656,23.44196390,12.31921090,10.94629630,6.26263789,0,0.62134448 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv index de11312c90..76c17d3a33 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Chemical, Thermal Systems",326.9898 +"Atmospheric Sciences",160.0000 +Chemistry,128.2687 +"Mechanical and Structural Systems",111.3630 +"Electrical and Communication Systems",94.4593 +"Materials Research",65.7034 +"Environmental Biology",57.7053 +"Astronomical Sciences",47.1669 +"Molecular Biosciences",29.3971 +"Polar Programs",14.5813 +"Mathematical Sciences",13.5488 +Physics,12.0000 +Arts,11.8252 +"Social and Economic Science",10.8677 +"Design and Manufacturing Systems",6.6809 +"Earth Sciences",6.2418 +"Microelectronic Information Processing Systems",1.7650 +"Computer and Computation Research",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv index de11312c90..76c17d3a33 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Chemical, Thermal Systems",326.9898 +"Atmospheric Sciences",160.0000 +Chemistry,128.2687 +"Mechanical and Structural Systems",111.3630 +"Electrical and Communication Systems",94.4593 +"Materials Research",65.7034 +"Environmental Biology",57.7053 +"Astronomical Sciences",47.1669 +"Molecular Biosciences",29.3971 +"Polar Programs",14.5813 +"Mathematical Sciences",13.5488 +Physics,12.0000 +Arts,11.8252 +"Social and Economic Science",10.8677 +"Design and Manufacturing Systems",6.6809 +"Earth Sciences",6.2418 +"Microelectronic Information Processing Systems",1.7650 +"Computer and Computation Research",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv index de11312c90..76c17d3a33 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Chemical, Thermal Systems",326.9898 +"Atmospheric Sciences",160.0000 +Chemistry,128.2687 +"Mechanical and Structural Systems",111.3630 +"Electrical and Communication Systems",94.4593 +"Materials Research",65.7034 +"Environmental Biology",57.7053 +"Astronomical Sciences",47.1669 +"Molecular Biosciences",29.3971 +"Polar Programs",14.5813 +"Mathematical Sciences",13.5488 +Physics,12.0000 +Arts,11.8252 +"Social and Economic Science",10.8677 +"Design and Manufacturing Systems",6.6809 +"Earth Sciences",6.2418 +"Microelectronic Information Processing Systems",1.7650 +"Computer and Computation Research",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv index de11312c90..76c17d3a33 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Weighted By CPU Hours (Core Count)" -Unknown,65.6161 +"Chemical, Thermal Systems",326.9898 +"Atmospheric Sciences",160.0000 +Chemistry,128.2687 +"Mechanical and Structural Systems",111.3630 +"Electrical and Communication Systems",94.4593 +"Materials Research",65.7034 +"Environmental Biology",57.7053 +"Astronomical Sciences",47.1669 +"Molecular Biosciences",29.3971 +"Polar Programs",14.5813 +"Mathematical Sciences",13.5488 +Physics,12.0000 +Arts,11.8252 +"Social and Economic Science",10.8677 +"Design and Manufacturing Systems",6.6809 +"Earth Sciences",6.2418 +"Microelectronic Information Processing Systems",1.7650 +"Computer and Computation Research",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv index 98baacd253..dde65078f1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016-12-22,12.0000 -2016-12-23,11.8381 -2016-12-24,11.5600 -2016-12-25,14.0099 -2016-12-26,18.3933 -2016-12-27,67.8600 -2016-12-28,107.6133 -2016-12-29,87.5874 -2016-12-30,69.1154 -2016-12-31,43.3544 -2017-01-01,22.2755 +Day,"[Chemical, Thermal Systems] Job Size: Weighted By CPU Hours (Core Count)","[Atmospheric Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Mechanical and Structural Systems] Job Size: Weighted By CPU Hours (Core Count)","[Electrical and Communication Systems] Job Size: Weighted By CPU Hours (Core Count)","[Materials Research] Job Size: Weighted By CPU Hours (Core Count)","[Environmental Biology] Job Size: Weighted By CPU Hours (Core Count)","[Astronomical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Molecular Biosciences] Job Size: Weighted By CPU Hours (Core Count)","[Polar Programs] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social and Economic Science] Job Size: Weighted By CPU Hours (Core Count)","[Design and Manufacturing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Earth Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Microelectronic Information Processing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Research] Job Size: Weighted By CPU Hours (Core Count)" +2016-12-22,0,0,12.0000,0,0,0,0,0,12.0000,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,12.0000,0,0,0,0,1.0000,12.0000,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,12.0000,0,0,0,0,1.0000,12.0000,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,15.9210,0,0,0,0,1.0000,12.0000,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,20.0000,0,0,0,0,1.0000,12.0000,0,16.0000,0,0,0,0,0,0,0 +2016-12-27,0,0,22.5565,0,96.0000,110.0862,0,58.2272,19.8357,0,15.9632,0,0,1.0000,0,0,0,0 +2016-12-28,0,0,146.7685,0,96.0000,87.9948,0,43.0772,33.0691,0,15.3614,12.0000,0,1.0000,1.0000,20.0000,2.8865,0 +2016-12-29,0,160.0000,141.7754,112.0000,95.9456,65.2945,0,47.7147,28.0857,40.0000,14.9544,12.0000,11.5552,10.2034,1.0000,18.5337,1.6782,1.0000 +2016-12-30,320.0517,160.0000,138.9738,111.6728,94.9365,54.3936,65.8038,40.9495,28.3785,36.0526,15.0028,12.0000,11.8713,10.9005,1.0000,4.0431,1.9041,1.0000 +2016-12-31,336.0000,0,99.3288,111.0872,90.9081,37.7420,95.7214,50.6854,34.6323,34.2349,11.9136,0,11.8540,10.8898,13.5207,6.2480,1.7162,1.0000 +2017-01-01,0,160.0000,14.4798,1.0000,90.0978,0,47.3679,55.6210,35.3735,11.9990,10.2559,0,10.7741,10.5763,13.8313,7.4372,1.5550,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv index 08306b4575..d6f1af4aea 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016-12,69.5398 -2017-01,22.2755 +Month,"[Chemical, Thermal Systems] Job Size: Weighted By CPU Hours (Core Count)","[Atmospheric Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Mechanical and Structural Systems] Job Size: Weighted By CPU Hours (Core Count)","[Electrical and Communication Systems] Job Size: Weighted By CPU Hours (Core Count)","[Materials Research] Job Size: Weighted By CPU Hours (Core Count)","[Environmental Biology] Job Size: Weighted By CPU Hours (Core Count)","[Astronomical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Molecular Biosciences] Job Size: Weighted By CPU Hours (Core Count)","[Polar Programs] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social and Economic Science] Job Size: Weighted By CPU Hours (Core Count)","[Design and Manufacturing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Earth Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Microelectronic Information Processing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Research] Job Size: Weighted By CPU Hours (Core Count)" +2016-12,326.9898,160.0000,132.5250,111.5740,94.6650,65.7034,71.6000,46.2364,28.5024,37.1250,14.0136,12.0000,11.8512,10.8841,5.4428,6.2382,1.8060,1.0000 +2017-01,0,160.0000,14.4798,1.0000,90.0978,0,47.3679,55.6210,35.3735,11.9990,10.2559,0,10.7741,10.5763,13.8313,7.4372,1.5550,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv index b1b81289b4..e90ccbe7ea 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -"2016 Q4",69.5398 -"2017 Q1",22.2755 +Quarter,"[Chemical, Thermal Systems] Job Size: Weighted By CPU Hours (Core Count)","[Atmospheric Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Mechanical and Structural Systems] Job Size: Weighted By CPU Hours (Core Count)","[Electrical and Communication Systems] Job Size: Weighted By CPU Hours (Core Count)","[Materials Research] Job Size: Weighted By CPU Hours (Core Count)","[Environmental Biology] Job Size: Weighted By CPU Hours (Core Count)","[Astronomical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Molecular Biosciences] Job Size: Weighted By CPU Hours (Core Count)","[Polar Programs] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social and Economic Science] Job Size: Weighted By CPU Hours (Core Count)","[Design and Manufacturing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Earth Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Microelectronic Information Processing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Research] Job Size: Weighted By CPU Hours (Core Count)" +"2016 Q4",326.9898,160.0000,132.5250,111.5740,94.6650,65.7034,71.6000,46.2364,28.5024,37.1250,14.0136,12.0000,11.8512,10.8841,5.4428,6.2382,1.8060,1.0000 +"2017 Q1",0,160.0000,14.4798,1.0000,90.0978,0,47.3679,55.6210,35.3735,11.9990,10.2559,0,10.7741,10.5763,13.8313,7.4372,1.5550,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv index 1c339b308b..4ecb19b74c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_job_size_weighted_by_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Weighted By CPU Hours (Core Count)" -2016,69.5398 -2017,22.2755 +Year,"[Chemical, Thermal Systems] Job Size: Weighted By CPU Hours (Core Count)","[Atmospheric Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Chemistry] Job Size: Weighted By CPU Hours (Core Count)","[Mechanical and Structural Systems] Job Size: Weighted By CPU Hours (Core Count)","[Electrical and Communication Systems] Job Size: Weighted By CPU Hours (Core Count)","[Materials Research] Job Size: Weighted By CPU Hours (Core Count)","[Environmental Biology] Job Size: Weighted By CPU Hours (Core Count)","[Astronomical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Molecular Biosciences] Job Size: Weighted By CPU Hours (Core Count)","[Polar Programs] Job Size: Weighted By CPU Hours (Core Count)","[Mathematical Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Physics] Job Size: Weighted By CPU Hours (Core Count)","[Arts] Job Size: Weighted By CPU Hours (Core Count)","[Social and Economic Science] Job Size: Weighted By CPU Hours (Core Count)","[Design and Manufacturing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Earth Sciences] Job Size: Weighted By CPU Hours (Core Count)","[Microelectronic Information Processing Systems] Job Size: Weighted By CPU Hours (Core Count)","[Computer and Computation Research] Job Size: Weighted By CPU Hours (Core Count)" +2016,326.9898,160.0000,132.5250,111.5740,94.6650,65.7034,71.6000,46.2364,28.5024,37.1250,14.0136,12.0000,11.8512,10.8841,5.4428,6.2382,1.8060,1.0000 +2017,0,160.0000,14.4798,1.0000,90.0978,0,47.3679,55.6210,35.3735,11.9990,10.2559,0,10.7741,10.5763,13.8313,7.4372,1.5550,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Day-reference.csv index b4c978684b..70f2dca7a0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,28.72362434 -2016-12-28,19.14359259 -2016-12-29,16.39568790 -2016-12-30,1.81280749 -2016-12-31,1.60081062 -2017-01-01,1.07790443 +Day,"[Chemical, Thermal Systems] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,16.74638889,0,0,0,0,0,0,0,16.94166667,0,0 +2016-12-23,0,0,0,0,0,0,0,24.00000000,0,0,0,0,8.60361111,0,0,24.00000000,0,0 +2016-12-24,0,0,0,0,0,0,0,24.00000000,0,0,0,0,24.00000000,0,0,24.00000000,0,0 +2016-12-25,0,0,0,0,0,0,0,24.00000000,0,0,0,0,24.00000000,0,0,8.12694444,0,0 +2016-12-26,0,0,0,2.70416667,0,0,0,24.00000000,0,0,0,0,24.00000000,0,0,24.00000000,0,0 +2016-12-27,0,103.87259259,0,20.78689815,110.37185185,0,0,18.01625000,0,0,0,0,25.18305556,0,0,8.23638889,0,3.21666667 +2016-12-28,0,121.84400000,0,7.55612179,41.89046296,13.35268330,5.03972222,32.02948718,5.11274929,0,0,4.70055556,45.58354167,0,0,79.41758621,0,24.00000000 +2016-12-29,0,159.50279835,129.77777778,23.92517593,41.66655382,16.60273286,24.00000000,11.06724359,13.06557690,4.34454545,25.68611111,17.20041667,22.45891865,2.01966667,37.94944444,54.05418430,0,1.27936230 +2016-12-30,205.67851852,113.18805556,50.35000000,17.43217014,13.94513215,21.71949405,15.09675926,10.47010131,13.30752510,9.68358547,16.74827932,4.19712587,1.50513094,4.10559722,2.23007540,1.00958556,0.56942901,0.33097065 +2016-12-31,475.12888889,24.46069552,0,23.19598639,3.53268519,11.59400568,0,18.35809343,12.51327322,15.93161523,7.26913194,5.57808973,15.41041088,8.63138889,1.06848238,0.84369193,1.04561111,0.37017739 +2017-01-01,0,22.86779762,0.43333333,11.08009838,0,13.73172330,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,26.23500000,0,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Month-reference.csv index 8d1f1fa240..475776b43b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Per Job" -2016-12,2.46307856 -2017-01,1.07790443 +Month,"[Chemical, Thermal Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +2016-12,364.05481481,180.12777778,97.44003640,44.13648148,48.31750559,42.25983761,25.49166667,28.88674432,23.05458294,16.77843434,14.66085503,8.53732429,5.04208333,3.96500141,2.16238636,1.86156256,0.61704722,0.36183462 +2017-01,0,0.43333333,22.86779762,0,13.73172330,11.08009838,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,0,26.23500000,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Quarter-reference.csv index dd61314d25..1f30e768b8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Per Job" -"2016 Q4",2.46307856 -"2017 Q1",1.07790443 +Quarter,"[Chemical, Thermal Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +"2016 Q4",364.05481481,180.12777778,97.44003640,44.13648148,48.31750559,42.25983761,25.49166667,28.88674432,23.05458294,16.77843434,14.66085503,8.53732429,5.04208333,3.96500141,2.16238636,1.86156256,0.61704722,0.36183462 +"2017 Q1",0,0.43333333,22.86779762,0,13.73172330,11.08009838,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,0,26.23500000,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Year-reference.csv index 50053b63dd..480fc346d7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Per Job" -2016,2.46307856 -2017,1.07790443 +Year,"[Chemical, Thermal Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +2016,364.05481481,180.12777778,97.44003640,44.13648148,48.31750559,42.25983761,25.49166667,28.88674432,23.05458294,16.77843434,14.66085503,8.53732429,5.04208333,3.96500141,2.16238636,1.86156256,0.61704722,0.36183462 +2017,0,0.43333333,22.86779762,0,13.73172330,11.08009838,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,0,26.23500000,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Day-reference.csv index b4c978684b..70f2dca7a0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,28.72362434 -2016-12-28,19.14359259 -2016-12-29,16.39568790 -2016-12-30,1.81280749 -2016-12-31,1.60081062 -2017-01-01,1.07790443 +Day,"[Chemical, Thermal Systems] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +2016-12-22,0,0,0,0,0,0,0,16.74638889,0,0,0,0,0,0,0,16.94166667,0,0 +2016-12-23,0,0,0,0,0,0,0,24.00000000,0,0,0,0,8.60361111,0,0,24.00000000,0,0 +2016-12-24,0,0,0,0,0,0,0,24.00000000,0,0,0,0,24.00000000,0,0,24.00000000,0,0 +2016-12-25,0,0,0,0,0,0,0,24.00000000,0,0,0,0,24.00000000,0,0,8.12694444,0,0 +2016-12-26,0,0,0,2.70416667,0,0,0,24.00000000,0,0,0,0,24.00000000,0,0,24.00000000,0,0 +2016-12-27,0,103.87259259,0,20.78689815,110.37185185,0,0,18.01625000,0,0,0,0,25.18305556,0,0,8.23638889,0,3.21666667 +2016-12-28,0,121.84400000,0,7.55612179,41.89046296,13.35268330,5.03972222,32.02948718,5.11274929,0,0,4.70055556,45.58354167,0,0,79.41758621,0,24.00000000 +2016-12-29,0,159.50279835,129.77777778,23.92517593,41.66655382,16.60273286,24.00000000,11.06724359,13.06557690,4.34454545,25.68611111,17.20041667,22.45891865,2.01966667,37.94944444,54.05418430,0,1.27936230 +2016-12-30,205.67851852,113.18805556,50.35000000,17.43217014,13.94513215,21.71949405,15.09675926,10.47010131,13.30752510,9.68358547,16.74827932,4.19712587,1.50513094,4.10559722,2.23007540,1.00958556,0.56942901,0.33097065 +2016-12-31,475.12888889,24.46069552,0,23.19598639,3.53268519,11.59400568,0,18.35809343,12.51327322,15.93161523,7.26913194,5.57808973,15.41041088,8.63138889,1.06848238,0.84369193,1.04561111,0.37017739 +2017-01-01,0,22.86779762,0.43333333,11.08009838,0,13.73172330,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,26.23500000,0,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Month-reference.csv index 8d1f1fa240..475776b43b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Per Job" -2016-12,2.46307856 -2017-01,1.07790443 +Month,"[Chemical, Thermal Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +2016-12,364.05481481,180.12777778,97.44003640,44.13648148,48.31750559,42.25983761,25.49166667,28.88674432,23.05458294,16.77843434,14.66085503,8.53732429,5.04208333,3.96500141,2.16238636,1.86156256,0.61704722,0.36183462 +2017-01,0,0.43333333,22.86779762,0,13.73172330,11.08009838,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,0,26.23500000,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Quarter-reference.csv index dd61314d25..1f30e768b8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Per Job" -"2016 Q4",2.46307856 -"2017 Q1",1.07790443 +Quarter,"[Chemical, Thermal Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +"2016 Q4",364.05481481,180.12777778,97.44003640,44.13648148,48.31750559,42.25983761,25.49166667,28.88674432,23.05458294,16.77843434,14.66085503,8.53732429,5.04208333,3.96500141,2.16238636,1.86156256,0.61704722,0.36183462 +"2017 Q1",0,0.43333333,22.86779762,0,13.73172330,11.08009838,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,0,26.23500000,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Year-reference.csv index 50053b63dd..480fc346d7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_node_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Per Job" -2016,2.46307856 -2017,1.07790443 +Year,"[Chemical, Thermal Systems] Node Hours: Per Job","[Atmospheric Sciences] Node Hours: Per Job","[Electrical and Communication Systems] Node Hours: Per Job","[Physics] Node Hours: Per Job","[Design and Manufacturing Systems] Node Hours: Per Job","[Mathematical Sciences] Node Hours: Per Job","[Materials Research] Node Hours: Per Job","[Molecular Biosciences] Node Hours: Per Job","[Microelectronic Information Processing Systems] Node Hours: Per Job","[Arts] Node Hours: Per Job","[Mechanical and Structural Systems] Node Hours: Per Job","[Earth Sciences] Node Hours: Per Job","[Computer and Computation Research] Node Hours: Per Job","[Astronomical Sciences] Node Hours: Per Job","[Polar Programs] Node Hours: Per Job","[Chemistry] Node Hours: Per Job","[Environmental Biology] Node Hours: Per Job","[Social and Economic Science] Node Hours: Per Job" +2016,364.05481481,180.12777778,97.44003640,44.13648148,48.31750559,42.25983761,25.49166667,28.88674432,23.05458294,16.77843434,14.66085503,8.53732429,5.04208333,3.96500141,2.16238636,1.86156256,0.61704722,0.36183462 +2017,0,0.43333333,22.86779762,0,13.73172330,11.08009838,0,9.57901961,11.46455460,6.53122222,0.96969246,1.74462963,0,26.23500000,1.95545864,1.60116192,0.63905875,0.06801433 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Day-reference.csv index 98d5731d47..8d9c89cbc3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Per Job (Core Count)" -2016-12-22,12.0000 -2016-12-23,8.3333 -2016-12-24,8.3333 -2016-12-25,14.1667 -2016-12-26,15.0000 -2016-12-27,29.0238 -2016-12-28,11.5644 -2016-12-29,6.8638 -2016-12-30,8.0163 -2016-12-31,8.7857 -2017-01-01,9.1326 +Day,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,12.0000,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,12.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,12.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,18.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-26,0,0,0,0,0,0,16.0000,0,0,0,18.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-27,0,0,96.0000,0,69.3333,0,13.5000,0,0,0,25.7143,1.0000,21.8571,16.0000,0,0,0,0 +2016-12-28,0,0,96.0000,0,34.6667,0,14.0385,12.0000,0,0,75.1724,1.0000,25.1250,12.9231,1.0000,20.0000,1.1795,0 +2016-12-29,0,160.0000,89.0000,0,36.8750,112.0000,14.3000,12.0000,11.2727,40.0000,41.5238,9.5486,16.6429,3.6000,1.0000,12.5000,1.1148,1.0000 +2016-12-30,224.0000,160.0000,74.7000,44.0444,23.6505,25.6667,14.1563,12.0000,11.2000,1.7714,8.7262,8.4554,4.7537,3.4353,1.0000,1.4824,1.1801,1.0000 +2016-12-31,336.0000,0,21.2558,92.4000,17.0952,14.8750,10.3878,0,10.8889,6.2439,8.8892,9.5422,18.5625,12.7273,1.7538,1.1349,1.1193,1.0000 +2017-01-01,0,160.0000,61.9286,37.8993,0,1.0000,10.5833,0,10.4000,11.1622,10.8293,9.1618,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Month-reference.csv index 20f7727f88..76f3c57b8d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Per Job (Core Count)" -2016-12,8.5390 -2017-01,9.1326 +Month,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +2016-12,224.0000,160.0000,48.8800,24.9310,21.3595,12.0000,11.0909,10.9231,14.8750,3.0909,9.0258,8.5125,5.1703,4.6022,1.6678,1.4181,1.1442,1.0000 +2017-01,0,160.0000,37.8993,61.9286,0,0,10.4000,10.5833,1.0000,11.1622,9.1618,10.8293,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Quarter-reference.csv index e130a5b65d..667273b18b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Per Job (Core Count)" -"2016 Q4",8.5390 -"2017 Q1",9.1326 +Quarter,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +"2016 Q4",224.0000,160.0000,48.8800,24.9310,21.3595,12.0000,11.0909,10.9231,14.8750,3.0909,9.0258,8.5125,5.1703,4.6022,1.6678,1.4181,1.1442,1.0000 +"2017 Q1",0,160.0000,37.8993,61.9286,0,0,10.4000,10.5833,1.0000,11.1622,9.1618,10.8293,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Year-reference.csv index f8ff669679..4bf55734e0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Per Job (Core Count)" -2016,8.5390 -2017,9.1326 +Year,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +2016,224.0000,160.0000,48.8800,24.9310,21.3595,12.0000,11.0909,10.9231,14.8750,3.0909,9.0258,8.5125,5.1703,4.6022,1.6678,1.4181,1.1442,1.0000 +2017,0,160.0000,37.8993,61.9286,0,0,10.4000,10.5833,1.0000,11.1622,9.1618,10.8293,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Day-reference.csv index 98d5731d47..8d9c89cbc3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Per Job (Core Count)" -2016-12-22,12.0000 -2016-12-23,8.3333 -2016-12-24,8.3333 -2016-12-25,14.1667 -2016-12-26,15.0000 -2016-12-27,29.0238 -2016-12-28,11.5644 -2016-12-29,6.8638 -2016-12-30,8.0163 -2016-12-31,8.7857 -2017-01-01,9.1326 +Day,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,12.0000,0,0,12.0000,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,12.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,12.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,18.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-26,0,0,0,0,0,0,16.0000,0,0,0,18.0000,0,1.0000,12.0000,0,0,0,0 +2016-12-27,0,0,96.0000,0,69.3333,0,13.5000,0,0,0,25.7143,1.0000,21.8571,16.0000,0,0,0,0 +2016-12-28,0,0,96.0000,0,34.6667,0,14.0385,12.0000,0,0,75.1724,1.0000,25.1250,12.9231,1.0000,20.0000,1.1795,0 +2016-12-29,0,160.0000,89.0000,0,36.8750,112.0000,14.3000,12.0000,11.2727,40.0000,41.5238,9.5486,16.6429,3.6000,1.0000,12.5000,1.1148,1.0000 +2016-12-30,224.0000,160.0000,74.7000,44.0444,23.6505,25.6667,14.1563,12.0000,11.2000,1.7714,8.7262,8.4554,4.7537,3.4353,1.0000,1.4824,1.1801,1.0000 +2016-12-31,336.0000,0,21.2558,92.4000,17.0952,14.8750,10.3878,0,10.8889,6.2439,8.8892,9.5422,18.5625,12.7273,1.7538,1.1349,1.1193,1.0000 +2017-01-01,0,160.0000,61.9286,37.8993,0,1.0000,10.5833,0,10.4000,11.1622,10.8293,9.1618,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Month-reference.csv index 20f7727f88..76f3c57b8d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Per Job (Core Count)" -2016-12,8.5390 -2017-01,9.1326 +Month,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +2016-12,224.0000,160.0000,48.8800,24.9310,21.3595,12.0000,11.0909,10.9231,14.8750,3.0909,9.0258,8.5125,5.1703,4.6022,1.6678,1.4181,1.1442,1.0000 +2017-01,0,160.0000,37.8993,61.9286,0,0,10.4000,10.5833,1.0000,11.1622,9.1618,10.8293,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Quarter-reference.csv index e130a5b65d..667273b18b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Per Job (Core Count)" -"2016 Q4",8.5390 -"2017 Q1",9.1326 +Quarter,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +"2016 Q4",224.0000,160.0000,48.8800,24.9310,21.3595,12.0000,11.0909,10.9231,14.8750,3.0909,9.0258,8.5125,5.1703,4.6022,1.6678,1.4181,1.1442,1.0000 +"2017 Q1",0,160.0000,37.8993,61.9286,0,0,10.4000,10.5833,1.0000,11.1622,9.1618,10.8293,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Year-reference.csv index f8ff669679..4bf55734e0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Per Job (Core Count)" -2016,8.5390 -2017,9.1326 +Year,"[Chemical, Thermal Systems] Job Size: Per Job (Core Count)","[Atmospheric Sciences] Job Size: Per Job (Core Count)","[Environmental Biology] Job Size: Per Job (Core Count)","[Electrical and Communication Systems] Job Size: Per Job (Core Count)","[Materials Research] Job Size: Per Job (Core Count)","[Physics] Job Size: Per Job (Core Count)","[Arts] Job Size: Per Job (Core Count)","[Mathematical Sciences] Job Size: Per Job (Core Count)","[Mechanical and Structural Systems] Job Size: Per Job (Core Count)","[Polar Programs] Job Size: Per Job (Core Count)","[Social and Economic Science] Job Size: Per Job (Core Count)","[Chemistry] Job Size: Per Job (Core Count)","[Astronomical Sciences] Job Size: Per Job (Core Count)","[Molecular Biosciences] Job Size: Per Job (Core Count)","[Design and Manufacturing Systems] Job Size: Per Job (Core Count)","[Earth Sciences] Job Size: Per Job (Core Count)","[Microelectronic Information Processing Systems] Job Size: Per Job (Core Count)","[Computer and Computation Research] Job Size: Per Job (Core Count)" +2016,224.0000,160.0000,48.8800,24.9310,21.3595,12.0000,11.0909,10.9231,14.8750,3.0909,9.0258,8.5125,5.1703,4.6022,1.6678,1.4181,1.1442,1.0000 +2017,0,160.0000,37.8993,61.9286,0,0,10.4000,10.5833,1.0000,11.1622,9.1618,10.8293,41.9091,8.1471,2.9320,9.6667,1.0994,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Day-reference.csv index 9f68545e5a..f7af99c4a8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Astronomical Sciences",206.38288882,2.4291502902979274 +"Molecular Biosciences",44.58446092,9.807106639983111 +"Materials Research",33.61029775,1.730173782416776 +"Atmospheric Sciences",31.02180556,3.7428536858056267 +"Electrical and Communication Systems",29.16013458,2.208287142540563 +"Environmental Biology",12.67979893,0.790292910753799 +"Chemical, Thermal Systems",6.67768519,0.98851049021015 +Arts,4.87037458,0.44747381160758987 +"Polar Programs",4.57691764,0.1895661574730915 +"Earth Sciences",3.81717768,0.08631664004435641 +Physics,3.72481481,0.0007211928415468717 +"Social and Economic Science",1.99144263,0.025430337208220542 +"Mathematical Sciences",1.30868803,0.25716865971163017 +"Computer and Computation Research",0.32390278,0.2312398274998169 +"Microelectronic Information Processing Systems",0.20713775,0.015463598934236437 +"Design and Manufacturing Systems",0.11687785,0.028203321818092885 +Chemistry,0.06359074,0.014028715326432175 +"Mechanical and Structural Systems",0.00016606,0.000023797091252046995 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Month-reference.csv index 9f68545e5a..f7af99c4a8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Astronomical Sciences",206.38288882,2.4291502902979274 +"Molecular Biosciences",44.58446092,9.807106639983111 +"Materials Research",33.61029775,1.730173782416776 +"Atmospheric Sciences",31.02180556,3.7428536858056267 +"Electrical and Communication Systems",29.16013458,2.208287142540563 +"Environmental Biology",12.67979893,0.790292910753799 +"Chemical, Thermal Systems",6.67768519,0.98851049021015 +Arts,4.87037458,0.44747381160758987 +"Polar Programs",4.57691764,0.1895661574730915 +"Earth Sciences",3.81717768,0.08631664004435641 +Physics,3.72481481,0.0007211928415468717 +"Social and Economic Science",1.99144263,0.025430337208220542 +"Mathematical Sciences",1.30868803,0.25716865971163017 +"Computer and Computation Research",0.32390278,0.2312398274998169 +"Microelectronic Information Processing Systems",0.20713775,0.015463598934236437 +"Design and Manufacturing Systems",0.11687785,0.028203321818092885 +Chemistry,0.06359074,0.014028715326432175 +"Mechanical and Structural Systems",0.00016606,0.000023797091252046995 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Quarter-reference.csv index 9f68545e5a..f7af99c4a8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Astronomical Sciences",206.38288882,2.4291502902979274 +"Molecular Biosciences",44.58446092,9.807106639983111 +"Materials Research",33.61029775,1.730173782416776 +"Atmospheric Sciences",31.02180556,3.7428536858056267 +"Electrical and Communication Systems",29.16013458,2.208287142540563 +"Environmental Biology",12.67979893,0.790292910753799 +"Chemical, Thermal Systems",6.67768519,0.98851049021015 +Arts,4.87037458,0.44747381160758987 +"Polar Programs",4.57691764,0.1895661574730915 +"Earth Sciences",3.81717768,0.08631664004435641 +Physics,3.72481481,0.0007211928415468717 +"Social and Economic Science",1.99144263,0.025430337208220542 +"Mathematical Sciences",1.30868803,0.25716865971163017 +"Computer and Computation Research",0.32390278,0.2312398274998169 +"Microelectronic Information Processing Systems",0.20713775,0.015463598934236437 +"Design and Manufacturing Systems",0.11687785,0.028203321818092885 +Chemistry,0.06359074,0.014028715326432175 +"Mechanical and Structural Systems",0.00016606,0.000023797091252046995 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Year-reference.csv index 9f68545e5a..f7af99c4a8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Per Job","Std Dev: Wait Hours: Per Job" -Unknown,4.29578563,0.08956571094180898 +"Astronomical Sciences",206.38288882,2.4291502902979274 +"Molecular Biosciences",44.58446092,9.807106639983111 +"Materials Research",33.61029775,1.730173782416776 +"Atmospheric Sciences",31.02180556,3.7428536858056267 +"Electrical and Communication Systems",29.16013458,2.208287142540563 +"Environmental Biology",12.67979893,0.790292910753799 +"Chemical, Thermal Systems",6.67768519,0.98851049021015 +Arts,4.87037458,0.44747381160758987 +"Polar Programs",4.57691764,0.1895661574730915 +"Earth Sciences",3.81717768,0.08631664004435641 +Physics,3.72481481,0.0007211928415468717 +"Social and Economic Science",1.99144263,0.025430337208220542 +"Mathematical Sciences",1.30868803,0.25716865971163017 +"Computer and Computation Research",0.32390278,0.2312398274998169 +"Microelectronic Information Processing Systems",0.20713775,0.015463598934236437 +"Design and Manufacturing Systems",0.11687785,0.028203321818092885 +Chemistry,0.06359074,0.014028715326432175 +"Mechanical and Structural Systems",0.00016606,0.000023797091252046995 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Day-reference.csv index 3d080404ac..3a487637b3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wait Hours: Per Job" -2016-12-22,4.66625000 -2016-12-23,9.59638889 -2016-12-24,0.00000000 -2016-12-25,36.96185185 -2016-12-26,0.00066667 -2016-12-27,63.81457885 -2016-12-28,8.81944104 -2016-12-29,4.73013286 -2016-12-30,7.20200027 -2016-12-31,2.68411411 -2017-01-01,1.71038090 +Day,"[Astronomical Sciences] Wait Hours: Per Job","[Molecular Biosciences] Wait Hours: Per Job","[Materials Research] Wait Hours: Per Job","[Atmospheric Sciences] Wait Hours: Per Job","[Electrical and Communication Systems] Wait Hours: Per Job","[Environmental Biology] Wait Hours: Per Job","[Chemical, Thermal Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Polar Programs] Wait Hours: Per Job","[Earth Sciences] Wait Hours: Per Job","[Physics] Wait Hours: Per Job","[Social and Economic Science] Wait Hours: Per Job","[Mathematical Sciences] Wait Hours: Per Job","[Computer and Computation Research] Wait Hours: Per Job","[Microelectronic Information Processing Systems] Wait Hours: Per Job","[Design and Manufacturing Systems] Wait Hours: Per Job","[Chemistry] Wait Hours: Per Job","[Mechanical and Structural Systems] Wait Hours: Per Job" +2016-12-22,0,0.00027778,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9.33222222,0 +2016-12-23,9.59638889,0.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00000000,0 +2016-12-24,0.00000000,0.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00000000,0 +2016-12-25,0.00000000,0.00000000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36.96185185,0 +2016-12-26,0.00000000,0.00000000,0,0,0,0,0,0,0,0,0,0,0.00066667,0,0,0,0.00000000,0 +2016-12-27,12.68148148,202.60396825,57.59064815,0,103.71148148,0,0,0,0,0,0,0.00000000,0.00000000,0,0,0,0.00288889,0 +2016-12-28,36.87611111,280.72700000,80.35419753,0,108.01750000,0,0,0,0,0.00027778,3.72481481,0.00000000,3.31159722,0,0.04097293,0.07195578,2.82994444,0 +2016-12-29,135.82563889,12.05893162,15.12413889,25.72861111,28.72319444,0,0,0.87133838,0.00166667,0.00000000,0.00000000,7.71266385,4.46097222,0.01788889,0.04361965,0.04464331,1.33660948,0.00062500 +2016-12-30,222.28495351,20.19094444,31.96192488,0.00000000,4.72822650,13.00438580,6.67768519,5.77518519,1.70461755,2.52425159,0.00000000,1.34893024,0.38944444,0.42590741,0.32705612,0.13344771,0.02573029,0.00015625 +2016-12-31,2.86747685,175.87315972,33.49272778,0,25.24681217,3.35838889,0.00000000,0.00000000,0.02094444,7.18759066,0,2.80449242,0.00626263,0.00000000,0.35112299,0.43350242,0.03718570,0.00010913 +2017-01-01,1.21768519,0.04938889,0,36.31500000,1.89854167,13.14023981,0,0.00000000,5.05697111,0.00009259,0,1.47296410,0.00000000,0,0.03552149,0.01760234,0.09336190,0.00016865 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Month-reference.csv index 640f584472..98170bb911 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wait Hours: Per Job" -2016-12,4.99051340 -2017-01,1.71038090 +Month,"[Astronomical Sciences] Wait Hours: Per Job","[Molecular Biosciences] Wait Hours: Per Job","[Materials Research] Wait Hours: Per Job","[Atmospheric Sciences] Wait Hours: Per Job","[Electrical and Communication Systems] Wait Hours: Per Job","[Environmental Biology] Wait Hours: Per Job","[Chemical, Thermal Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Polar Programs] Wait Hours: Per Job","[Earth Sciences] Wait Hours: Per Job","[Physics] Wait Hours: Per Job","[Social and Economic Science] Wait Hours: Per Job","[Mathematical Sciences] Wait Hours: Per Job","[Computer and Computation Research] Wait Hours: Per Job","[Microelectronic Information Processing Systems] Wait Hours: Per Job","[Design and Manufacturing Systems] Wait Hours: Per Job","[Chemistry] Wait Hours: Per Job","[Mechanical and Structural Systems] Wait Hours: Per Job" +2016-12,207.94704539,56.55625448,33.61029775,25.72861111,32.16831034,12.03978611,6.67768519,4.87037458,1.07689141,3.82833875,3.72481481,2.14923636,1.30868803,0.32390278,0.22195757,0.12320749,0.06183072,0.00016493 +2017-01,1.21768519,0.04938889,0,36.31500000,1.89854167,13.14023981,0,0.00000000,5.05697111,0.00009259,0,1.47296410,0.00000000,0,0.03552149,0.01760234,0.09336190,0.00016865 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Quarter-reference.csv index ae1e6948a1..45e97dc0ac 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wait Hours: Per Job" -"2016 Q4",4.99051340 -"2017 Q1",1.71038090 +Quarter,"[Astronomical Sciences] Wait Hours: Per Job","[Molecular Biosciences] Wait Hours: Per Job","[Materials Research] Wait Hours: Per Job","[Atmospheric Sciences] Wait Hours: Per Job","[Electrical and Communication Systems] Wait Hours: Per Job","[Environmental Biology] Wait Hours: Per Job","[Chemical, Thermal Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Polar Programs] Wait Hours: Per Job","[Earth Sciences] Wait Hours: Per Job","[Physics] Wait Hours: Per Job","[Social and Economic Science] Wait Hours: Per Job","[Mathematical Sciences] Wait Hours: Per Job","[Computer and Computation Research] Wait Hours: Per Job","[Microelectronic Information Processing Systems] Wait Hours: Per Job","[Design and Manufacturing Systems] Wait Hours: Per Job","[Chemistry] Wait Hours: Per Job","[Mechanical and Structural Systems] Wait Hours: Per Job" +"2016 Q4",207.94704539,56.55625448,33.61029775,25.72861111,32.16831034,12.03978611,6.67768519,4.87037458,1.07689141,3.82833875,3.72481481,2.14923636,1.30868803,0.32390278,0.22195757,0.12320749,0.06183072,0.00016493 +"2017 Q1",1.21768519,0.04938889,0,36.31500000,1.89854167,13.14023981,0,0.00000000,5.05697111,0.00009259,0,1.47296410,0.00000000,0,0.03552149,0.01760234,0.09336190,0.00016865 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Year-reference.csv index e3266f008f..f44c89bbcc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_waitduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wait Hours: Per Job" -2016,4.99051340 -2017,1.71038090 +Year,"[Astronomical Sciences] Wait Hours: Per Job","[Molecular Biosciences] Wait Hours: Per Job","[Materials Research] Wait Hours: Per Job","[Atmospheric Sciences] Wait Hours: Per Job","[Electrical and Communication Systems] Wait Hours: Per Job","[Environmental Biology] Wait Hours: Per Job","[Chemical, Thermal Systems] Wait Hours: Per Job","[Arts] Wait Hours: Per Job","[Polar Programs] Wait Hours: Per Job","[Earth Sciences] Wait Hours: Per Job","[Physics] Wait Hours: Per Job","[Social and Economic Science] Wait Hours: Per Job","[Mathematical Sciences] Wait Hours: Per Job","[Computer and Computation Research] Wait Hours: Per Job","[Microelectronic Information Processing Systems] Wait Hours: Per Job","[Design and Manufacturing Systems] Wait Hours: Per Job","[Chemistry] Wait Hours: Per Job","[Mechanical and Structural Systems] Wait Hours: Per Job" +2016,207.94704539,56.55625448,33.61029775,25.72861111,32.16831034,12.03978611,6.67768519,4.87037458,1.07689141,3.82833875,3.72481481,2.14923636,1.30868803,0.32390278,0.22195757,0.12320749,0.06183072,0.00016493 +2017,1.21768519,0.04938889,0,36.31500000,1.89854167,13.14023981,0,0.00000000,5.05697111,0.00009259,0,1.47296410,0.00000000,0,0.03552149,0.01760234,0.09336190,0.00016865 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Day-reference.csv index 3ce5d8676d..129b1df1e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.017929611668507588 +"Mathematical Sciences",50.44206410, +"Design and Manufacturing Systems",49.15940063, +Physics,44.13648148, +"Microelectronic Information Processing Systems",25.45968035, +"Molecular Biosciences",18.40561205, +Arts,17.27322391, +"Electrical and Communication Systems",16.57502415, +"Chemical, Thermal Systems",15.43750000,2.949516142225878 +"Materials Research",9.15687182,0.6454421230974878 +"Earth Sciences",8.48227702, +"Computer and Computation Research",5.04208333,1.412736659063767 +"Atmospheric Sciences",4.51402778,1.3866381241776238 +"Mechanical and Structural Systems",2.25963164,0.3305676586108775 +"Astronomical Sciences",2.09553699,0.18634770348231622 +"Polar Programs",1.95093933,0.05491474812292802 +Chemistry,0.64439083,0.03401091518206925 +"Social and Economic Science",0.28820096,0.0031231359871834977 +"Environmental Biology",0.18926081,0.027954377835160745 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Month-reference.csv index f481ffa899..1c948e9883 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +"Mathematical Sciences",50.44206410, +"Design and Manufacturing Systems",49.15940063,1.0910353513705056 +Physics,44.13648148,3.8863777173028686 +"Microelectronic Information Processing Systems",25.45968035,0.10340711182738624 +"Molecular Biosciences",18.40561205,2.6523848250332356 +Arts,17.27322391,1.2812633375632778 +"Electrical and Communication Systems",16.57502415,1.675444082244451 +"Chemical, Thermal Systems",15.43750000,9.334819660458281 +"Materials Research",9.15687182,1.3644148657479764 +"Earth Sciences",8.48227702,0.06190189958135605 +"Computer and Computation Research",5.04208333,1.9381499596292342 +"Atmospheric Sciences",4.51402778,3.1765790052054 +"Mechanical and Structural Systems",2.25963164,0.45223146995766755 +"Astronomical Sciences",2.09553699,0.37523899443145664 +"Polar Programs",1.95093933,0.06980480406246423 +Chemistry,0.64439083,0.06267511493298365 +"Social and Economic Science",0.28820096,0.004430889448528951 +"Environmental Biology",0.18926081,0.027954377835160745 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Quarter-reference.csv index f481ffa899..1c948e9883 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +"Mathematical Sciences",50.44206410, +"Design and Manufacturing Systems",49.15940063,1.0910353513705056 +Physics,44.13648148,3.8863777173028686 +"Microelectronic Information Processing Systems",25.45968035,0.10340711182738624 +"Molecular Biosciences",18.40561205,2.6523848250332356 +Arts,17.27322391,1.2812633375632778 +"Electrical and Communication Systems",16.57502415,1.675444082244451 +"Chemical, Thermal Systems",15.43750000,9.334819660458281 +"Materials Research",9.15687182,1.3644148657479764 +"Earth Sciences",8.48227702,0.06190189958135605 +"Computer and Computation Research",5.04208333,1.9381499596292342 +"Atmospheric Sciences",4.51402778,3.1765790052054 +"Mechanical and Structural Systems",2.25963164,0.45223146995766755 +"Astronomical Sciences",2.09553699,0.37523899443145664 +"Polar Programs",1.95093933,0.06980480406246423 +Chemistry,0.64439083,0.06267511493298365 +"Social and Economic Science",0.28820096,0.004430889448528951 +"Environmental Biology",0.18926081,0.027954377835160745 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Year-reference.csv index f481ffa899..1c948e9883 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Per Job","Std Dev: Wall Hours: Per Job" -Unknown,1.79457892,0.0259028363905744 +"Mathematical Sciences",50.44206410, +"Design and Manufacturing Systems",49.15940063,1.0910353513705056 +Physics,44.13648148,3.8863777173028686 +"Microelectronic Information Processing Systems",25.45968035,0.10340711182738624 +"Molecular Biosciences",18.40561205,2.6523848250332356 +Arts,17.27322391,1.2812633375632778 +"Electrical and Communication Systems",16.57502415,1.675444082244451 +"Chemical, Thermal Systems",15.43750000,9.334819660458281 +"Materials Research",9.15687182,1.3644148657479764 +"Earth Sciences",8.48227702,0.06190189958135605 +"Computer and Computation Research",5.04208333,1.9381499596292342 +"Atmospheric Sciences",4.51402778,3.1765790052054 +"Mechanical and Structural Systems",2.25963164,0.45223146995766755 +"Astronomical Sciences",2.09553699,0.37523899443145664 +"Polar Programs",1.95093933,0.06980480406246423 +Chemistry,0.64439083,0.06267511493298365 +"Social and Economic Science",0.28820096,0.004430889448528951 +"Environmental Biology",0.18926081,0.027954377835160745 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Day-reference.csv index 714eb6b17c..aa1bb64aca 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wall Hours: Per Job" -2016-12-22,16.84402778 -2016-12-23,18.86787037 -2016-12-24,24.00000000 -2016-12-25,13.41796296 -2016-12-26,14.32007576 -2016-12-27,12.71865079 -2016-12-28,10.16476358 -2016-12-29,11.78420083 -2016-12-30,1.48544495 -2016-12-31,1.42967081 -2017-01-01,1.01283296 +Day,"[Mathematical Sciences] Wall Hours: Per Job","[Design and Manufacturing Systems] Wall Hours: Per Job","[Physics] Wall Hours: Per Job","[Microelectronic Information Processing Systems] Wall Hours: Per Job","[Molecular Biosciences] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Electrical and Communication Systems] Wall Hours: Per Job","[Chemical, Thermal Systems] Wall Hours: Per Job","[Materials Research] Wall Hours: Per Job","[Earth Sciences] Wall Hours: Per Job","[Computer and Computation Research] Wall Hours: Per Job","[Atmospheric Sciences] Wall Hours: Per Job","[Mechanical and Structural Systems] Wall Hours: Per Job","[Astronomical Sciences] Wall Hours: Per Job","[Polar Programs] Wall Hours: Per Job","[Chemistry] Wall Hours: Per Job","[Social and Economic Science] Wall Hours: Per Job","[Environmental Biology] Wall Hours: Per Job" +2016-12-22,0,0,0,0,16.74638889,0,0,0,0,0,0,0,0,0,0,16.94166667,0,0 +2016-12-23,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,8.60361111,0,24.00000000,0,0 +2016-12-24,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,24.00000000,0,24.00000000,0,0 +2016-12-25,0,0,0,0,24.00000000,0,0,0,0,0,0,0,0,24.00000000,0,8.12694444,0,0 +2016-12-26,2.70416667,0,0,0,24.00000000,0,0,0,0,0,0,0,0,24.00000000,0,24.00000000,0,0 +2016-12-27,20.78689815,0,0,0,14.69149306,0,12.98407407,0,20.49703704,0,0,0,0,10.42293651,0,8.23638889,3.21666667,0 +2016-12-28,7.55612179,13.35268330,5.03972222,5.11274929,19.10641026,0,15.23050000,0,14.10152778,4.70055556,0,0,0,22.59725694,0,18.86886015,24.00000000,0 +2016-12-29,23.92517593,16.60273286,24.00000000,13.06557690,8.48262821,4.34454545,20.77597737,0,13.66271701,17.20041667,2.01966667,6.48888889,3.66944444,9.35722222,18.97472222,12.91112875,1.18189040,0 +2016-12-30,17.43217014,21.71949405,15.09675926,13.30626941,8.49330392,9.68358547,16.53400000,9.78120370,5.30866235,4.19277326,4.10559722,2.51750000,3.04096451,0.91902722,1.88721825,0.33013860,0.31886620,0.14245370 +2016-12-31,23.19598639,11.02771149,0,12.51327322,10.71203283,15.93161523,8.15699612,16.96888889,2.21777116,5.54529872,8.63138889,0,1.76819444,6.16083333,0.88861789,0.34603937,0.36858846,0.14844444 +2017-01-01,11.08009838,12.95548544,0,11.46455460,5.41865196,6.53122222,4.52161706,0,0,1.74462963,0,0.02166667,0.96969246,7.22790404,1.95545864,1.44014566,0.06733589,0.22250400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Month-reference.csv index c492373c93..6066ff3f57 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wall Hours: Per Job" -2016-12,1.97829913 -2017-01,1.01283296 +Month,"[Mathematical Sciences] Wall Hours: Per Job","[Design and Manufacturing Systems] Wall Hours: Per Job","[Physics] Wall Hours: Per Job","[Microelectronic Information Processing Systems] Wall Hours: Per Job","[Molecular Biosciences] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Electrical and Communication Systems] Wall Hours: Per Job","[Chemical, Thermal Systems] Wall Hours: Per Job","[Materials Research] Wall Hours: Per Job","[Earth Sciences] Wall Hours: Per Job","[Computer and Computation Research] Wall Hours: Per Job","[Atmospheric Sciences] Wall Hours: Per Job","[Mechanical and Structural Systems] Wall Hours: Per Job","[Astronomical Sciences] Wall Hours: Per Job","[Polar Programs] Wall Hours: Per Job","[Chemistry] Wall Hours: Per Job","[Social and Economic Science] Wall Hours: Per Job","[Environmental Biology] Wall Hours: Per Job" +2016-12,42.25983761,47.81582215,44.13648148,23.05373388,21.37234468,16.77843434,17.53085249,15.43750000,9.15687182,8.50197775,5.04208333,9.00638889,2.82398003,2.01048779,1.70466667,0.59275076,0.35467017,0.14305278 +2017-01,11.08009838,12.95548544,0,11.46455460,5.41865196,6.53122222,4.52161706,0,0,1.74462963,0,0.02166667,0.96969246,7.22790404,1.95545864,1.44014566,0.06733589,0.22250400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Quarter-reference.csv index 0319e387c8..cdb1c436b5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wall Hours: Per Job" -"2016 Q4",1.97829913 -"2017 Q1",1.01283296 +Quarter,"[Mathematical Sciences] Wall Hours: Per Job","[Design and Manufacturing Systems] Wall Hours: Per Job","[Physics] Wall Hours: Per Job","[Microelectronic Information Processing Systems] Wall Hours: Per Job","[Molecular Biosciences] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Electrical and Communication Systems] Wall Hours: Per Job","[Chemical, Thermal Systems] Wall Hours: Per Job","[Materials Research] Wall Hours: Per Job","[Earth Sciences] Wall Hours: Per Job","[Computer and Computation Research] Wall Hours: Per Job","[Atmospheric Sciences] Wall Hours: Per Job","[Mechanical and Structural Systems] Wall Hours: Per Job","[Astronomical Sciences] Wall Hours: Per Job","[Polar Programs] Wall Hours: Per Job","[Chemistry] Wall Hours: Per Job","[Social and Economic Science] Wall Hours: Per Job","[Environmental Biology] Wall Hours: Per Job" +"2016 Q4",42.25983761,47.81582215,44.13648148,23.05373388,21.37234468,16.77843434,17.53085249,15.43750000,9.15687182,8.50197775,5.04208333,9.00638889,2.82398003,2.01048779,1.70466667,0.59275076,0.35467017,0.14305278 +"2017 Q1",11.08009838,12.95548544,0,11.46455460,5.41865196,6.53122222,4.52161706,0,0,1.74462963,0,0.02166667,0.96969246,7.22790404,1.95545864,1.44014566,0.06733589,0.22250400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Year-reference.csv index 2b0d0ac898..c0524b1ea6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/avg_wallduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wall Hours: Per Job" -2016,1.97829913 -2017,1.01283296 +Year,"[Mathematical Sciences] Wall Hours: Per Job","[Design and Manufacturing Systems] Wall Hours: Per Job","[Physics] Wall Hours: Per Job","[Microelectronic Information Processing Systems] Wall Hours: Per Job","[Molecular Biosciences] Wall Hours: Per Job","[Arts] Wall Hours: Per Job","[Electrical and Communication Systems] Wall Hours: Per Job","[Chemical, Thermal Systems] Wall Hours: Per Job","[Materials Research] Wall Hours: Per Job","[Earth Sciences] Wall Hours: Per Job","[Computer and Computation Research] Wall Hours: Per Job","[Atmospheric Sciences] Wall Hours: Per Job","[Mechanical and Structural Systems] Wall Hours: Per Job","[Astronomical Sciences] Wall Hours: Per Job","[Polar Programs] Wall Hours: Per Job","[Chemistry] Wall Hours: Per Job","[Social and Economic Science] Wall Hours: Per Job","[Environmental Biology] Wall Hours: Per Job" +2016,42.25983761,47.81582215,44.13648148,23.05373388,21.37234468,16.77843434,17.53085249,15.43750000,9.15687182,8.50197775,5.04208333,9.00638889,2.82398003,2.01048779,1.70466667,0.59275076,0.35467017,0.14305278 +2017,11.08009838,12.95548544,0,11.46455460,5.41865196,6.53122222,4.52161706,0,0,1.74462963,0,0.02166667,0.96969246,7.22790404,1.95545864,1.44014566,0.06733589,0.22250400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Day-reference.csv index c23473b2ae..86dba5f1d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"User Expansion Factor" -Unknown,3.1031 +"Environmental Biology",69.2703 +"Astronomical Sciences",49.2958 +"Atmospheric Sciences",7.8723 +"Social and Economic Science",7.5872 +"Polar Programs",3.2814 +"Materials Research",2.7638 +"Molecular Biosciences",2.7490 +"Electrical and Communication Systems",2.2611 +"Earth Sciences",1.4482 +"Chemical, Thermal Systems",1.3348 +Arts,1.2820 +Physics,1.0844 +"Computer and Computation Research",1.0642 +Chemistry,1.0463 +"Mathematical Sciences",1.0259 +"Microelectronic Information Processing Systems",1.0081 +"Design and Manufacturing Systems",1.0036 +"Mechanical and Structural Systems",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Month-reference.csv index c23473b2ae..86dba5f1d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"User Expansion Factor" -Unknown,3.1031 +"Environmental Biology",69.2703 +"Astronomical Sciences",49.2958 +"Atmospheric Sciences",7.8723 +"Social and Economic Science",7.5872 +"Polar Programs",3.2814 +"Materials Research",2.7638 +"Molecular Biosciences",2.7490 +"Electrical and Communication Systems",2.2611 +"Earth Sciences",1.4482 +"Chemical, Thermal Systems",1.3348 +Arts,1.2820 +Physics,1.0844 +"Computer and Computation Research",1.0642 +Chemistry,1.0463 +"Mathematical Sciences",1.0259 +"Microelectronic Information Processing Systems",1.0081 +"Design and Manufacturing Systems",1.0036 +"Mechanical and Structural Systems",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Quarter-reference.csv index c23473b2ae..86dba5f1d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"User Expansion Factor" -Unknown,3.1031 +"Environmental Biology",69.2703 +"Astronomical Sciences",49.2958 +"Atmospheric Sciences",7.8723 +"Social and Economic Science",7.5872 +"Polar Programs",3.2814 +"Materials Research",2.7638 +"Molecular Biosciences",2.7490 +"Electrical and Communication Systems",2.2611 +"Earth Sciences",1.4482 +"Chemical, Thermal Systems",1.3348 +Arts,1.2820 +Physics,1.0844 +"Computer and Computation Research",1.0642 +Chemistry,1.0463 +"Mathematical Sciences",1.0259 +"Microelectronic Information Processing Systems",1.0081 +"Design and Manufacturing Systems",1.0036 +"Mechanical and Structural Systems",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Year-reference.csv index c23473b2ae..86dba5f1d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"User Expansion Factor" -Unknown,3.1031 +"Environmental Biology",69.2703 +"Astronomical Sciences",49.2958 +"Atmospheric Sciences",7.8723 +"Social and Economic Science",7.5872 +"Polar Programs",3.2814 +"Materials Research",2.7638 +"Molecular Biosciences",2.7490 +"Electrical and Communication Systems",2.2611 +"Earth Sciences",1.4482 +"Chemical, Thermal Systems",1.3348 +Arts,1.2820 +Physics,1.0844 +"Computer and Computation Research",1.0642 +Chemistry,1.0463 +"Mathematical Sciences",1.0259 +"Microelectronic Information Processing Systems",1.0081 +"Design and Manufacturing Systems",1.0036 +"Mechanical and Structural Systems",1.0000 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Day-reference.csv index be1fdb4a7c..19572a18ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] User Expansion Factor" -2016-12-22,1.0249 -2016-12-23,1.0302 -2016-12-24,1.0368 -2016-12-25,1.0813 -2016-12-26,1.1760 -2016-12-27,2.0450 -2016-12-28,1.5085 -2016-12-29,1.3802 -2016-12-30,4.9345 -2016-12-31,2.5839 -2017-01-01,2.7546 +Day,"[Environmental Biology] User Expansion Factor","[Astronomical Sciences] User Expansion Factor","[Atmospheric Sciences] User Expansion Factor","[Social and Economic Science] User Expansion Factor","[Polar Programs] User Expansion Factor","[Materials Research] User Expansion Factor","[Molecular Biosciences] User Expansion Factor","[Electrical and Communication Systems] User Expansion Factor","[Earth Sciences] User Expansion Factor","[Chemical, Thermal Systems] User Expansion Factor","[Arts] User Expansion Factor","[Physics] User Expansion Factor","[Computer and Computation Research] User Expansion Factor","[Chemistry] User Expansion Factor","[Mathematical Sciences] User Expansion Factor","[Microelectronic Information Processing Systems] User Expansion Factor","[Design and Manufacturing Systems] User Expansion Factor","[Mechanical and Structural Systems] User Expansion Factor" +2016-12-22,0,0,0,0,0,0,1.0000,0,0,0,0,0,0,1.0495,0,0,0,0 +2016-12-23,0,1.0610,0,0,0,0,1.0000,0,0,0,0,0,0,1.0495,0,0,0,0 +2016-12-24,0,1.0610,0,0,0,0,1.0000,0,0,0,0,0,0,1.0495,0,0,0,0 +2016-12-25,0,1.0610,0,0,0,0,1.0000,0,0,0,0,0,0,1.1562,0,0,0,0 +2016-12-26,0,1.0610,0,0,0,0,1.0000,0,0,0,0,0,0,1.2735,1.0000,0,0,0 +2016-12-27,0,1.7724,0,1.0000,0,1.9856,2.9970,2.5533,0,0,0,0,0,1.2277,1.0000,0,0,0 +2016-12-28,0,1.5437,0,1.0000,0,2.1159,2.6841,2.5716,1.0000,0,0,1.0866,0,1.0169,1.0175,1.0014,1.0013,0 +2016-12-29,0,3.5124,3.8567,3.5135,1.0000,2.0971,2.3663,2.2683,1.0000,0,1.0436,1.0866,1.0011,1.0285,1.0515,1.0012,1.0011,1.0000 +2016-12-30,82.2879,144.6787,3.8567,5.1671,1.7535,2.6830,2.1869,2.1328,1.1782,1.4992,1.4225,1.0801,1.0787,1.0357,1.0535,1.0023,1.0011,1.0000 +2016-12-31,30.3841,1.2803,0,8.2251,1.0129,8.1155,3.8407,2.3853,1.6005,1.1213,1.1163,0,1.0006,1.0953,1.0103,1.0186,1.0085,1.0000 +2017-01-01,66.3373,1.3741,1677.0769,21.0966,3.5481,0,4.3551,1.4790,1.0001,0,1.1040,0,0,1.0599,1.0060,1.0087,1.0125,1.0002 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Month-reference.csv index 72e59bd04a..bdc3ac9407 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] User Expansion Factor" -2016-12,3.1481 -2017-01,2.7546 +Month,"[Environmental Biology] User Expansion Factor","[Astronomical Sciences] User Expansion Factor","[Atmospheric Sciences] User Expansion Factor","[Social and Economic Science] User Expansion Factor","[Polar Programs] User Expansion Factor","[Materials Research] User Expansion Factor","[Molecular Biosciences] User Expansion Factor","[Electrical and Communication Systems] User Expansion Factor","[Earth Sciences] User Expansion Factor","[Chemical, Thermal Systems] User Expansion Factor","[Arts] User Expansion Factor","[Physics] User Expansion Factor","[Computer and Computation Research] User Expansion Factor","[Chemistry] User Expansion Factor","[Mathematical Sciences] User Expansion Factor","[Microelectronic Information Processing Systems] User Expansion Factor","[Design and Manufacturing Systems] User Expansion Factor","[Mechanical and Structural Systems] User Expansion Factor" +2016-12,73.4926,53.7276,3.8567,6.7861,1.4969,2.7638,2.5543,2.2965,1.4485,1.3348,1.2872,1.0844,1.0642,1.0455,1.0298,1.0080,1.0027,1.0000 +2017-01,66.3373,1.3741,1677.0769,21.0966,3.5481,0,4.3551,1.4790,1.0001,0,1.1040,0,0,1.0599,1.0060,1.0087,1.0125,1.0002 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Quarter-reference.csv index ced72c28e8..6c99b12a1f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] User Expansion Factor" -"2016 Q4",3.1481 -"2017 Q1",2.7546 +Quarter,"[Environmental Biology] User Expansion Factor","[Astronomical Sciences] User Expansion Factor","[Atmospheric Sciences] User Expansion Factor","[Social and Economic Science] User Expansion Factor","[Polar Programs] User Expansion Factor","[Materials Research] User Expansion Factor","[Molecular Biosciences] User Expansion Factor","[Electrical and Communication Systems] User Expansion Factor","[Earth Sciences] User Expansion Factor","[Chemical, Thermal Systems] User Expansion Factor","[Arts] User Expansion Factor","[Physics] User Expansion Factor","[Computer and Computation Research] User Expansion Factor","[Chemistry] User Expansion Factor","[Mathematical Sciences] User Expansion Factor","[Microelectronic Information Processing Systems] User Expansion Factor","[Design and Manufacturing Systems] User Expansion Factor","[Mechanical and Structural Systems] User Expansion Factor" +"2016 Q4",73.4926,53.7276,3.8567,6.7861,1.4969,2.7638,2.5543,2.2965,1.4485,1.3348,1.2872,1.0844,1.0642,1.0455,1.0298,1.0080,1.0027,1.0000 +"2017 Q1",66.3373,1.3741,1677.0769,21.0966,3.5481,0,4.3551,1.4790,1.0001,0,1.1040,0,0,1.0599,1.0060,1.0087,1.0125,1.0002 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Year-reference.csv index efa83061b6..a5519f0e94 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/expansion_factor/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] User Expansion Factor" -2016,3.1481 -2017,2.7546 +Year,"[Environmental Biology] User Expansion Factor","[Astronomical Sciences] User Expansion Factor","[Atmospheric Sciences] User Expansion Factor","[Social and Economic Science] User Expansion Factor","[Polar Programs] User Expansion Factor","[Materials Research] User Expansion Factor","[Molecular Biosciences] User Expansion Factor","[Electrical and Communication Systems] User Expansion Factor","[Earth Sciences] User Expansion Factor","[Chemical, Thermal Systems] User Expansion Factor","[Arts] User Expansion Factor","[Physics] User Expansion Factor","[Computer and Computation Research] User Expansion Factor","[Chemistry] User Expansion Factor","[Mathematical Sciences] User Expansion Factor","[Microelectronic Information Processing Systems] User Expansion Factor","[Design and Manufacturing Systems] User Expansion Factor","[Mechanical and Structural Systems] User Expansion Factor" +2016,73.4926,53.7276,3.8567,6.7861,1.4969,2.7638,2.5543,2.2965,1.4485,1.3348,1.2872,1.0844,1.0642,1.0455,1.0298,1.0080,1.0027,1.0000 +2017,66.3373,1.3741,1677.0769,21.0966,3.5481,0,4.3551,1.4790,1.0001,0,1.1040,0,0,1.0599,1.0060,1.0087,1.0125,1.0002 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Day-reference.csv index a62b1a19fc..1c5b6ea184 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Ended" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Month-reference.csv index a62b1a19fc..1c5b6ea184 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Ended" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Quarter-reference.csv index a62b1a19fc..1c5b6ea184 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Ended" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Year-reference.csv index a62b1a19fc..1c5b6ea184 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Ended" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Day-reference.csv index 7da483f809..583620b165 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Ended" -2016-12-22,0 -2016-12-23,0 -2016-12-24,0 -2016-12-25,0 -2016-12-26,0 -2016-12-27,0 -2016-12-28,0 -2016-12-29,0 -2016-12-30,26606 -2016-12-31,28141 -2017-01-01,16566 +Day,"[Social and Economic Science] Number of Jobs Ended","[Chemistry] Number of Jobs Ended","[Microelectronic Information Processing Systems] Number of Jobs Ended","[Earth Sciences] Number of Jobs Ended","[Polar Programs] Number of Jobs Ended","[Astronomical Sciences] Number of Jobs Ended","[Design and Manufacturing Systems] Number of Jobs Ended","[Environmental Biology] Number of Jobs Ended","[Electrical and Communication Systems] Number of Jobs Ended","[Materials Research] Number of Jobs Ended","[Molecular Biosciences] Number of Jobs Ended","[Mechanical and Structural Systems] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Mathematical Sciences] Number of Jobs Ended","[Computer and Computation Research] Number of Jobs Ended","[Chemical, Thermal Systems] Number of Jobs Ended","[Physics] Number of Jobs Ended","[Atmospheric Sciences] Number of Jobs Ended" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-30,20765,3827,796,18,69,739,34,90,16,69,71,32,39,16,19,2,3,1 +2016-12-31,22983,2732,885,1008,29,43,180,10,117,84,13,32,22,1,1,1,0,0 +2017-01-01,13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Month-reference.csv index 60a95282a7..b4b715cd66 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Ended" -2016-12,54747 -2017-01,16566 +Month,"[Social and Economic Science] Number of Jobs Ended","[Chemistry] Number of Jobs Ended","[Microelectronic Information Processing Systems] Number of Jobs Ended","[Earth Sciences] Number of Jobs Ended","[Polar Programs] Number of Jobs Ended","[Astronomical Sciences] Number of Jobs Ended","[Design and Manufacturing Systems] Number of Jobs Ended","[Environmental Biology] Number of Jobs Ended","[Electrical and Communication Systems] Number of Jobs Ended","[Materials Research] Number of Jobs Ended","[Molecular Biosciences] Number of Jobs Ended","[Mechanical and Structural Systems] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Mathematical Sciences] Number of Jobs Ended","[Computer and Computation Research] Number of Jobs Ended","[Chemical, Thermal Systems] Number of Jobs Ended","[Physics] Number of Jobs Ended","[Atmospheric Sciences] Number of Jobs Ended" +2016-12,43748,6559,1681,1026,98,782,214,100,133,153,84,64,61,17,20,3,3,1 +2017-01,13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Quarter-reference.csv index f7093edcc3..b7e795485e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Ended" -"2016 Q4",54747 -"2017 Q1",16566 +Quarter,"[Social and Economic Science] Number of Jobs Ended","[Chemistry] Number of Jobs Ended","[Microelectronic Information Processing Systems] Number of Jobs Ended","[Earth Sciences] Number of Jobs Ended","[Polar Programs] Number of Jobs Ended","[Astronomical Sciences] Number of Jobs Ended","[Design and Manufacturing Systems] Number of Jobs Ended","[Environmental Biology] Number of Jobs Ended","[Electrical and Communication Systems] Number of Jobs Ended","[Materials Research] Number of Jobs Ended","[Molecular Biosciences] Number of Jobs Ended","[Mechanical and Structural Systems] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Mathematical Sciences] Number of Jobs Ended","[Computer and Computation Research] Number of Jobs Ended","[Chemical, Thermal Systems] Number of Jobs Ended","[Physics] Number of Jobs Ended","[Atmospheric Sciences] Number of Jobs Ended" +"2016 Q4",43748,6559,1681,1026,98,782,214,100,133,153,84,64,61,17,20,3,3,1 +"2017 Q1",13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Year-reference.csv index 53584b5faa..da1ca5c96f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Ended" -2016,54747 -2017,16566 +Year,"[Social and Economic Science] Number of Jobs Ended","[Chemistry] Number of Jobs Ended","[Microelectronic Information Processing Systems] Number of Jobs Ended","[Earth Sciences] Number of Jobs Ended","[Polar Programs] Number of Jobs Ended","[Astronomical Sciences] Number of Jobs Ended","[Design and Manufacturing Systems] Number of Jobs Ended","[Environmental Biology] Number of Jobs Ended","[Electrical and Communication Systems] Number of Jobs Ended","[Materials Research] Number of Jobs Ended","[Molecular Biosciences] Number of Jobs Ended","[Mechanical and Structural Systems] Number of Jobs Ended","[Arts] Number of Jobs Ended","[Mathematical Sciences] Number of Jobs Ended","[Computer and Computation Research] Number of Jobs Ended","[Chemical, Thermal Systems] Number of Jobs Ended","[Physics] Number of Jobs Ended","[Atmospheric Sciences] Number of Jobs Ended" +2016,43748,6559,1681,1026,98,782,214,100,133,153,84,64,61,17,20,3,3,1 +2017,13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Day-reference.csv index a7a318dae3..36e66fd1bc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Max (Core Count)" -Unknown,336 +"Chemical, Thermal Systems",336 +Chemistry,192 +"Environmental Biology",192 +"Atmospheric Sciences",160 +"Materials Research",144 +"Mechanical and Structural Systems",112 +"Microelectronic Information Processing Systems",108 +"Electrical and Communication Systems",96 +"Astronomical Sciences",72 +"Molecular Biosciences",64 +"Earth Sciences",60 +"Social and Economic Science",56 +"Polar Programs",40 +"Design and Manufacturing Systems",24 +"Mathematical Sciences",16 +Arts,12 +Physics,12 +"Computer and Computation Research",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Month-reference.csv index a7a318dae3..36e66fd1bc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Max (Core Count)" -Unknown,336 +"Chemical, Thermal Systems",336 +Chemistry,192 +"Environmental Biology",192 +"Atmospheric Sciences",160 +"Materials Research",144 +"Mechanical and Structural Systems",112 +"Microelectronic Information Processing Systems",108 +"Electrical and Communication Systems",96 +"Astronomical Sciences",72 +"Molecular Biosciences",64 +"Earth Sciences",60 +"Social and Economic Science",56 +"Polar Programs",40 +"Design and Manufacturing Systems",24 +"Mathematical Sciences",16 +Arts,12 +Physics,12 +"Computer and Computation Research",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Quarter-reference.csv index a7a318dae3..36e66fd1bc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Max (Core Count)" -Unknown,336 +"Chemical, Thermal Systems",336 +Chemistry,192 +"Environmental Biology",192 +"Atmospheric Sciences",160 +"Materials Research",144 +"Mechanical and Structural Systems",112 +"Microelectronic Information Processing Systems",108 +"Electrical and Communication Systems",96 +"Astronomical Sciences",72 +"Molecular Biosciences",64 +"Earth Sciences",60 +"Social and Economic Science",56 +"Polar Programs",40 +"Design and Manufacturing Systems",24 +"Mathematical Sciences",16 +Arts,12 +Physics,12 +"Computer and Computation Research",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Year-reference.csv index a7a318dae3..36e66fd1bc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Max (Core Count)" -Unknown,336 +"Chemical, Thermal Systems",336 +Chemistry,192 +"Environmental Biology",192 +"Atmospheric Sciences",160 +"Materials Research",144 +"Mechanical and Structural Systems",112 +"Microelectronic Information Processing Systems",108 +"Electrical and Communication Systems",96 +"Astronomical Sciences",72 +"Molecular Biosciences",64 +"Earth Sciences",60 +"Social and Economic Science",56 +"Polar Programs",40 +"Design and Manufacturing Systems",24 +"Mathematical Sciences",16 +Arts,12 +Physics,12 +"Computer and Computation Research",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Day-reference.csv index 77ddd127aa..3c0a281b91 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Max (Core Count)" -2016-12-22,12 -2016-12-23,12 -2016-12-24,12 -2016-12-25,24 -2016-12-26,24 -2016-12-27,144 -2016-12-28,192 -2016-12-29,192 -2016-12-30,336 -2016-12-31,336 -2017-01-01,192 +Day,"[Chemical, Thermal Systems] Job Size: Max (Core Count)","[Chemistry] Job Size: Max (Core Count)","[Environmental Biology] Job Size: Max (Core Count)","[Atmospheric Sciences] Job Size: Max (Core Count)","[Materials Research] Job Size: Max (Core Count)","[Mechanical and Structural Systems] Job Size: Max (Core Count)","[Microelectronic Information Processing Systems] Job Size: Max (Core Count)","[Electrical and Communication Systems] Job Size: Max (Core Count)","[Astronomical Sciences] Job Size: Max (Core Count)","[Molecular Biosciences] Job Size: Max (Core Count)","[Earth Sciences] Job Size: Max (Core Count)","[Social and Economic Science] Job Size: Max (Core Count)","[Polar Programs] Job Size: Max (Core Count)","[Design and Manufacturing Systems] Job Size: Max (Core Count)","[Mathematical Sciences] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Physics] Job Size: Max (Core Count)","[Computer and Computation Research] Job Size: Max (Core Count)" +2016-12-22,0,12,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0 +2016-12-23,0,12,0,0,0,0,0,0,1,12,0,0,0,0,0,0,0,0 +2016-12-24,0,12,0,0,0,0,0,0,1,12,0,0,0,0,0,0,0,0 +2016-12-25,0,24,0,0,0,0,0,0,1,12,0,0,0,0,0,0,0,0 +2016-12-26,0,24,0,0,0,0,0,0,1,12,0,0,0,0,16,0,0,0 +2016-12-27,0,32,0,0,144,0,0,96,72,64,0,1,0,0,16,0,0,0 +2016-12-28,0,192,0,0,144,0,8,96,72,64,20,1,0,1,16,0,12,0 +2016-12-29,0,192,0,160,144,112,8,96,72,64,20,56,40,1,16,12,12,1 +2016-12-30,336,192,192,160,144,112,108,96,72,64,60,56,40,1,16,12,12,1 +2016-12-31,336,192,192,0,72,112,12,96,72,64,60,48,40,24,16,12,0,1 +2017-01-01,0,48,192,160,0,1,8,96,72,64,12,48,12,24,16,12,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Month-reference.csv index c7df0f4a34..b442976501 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Max (Core Count)" -2016-12,336 -2017-01,192 +Month,"[Chemical, Thermal Systems] Job Size: Max (Core Count)","[Chemistry] Job Size: Max (Core Count)","[Environmental Biology] Job Size: Max (Core Count)","[Atmospheric Sciences] Job Size: Max (Core Count)","[Materials Research] Job Size: Max (Core Count)","[Mechanical and Structural Systems] Job Size: Max (Core Count)","[Microelectronic Information Processing Systems] Job Size: Max (Core Count)","[Electrical and Communication Systems] Job Size: Max (Core Count)","[Astronomical Sciences] Job Size: Max (Core Count)","[Molecular Biosciences] Job Size: Max (Core Count)","[Earth Sciences] Job Size: Max (Core Count)","[Social and Economic Science] Job Size: Max (Core Count)","[Polar Programs] Job Size: Max (Core Count)","[Design and Manufacturing Systems] Job Size: Max (Core Count)","[Mathematical Sciences] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Physics] Job Size: Max (Core Count)","[Computer and Computation Research] Job Size: Max (Core Count)" +2016-12,336,192,192,160,144,112,108,96,72,64,60,56,40,24,16,12,12,1 +2017-01,0,48,192,160,0,1,8,96,72,64,12,48,12,24,16,12,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Quarter-reference.csv index 585e75a9b7..c1653a9016 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Max (Core Count)" -"2016 Q4",336 -"2017 Q1",192 +Quarter,"[Chemical, Thermal Systems] Job Size: Max (Core Count)","[Chemistry] Job Size: Max (Core Count)","[Environmental Biology] Job Size: Max (Core Count)","[Atmospheric Sciences] Job Size: Max (Core Count)","[Materials Research] Job Size: Max (Core Count)","[Mechanical and Structural Systems] Job Size: Max (Core Count)","[Microelectronic Information Processing Systems] Job Size: Max (Core Count)","[Electrical and Communication Systems] Job Size: Max (Core Count)","[Astronomical Sciences] Job Size: Max (Core Count)","[Molecular Biosciences] Job Size: Max (Core Count)","[Earth Sciences] Job Size: Max (Core Count)","[Social and Economic Science] Job Size: Max (Core Count)","[Polar Programs] Job Size: Max (Core Count)","[Design and Manufacturing Systems] Job Size: Max (Core Count)","[Mathematical Sciences] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Physics] Job Size: Max (Core Count)","[Computer and Computation Research] Job Size: Max (Core Count)" +"2016 Q4",336,192,192,160,144,112,108,96,72,64,60,56,40,24,16,12,12,1 +"2017 Q1",0,48,192,160,0,1,8,96,72,64,12,48,12,24,16,12,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Year-reference.csv index 221d37f95d..294954ecad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/max_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Max (Core Count)" -2016,336 -2017,192 +Year,"[Chemical, Thermal Systems] Job Size: Max (Core Count)","[Chemistry] Job Size: Max (Core Count)","[Environmental Biology] Job Size: Max (Core Count)","[Atmospheric Sciences] Job Size: Max (Core Count)","[Materials Research] Job Size: Max (Core Count)","[Mechanical and Structural Systems] Job Size: Max (Core Count)","[Microelectronic Information Processing Systems] Job Size: Max (Core Count)","[Electrical and Communication Systems] Job Size: Max (Core Count)","[Astronomical Sciences] Job Size: Max (Core Count)","[Molecular Biosciences] Job Size: Max (Core Count)","[Earth Sciences] Job Size: Max (Core Count)","[Social and Economic Science] Job Size: Max (Core Count)","[Polar Programs] Job Size: Max (Core Count)","[Design and Manufacturing Systems] Job Size: Max (Core Count)","[Mathematical Sciences] Job Size: Max (Core Count)","[Arts] Job Size: Max (Core Count)","[Physics] Job Size: Max (Core Count)","[Computer and Computation Research] Job Size: Max (Core Count)" +2016,336,192,192,160,144,112,108,96,72,64,60,56,40,24,16,12,12,1 +2017,0,48,192,160,0,1,8,96,72,64,12,48,12,24,16,12,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Day-reference.csv index d5f12fa02e..968201ea7b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Min (Core Count)" -Unknown,1 +"Atmospheric Sciences",160 +"Chemical, Thermal Systems",48 +"Materials Research",12 +Physics,12 +Chemistry,8 +"Environmental Biology",8 +Arts,1 +"Astronomical Sciences",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Earth Sciences",1 +"Electrical and Communication Systems",1 +"Mathematical Sciences",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +"Molecular Biosciences",1 +"Polar Programs",1 +"Social and Economic Science",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Month-reference.csv index d5f12fa02e..968201ea7b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Min (Core Count)" -Unknown,1 +"Atmospheric Sciences",160 +"Chemical, Thermal Systems",48 +"Materials Research",12 +Physics,12 +Chemistry,8 +"Environmental Biology",8 +Arts,1 +"Astronomical Sciences",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Earth Sciences",1 +"Electrical and Communication Systems",1 +"Mathematical Sciences",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +"Molecular Biosciences",1 +"Polar Programs",1 +"Social and Economic Science",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Quarter-reference.csv index d5f12fa02e..968201ea7b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Min (Core Count)" -Unknown,1 +"Atmospheric Sciences",160 +"Chemical, Thermal Systems",48 +"Materials Research",12 +Physics,12 +Chemistry,8 +"Environmental Biology",8 +Arts,1 +"Astronomical Sciences",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Earth Sciences",1 +"Electrical and Communication Systems",1 +"Mathematical Sciences",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +"Molecular Biosciences",1 +"Polar Programs",1 +"Social and Economic Science",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Year-reference.csv index d5f12fa02e..968201ea7b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Job Size: Min (Core Count)" -Unknown,1 +"Atmospheric Sciences",160 +"Chemical, Thermal Systems",48 +"Materials Research",12 +Physics,12 +Chemistry,8 +"Environmental Biology",8 +Arts,1 +"Astronomical Sciences",1 +"Computer and Computation Research",1 +"Design and Manufacturing Systems",1 +"Earth Sciences",1 +"Electrical and Communication Systems",1 +"Mathematical Sciences",1 +"Mechanical and Structural Systems",1 +"Microelectronic Information Processing Systems",1 +"Molecular Biosciences",1 +"Polar Programs",1 +"Social and Economic Science",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Day-reference.csv index f47a3f4afd..45d655cf3c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Min (Core Count)" -2016-12-22,12 -2016-12-23,1 -2016-12-24,1 -2016-12-25,1 -2016-12-26,1 -2016-12-27,1 -2016-12-28,1 -2016-12-29,1 -2016-12-30,1 -2016-12-31,1 -2017-01-01,1 +Day,"[Atmospheric Sciences] Job Size: Min (Core Count)","[Chemical, Thermal Systems] Job Size: Min (Core Count)","[Materials Research] Job Size: Min (Core Count)","[Physics] Job Size: Min (Core Count)","[Chemistry] Job Size: Min (Core Count)","[Environmental Biology] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Astronomical Sciences] Job Size: Min (Core Count)","[Computer and Computation Research] Job Size: Min (Core Count)","[Design and Manufacturing Systems] Job Size: Min (Core Count)","[Earth Sciences] Job Size: Min (Core Count)","[Electrical and Communication Systems] Job Size: Min (Core Count)","[Mathematical Sciences] Job Size: Min (Core Count)","[Mechanical and Structural Systems] Job Size: Min (Core Count)","[Microelectronic Information Processing Systems] Job Size: Min (Core Count)","[Molecular Biosciences] Job Size: Min (Core Count)","[Polar Programs] Job Size: Min (Core Count)","[Social and Economic Science] Job Size: Min (Core Count)" +2016-12-22,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,12,0,0 +2016-12-23,0,0,0,0,12,0,0,1,0,0,0,0,0,0,0,12,0,0 +2016-12-24,0,0,0,0,12,0,0,1,0,0,0,0,0,0,0,12,0,0 +2016-12-25,0,0,0,0,12,0,0,1,0,0,0,0,0,0,0,12,0,0 +2016-12-26,0,0,0,0,12,0,0,1,0,0,0,0,16,0,0,12,0,0 +2016-12-27,0,0,32,0,8,0,0,1,0,0,0,96,1,0,0,8,0,1 +2016-12-28,0,0,12,12,8,0,0,1,0,1,20,96,1,0,1,8,0,1 +2016-12-29,160,0,12,12,8,0,4,1,1,1,5,1,1,112,1,1,40,1 +2016-12-30,160,48,12,12,8,8,1,1,1,1,1,1,1,1,1,1,1,1 +2016-12-31,0,336,12,0,8,12,1,1,1,1,1,1,1,1,1,1,1,1 +2017-01-01,160,0,0,0,8,8,4,1,0,1,5,2,8,1,1,1,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Month-reference.csv index f667b09643..35f414d2bc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Min (Core Count)" -2016-12,1 -2017-01,1 +Month,"[Atmospheric Sciences] Job Size: Min (Core Count)","[Chemical, Thermal Systems] Job Size: Min (Core Count)","[Materials Research] Job Size: Min (Core Count)","[Physics] Job Size: Min (Core Count)","[Chemistry] Job Size: Min (Core Count)","[Environmental Biology] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Astronomical Sciences] Job Size: Min (Core Count)","[Computer and Computation Research] Job Size: Min (Core Count)","[Design and Manufacturing Systems] Job Size: Min (Core Count)","[Earth Sciences] Job Size: Min (Core Count)","[Electrical and Communication Systems] Job Size: Min (Core Count)","[Mathematical Sciences] Job Size: Min (Core Count)","[Mechanical and Structural Systems] Job Size: Min (Core Count)","[Microelectronic Information Processing Systems] Job Size: Min (Core Count)","[Molecular Biosciences] Job Size: Min (Core Count)","[Polar Programs] Job Size: Min (Core Count)","[Social and Economic Science] Job Size: Min (Core Count)" +2016-12,160,48,12,12,8,8,1,1,1,1,1,1,1,1,1,1,1,1 +2017-01,160,0,0,0,8,8,4,1,0,1,5,2,8,1,1,1,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Quarter-reference.csv index 7661818631..b74a57a009 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Min (Core Count)" -"2016 Q4",1 -"2017 Q1",1 +Quarter,"[Atmospheric Sciences] Job Size: Min (Core Count)","[Chemical, Thermal Systems] Job Size: Min (Core Count)","[Materials Research] Job Size: Min (Core Count)","[Physics] Job Size: Min (Core Count)","[Chemistry] Job Size: Min (Core Count)","[Environmental Biology] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Astronomical Sciences] Job Size: Min (Core Count)","[Computer and Computation Research] Job Size: Min (Core Count)","[Design and Manufacturing Systems] Job Size: Min (Core Count)","[Earth Sciences] Job Size: Min (Core Count)","[Electrical and Communication Systems] Job Size: Min (Core Count)","[Mathematical Sciences] Job Size: Min (Core Count)","[Mechanical and Structural Systems] Job Size: Min (Core Count)","[Microelectronic Information Processing Systems] Job Size: Min (Core Count)","[Molecular Biosciences] Job Size: Min (Core Count)","[Polar Programs] Job Size: Min (Core Count)","[Social and Economic Science] Job Size: Min (Core Count)" +"2016 Q4",160,48,12,12,8,8,1,1,1,1,1,1,1,1,1,1,1,1 +"2017 Q1",160,0,0,0,8,8,4,1,0,1,5,2,8,1,1,1,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Year-reference.csv index 901252d893..5a0cabf0d5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/min_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Min (Core Count)" -2016,1 -2017,1 +Year,"[Atmospheric Sciences] Job Size: Min (Core Count)","[Chemical, Thermal Systems] Job Size: Min (Core Count)","[Materials Research] Job Size: Min (Core Count)","[Physics] Job Size: Min (Core Count)","[Chemistry] Job Size: Min (Core Count)","[Environmental Biology] Job Size: Min (Core Count)","[Arts] Job Size: Min (Core Count)","[Astronomical Sciences] Job Size: Min (Core Count)","[Computer and Computation Research] Job Size: Min (Core Count)","[Design and Manufacturing Systems] Job Size: Min (Core Count)","[Earth Sciences] Job Size: Min (Core Count)","[Electrical and Communication Systems] Job Size: Min (Core Count)","[Mathematical Sciences] Job Size: Min (Core Count)","[Mechanical and Structural Systems] Job Size: Min (Core Count)","[Microelectronic Information Processing Systems] Job Size: Min (Core Count)","[Molecular Biosciences] Job Size: Min (Core Count)","[Polar Programs] Job Size: Min (Core Count)","[Social and Economic Science] Job Size: Min (Core Count)" +2016,160,48,12,12,8,8,1,1,1,1,1,1,1,1,1,1,1,1 +2017,160,0,0,0,8,8,4,1,0,1,5,2,8,1,1,1,1,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Day-reference.csv index 30af961b3b..9b5226cf88 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12-22,0.150000000 -2016-12-23,0.104166667 -2016-12-24,0.104166667 -2016-12-25,0.177083333 -2016-12-26,0.125000000 -2016-12-27,0.145119048 -2016-12-28,0.057822222 -2016-12-29,0.034318966 -2016-12-30,0.040081442 -2016-12-31,0.043928656 -2017-01-01,0.045663105 +Day,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0.300000000,0.300000000,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0.300000000,0.300000000,0.025000000,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0.300000000,0.300000000,0.025000000,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0.300000000,0.450000000,0.025000000,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0.400000000,0,0,0.300000000,0.450000000,0.025000000,0,0,0,0,0 +2016-12-27,0,0,0,2.400000000,0,0,1.733333333,0.168750000,0,0,0.200000000,0.321428571,0.182142857,0.025000000,0,0,0,0 +2016-12-28,0,0,0,2.400000000,0,0.300000000,0.433333333,0.175480769,0,0,0.161538462,0.626436782,0.209375000,0.025000000,0.025000000,0.029487179,0,0.500000000 +2016-12-29,0,4.000000000,0,1.112500000,2.800000000,0.300000000,0.307291667,0.178750000,0.140909091,1.000000000,0.045000000,0.346031746,0.138690476,0.059678988,0.025000000,0.027868852,0.025000000,0.156250000 +2016-12-30,5.600000000,4.000000000,1.101111111,0.933750000,0.641666667,0.300000000,0.197087379,0.176953125,0.140000000,0.022142857,0.042941176,0.054538998,0.039613848,0.042276790,0.025000000,0.029503012,0.025000000,0.018529810 +2016-12-31,8.400000000,0,2.310000000,0.265697674,0.371875000,0,0.213690476,0.129846939,0.136111111,0.052032520,0.159090909,0.055557574,0.232031250,0.047710969,0.043844697,0.027983725,0.025000000,0.028373016 +2017-01-01,0,4.000000000,0.947482014,0.774107143,0.025000000,0,0,0.132291667,0.130000000,0.139527027,0.101838235,0.067682927,0.523863636,0.045808971,0.073300971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Month-reference.csv index f014ef1951..e3618f6b71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12,0.042694764 -2017-01,0.045663105 +Month,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +2016-12,5.600000000,4.000000000,1.222000000,0.311637931,0.300000000,0.371875000,0.177995643,0.138636364,0.136538462,0.025757576,0.057526882,0.053202888,0.041694631,0.043085557,0.045129182,0.028604888,0.025000000,0.017726608 +2017-01,0,4.000000000,0.947482014,0.774107143,0,0.025000000,0,0.130000000,0.132291667,0.139527027,0.101838235,0.067682927,0.073300971,0.523863636,0.045808971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Quarter-reference.csv index 4f245545ca..772740c584 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Normalized (% of Total Cores)" -"2016 Q4",0.042694764 -"2017 Q1",0.045663105 +Quarter,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +"2016 Q4",5.600000000,4.000000000,1.222000000,0.311637931,0.300000000,0.371875000,0.177995643,0.138636364,0.136538462,0.025757576,0.057526882,0.053202888,0.041694631,0.043085557,0.045129182,0.028604888,0.025000000,0.017726608 +"2017 Q1",0,4.000000000,0.947482014,0.774107143,0,0.025000000,0,0.130000000,0.132291667,0.139527027,0.101838235,0.067682927,0.073300971,0.523863636,0.045808971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Year-reference.csv index c9e08c6ae5..c4ce6caacf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/aggregate-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016,0.042694764 -2017,0.045663105 +Year,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +2016,5.600000000,4.000000000,1.222000000,0.311637931,0.300000000,0.371875000,0.177995643,0.138636364,0.136538462,0.025757576,0.057526882,0.053202888,0.041694631,0.043085557,0.045129182,0.028604888,0.025000000,0.017726608 +2017,0,4.000000000,0.947482014,0.774107143,0,0.025000000,0,0.130000000,0.132291667,0.139527027,0.101838235,0.067682927,0.073300971,0.523863636,0.045808971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Day-reference.csv index 30af961b3b..9b5226cf88 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12-22,0.150000000 -2016-12-23,0.104166667 -2016-12-24,0.104166667 -2016-12-25,0.177083333 -2016-12-26,0.125000000 -2016-12-27,0.145119048 -2016-12-28,0.057822222 -2016-12-29,0.034318966 -2016-12-30,0.040081442 -2016-12-31,0.043928656 -2017-01-01,0.045663105 +Day,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +2016-12-22,0,0,0,0,0,0,0,0,0,0,0.300000000,0.300000000,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,0,0.300000000,0.300000000,0.025000000,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0.300000000,0.300000000,0.025000000,0,0,0,0,0 +2016-12-25,0,0,0,0,0,0,0,0,0,0,0.300000000,0.450000000,0.025000000,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0.400000000,0,0,0.300000000,0.450000000,0.025000000,0,0,0,0,0 +2016-12-27,0,0,0,2.400000000,0,0,1.733333333,0.168750000,0,0,0.200000000,0.321428571,0.182142857,0.025000000,0,0,0,0 +2016-12-28,0,0,0,2.400000000,0,0.300000000,0.433333333,0.175480769,0,0,0.161538462,0.626436782,0.209375000,0.025000000,0.025000000,0.029487179,0,0.500000000 +2016-12-29,0,4.000000000,0,1.112500000,2.800000000,0.300000000,0.307291667,0.178750000,0.140909091,1.000000000,0.045000000,0.346031746,0.138690476,0.059678988,0.025000000,0.027868852,0.025000000,0.156250000 +2016-12-30,5.600000000,4.000000000,1.101111111,0.933750000,0.641666667,0.300000000,0.197087379,0.176953125,0.140000000,0.022142857,0.042941176,0.054538998,0.039613848,0.042276790,0.025000000,0.029503012,0.025000000,0.018529810 +2016-12-31,8.400000000,0,2.310000000,0.265697674,0.371875000,0,0.213690476,0.129846939,0.136111111,0.052032520,0.159090909,0.055557574,0.232031250,0.047710969,0.043844697,0.027983725,0.025000000,0.028373016 +2017-01-01,0,4.000000000,0.947482014,0.774107143,0.025000000,0,0,0.132291667,0.130000000,0.139527027,0.101838235,0.067682927,0.523863636,0.045808971,0.073300971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Month-reference.csv index f014ef1951..e3618f6b71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016-12,0.042694764 -2017-01,0.045663105 +Month,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +2016-12,5.600000000,4.000000000,1.222000000,0.311637931,0.300000000,0.371875000,0.177995643,0.138636364,0.136538462,0.025757576,0.057526882,0.053202888,0.041694631,0.043085557,0.045129182,0.028604888,0.025000000,0.017726608 +2017-01,0,4.000000000,0.947482014,0.774107143,0,0.025000000,0,0.130000000,0.132291667,0.139527027,0.101838235,0.067682927,0.073300971,0.523863636,0.045808971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Quarter-reference.csv index 4f245545ca..772740c584 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Job Size: Normalized (% of Total Cores)" -"2016 Q4",0.042694764 -"2017 Q1",0.045663105 +Quarter,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +"2016 Q4",5.600000000,4.000000000,1.222000000,0.311637931,0.300000000,0.371875000,0.177995643,0.138636364,0.136538462,0.025757576,0.057526882,0.053202888,0.041694631,0.043085557,0.045129182,0.028604888,0.025000000,0.017726608 +"2017 Q1",0,4.000000000,0.947482014,0.774107143,0,0.025000000,0,0.130000000,0.132291667,0.139527027,0.101838235,0.067682927,0.073300971,0.523863636,0.045808971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Year-reference.csv index c9e08c6ae5..c4ce6caacf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/normalized_avg_processors/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Job Size: Normalized (% of Total Cores)" -2016,0.042694764 -2017,0.045663105 +Year,"[Chemical, Thermal Systems] Job Size: Normalized (% of Total Cores)","[Atmospheric Sciences] Job Size: Normalized (% of Total Cores)","[Environmental Biology] Job Size: Normalized (% of Total Cores)","[Electrical and Communication Systems] Job Size: Normalized (% of Total Cores)","[Physics] Job Size: Normalized (% of Total Cores)","[Mechanical and Structural Systems] Job Size: Normalized (% of Total Cores)","[Materials Research] Job Size: Normalized (% of Total Cores)","[Arts] Job Size: Normalized (% of Total Cores)","[Mathematical Sciences] Job Size: Normalized (% of Total Cores)","[Polar Programs] Job Size: Normalized (% of Total Cores)","[Molecular Biosciences] Job Size: Normalized (% of Total Cores)","[Chemistry] Job Size: Normalized (% of Total Cores)","[Design and Manufacturing Systems] Job Size: Normalized (% of Total Cores)","[Astronomical Sciences] Job Size: Normalized (% of Total Cores)","[Social and Economic Science] Job Size: Normalized (% of Total Cores)","[Microelectronic Information Processing Systems] Job Size: Normalized (% of Total Cores)","[Computer and Computation Research] Job Size: Normalized (% of Total Cores)","[Earth Sciences] Job Size: Normalized (% of Total Cores)" +2016,5.600000000,4.000000000,1.222000000,0.311637931,0.300000000,0.371875000,0.177995643,0.138636364,0.136538462,0.025757576,0.057526882,0.053202888,0.041694631,0.043085557,0.045129182,0.028604888,0.025000000,0.017726608 +2017,0,4.000000000,0.947482014,0.774107143,0,0.025000000,0,0.130000000,0.132291667,0.139527027,0.101838235,0.067682927,0.073300971,0.523863636,0.045808971,0.027484787,0,0.241666667 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Day-reference.csv index 6ba1b93724..d8b52fb50d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Running" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Month-reference.csv index 6ba1b93724..d8b52fb50d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Running" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Quarter-reference.csv index 6ba1b93724..d8b52fb50d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Running" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Year-reference.csv index 6ba1b93724..d8b52fb50d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Running" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Day-reference.csv index 927ebc9384..7510f274af 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Running" -2016-12-22,2 -2016-12-23,3 -2016-12-24,3 -2016-12-25,6 -2016-12-26,11 -2016-12-27,42 -2016-12-28,450 -2016-12-29,1740 -2016-12-30,28855 -2016-12-31,29603 -2017-01-01,16566 +Day,"[Social and Economic Science] Number of Jobs Running","[Chemistry] Number of Jobs Running","[Microelectronic Information Processing Systems] Number of Jobs Running","[Earth Sciences] Number of Jobs Running","[Polar Programs] Number of Jobs Running","[Astronomical Sciences] Number of Jobs Running","[Design and Manufacturing Systems] Number of Jobs Running","[Environmental Biology] Number of Jobs Running","[Electrical and Communication Systems] Number of Jobs Running","[Materials Research] Number of Jobs Running","[Molecular Biosciences] Number of Jobs Running","[Mechanical and Structural Systems] Number of Jobs Running","[Arts] Number of Jobs Running","[Mathematical Sciences] Number of Jobs Running","[Computer and Computation Research] Number of Jobs Running","[Chemical, Thermal Systems] Number of Jobs Running","[Physics] Number of Jobs Running","[Atmospheric Sciences] Number of Jobs Running" +2016-12-22,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0 +2016-12-23,0,1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0 +2016-12-24,0,1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0 +2016-12-25,0,4,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0 +2016-12-26,0,4,0,0,0,1,0,0,0,0,1,0,0,5,0,0,0,0 +2016-12-27,1,14,0,0,0,7,0,0,3,3,8,0,0,6,0,0,0,0 +2016-12-28,1,29,195,1,0,8,147,0,15,12,13,0,0,26,0,0,3,0 +2016-12-29,257,63,976,2,1,28,235,0,27,32,65,4,11,30,5,0,3,1 +2016-12-30,21034,3872,1660,738,70,751,252,90,40,103,85,36,65,32,20,3,3,1 +2016-12-31,23475,2753,1659,1008,41,48,264,10,129,84,22,32,27,49,1,1,0,0 +2017-01-01,13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Month-reference.csv index 10b7ef6d5b..588676f3c9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Running" -2016-12,56209 -2017-01,16566 +Month,"[Social and Economic Science] Number of Jobs Running","[Chemistry] Number of Jobs Running","[Microelectronic Information Processing Systems] Number of Jobs Running","[Earth Sciences] Number of Jobs Running","[Polar Programs] Number of Jobs Running","[Astronomical Sciences] Number of Jobs Running","[Design and Manufacturing Systems] Number of Jobs Running","[Environmental Biology] Number of Jobs Running","[Electrical and Communication Systems] Number of Jobs Running","[Materials Research] Number of Jobs Running","[Molecular Biosciences] Number of Jobs Running","[Mechanical and Structural Systems] Number of Jobs Running","[Arts] Number of Jobs Running","[Mathematical Sciences] Number of Jobs Running","[Computer and Computation Research] Number of Jobs Running","[Chemical, Thermal Systems] Number of Jobs Running","[Physics] Number of Jobs Running","[Atmospheric Sciences] Number of Jobs Running" +2016-12,44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +2017-01,13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Quarter-reference.csv index 9dc000e515..63e5355b3c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Running" -"2016 Q4",56209 -"2017 Q1",16566 +Quarter,"[Social and Economic Science] Number of Jobs Running","[Chemistry] Number of Jobs Running","[Microelectronic Information Processing Systems] Number of Jobs Running","[Earth Sciences] Number of Jobs Running","[Polar Programs] Number of Jobs Running","[Astronomical Sciences] Number of Jobs Running","[Design and Manufacturing Systems] Number of Jobs Running","[Environmental Biology] Number of Jobs Running","[Electrical and Communication Systems] Number of Jobs Running","[Materials Research] Number of Jobs Running","[Molecular Biosciences] Number of Jobs Running","[Mechanical and Structural Systems] Number of Jobs Running","[Arts] Number of Jobs Running","[Mathematical Sciences] Number of Jobs Running","[Computer and Computation Research] Number of Jobs Running","[Chemical, Thermal Systems] Number of Jobs Running","[Physics] Number of Jobs Running","[Atmospheric Sciences] Number of Jobs Running" +"2016 Q4",44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +"2017 Q1",13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Year-reference.csv index e826c9c61f..8ef2bdc30b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/running_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Running" -2016,56209 -2017,16566 +Year,"[Social and Economic Science] Number of Jobs Running","[Chemistry] Number of Jobs Running","[Microelectronic Information Processing Systems] Number of Jobs Running","[Earth Sciences] Number of Jobs Running","[Polar Programs] Number of Jobs Running","[Astronomical Sciences] Number of Jobs Running","[Design and Manufacturing Systems] Number of Jobs Running","[Environmental Biology] Number of Jobs Running","[Electrical and Communication Systems] Number of Jobs Running","[Materials Research] Number of Jobs Running","[Molecular Biosciences] Number of Jobs Running","[Mechanical and Structural Systems] Number of Jobs Running","[Arts] Number of Jobs Running","[Mathematical Sciences] Number of Jobs Running","[Computer and Computation Research] Number of Jobs Running","[Chemical, Thermal Systems] Number of Jobs Running","[Physics] Number of Jobs Running","[Atmospheric Sciences] Number of Jobs Running" +2016,44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +2017,13956,410,986,3,814,11,103,139,28,0,34,28,5,48,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Day-reference.csv index 8929ec42dd..ca5c703bec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Started" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Month-reference.csv index 8929ec42dd..ca5c703bec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Started" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Quarter-reference.csv index 8929ec42dd..ca5c703bec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Started" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Year-reference.csv index 8929ec42dd..ca5c703bec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Started" -Unknown,71313 +"Social and Economic Science",57704 +Chemistry,6969 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",912 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",239 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",2 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Day-reference.csv index deb81443cd..a9b4876b7f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Started" -2016-12-22,2 -2016-12-23,1 -2016-12-24,0 -2016-12-25,3 -2016-12-26,5 -2016-12-27,31 -2016-12-28,408 -2016-12-29,1290 -2016-12-30,27115 -2016-12-31,27354 -2017-01-01,15104 +Day,"[Social and Economic Science] Number of Jobs Started","[Chemistry] Number of Jobs Started","[Microelectronic Information Processing Systems] Number of Jobs Started","[Earth Sciences] Number of Jobs Started","[Polar Programs] Number of Jobs Started","[Astronomical Sciences] Number of Jobs Started","[Design and Manufacturing Systems] Number of Jobs Started","[Environmental Biology] Number of Jobs Started","[Electrical and Communication Systems] Number of Jobs Started","[Materials Research] Number of Jobs Started","[Molecular Biosciences] Number of Jobs Started","[Mechanical and Structural Systems] Number of Jobs Started","[Arts] Number of Jobs Started","[Mathematical Sciences] Number of Jobs Started","[Computer and Computation Research] Number of Jobs Started","[Chemical, Thermal Systems] Number of Jobs Started","[Physics] Number of Jobs Started","[Atmospheric Sciences] Number of Jobs Started" +2016-12-22,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0 +2016-12-27,1,10,0,0,0,6,0,0,3,3,7,0,0,1,0,0,0,0 +2016-12-28,0,15,195,1,0,1,147,0,12,9,5,0,0,20,0,0,3,0 +2016-12-29,256,34,781,1,1,20,88,0,12,20,52,4,11,4,5,0,0,1 +2016-12-30,20777,3809,684,736,69,723,17,90,13,71,20,32,54,2,15,3,0,0 +2016-12-31,23206,2708,795,288,40,36,46,10,105,50,8,28,1,33,0,0,0,0 +2017-01-01,13464,389,212,3,802,6,19,139,16,0,25,28,0,0,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Month-reference.csv index 70697a173f..e959079f36 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Started" -2016-12,56209 -2017-01,15104 +Month,"[Social and Economic Science] Number of Jobs Started","[Chemistry] Number of Jobs Started","[Microelectronic Information Processing Systems] Number of Jobs Started","[Earth Sciences] Number of Jobs Started","[Polar Programs] Number of Jobs Started","[Astronomical Sciences] Number of Jobs Started","[Design and Manufacturing Systems] Number of Jobs Started","[Environmental Biology] Number of Jobs Started","[Electrical and Communication Systems] Number of Jobs Started","[Materials Research] Number of Jobs Started","[Molecular Biosciences] Number of Jobs Started","[Mechanical and Structural Systems] Number of Jobs Started","[Arts] Number of Jobs Started","[Mathematical Sciences] Number of Jobs Started","[Computer and Computation Research] Number of Jobs Started","[Chemical, Thermal Systems] Number of Jobs Started","[Physics] Number of Jobs Started","[Atmospheric Sciences] Number of Jobs Started" +2016-12,44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +2017-01,13464,389,212,3,802,6,19,139,16,0,25,28,0,0,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Quarter-reference.csv index 6f930dcece..8fb4ca50f5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Started" -"2016 Q4",56209 -"2017 Q1",15104 +Quarter,"[Social and Economic Science] Number of Jobs Started","[Chemistry] Number of Jobs Started","[Microelectronic Information Processing Systems] Number of Jobs Started","[Earth Sciences] Number of Jobs Started","[Polar Programs] Number of Jobs Started","[Astronomical Sciences] Number of Jobs Started","[Design and Manufacturing Systems] Number of Jobs Started","[Environmental Biology] Number of Jobs Started","[Electrical and Communication Systems] Number of Jobs Started","[Materials Research] Number of Jobs Started","[Molecular Biosciences] Number of Jobs Started","[Mechanical and Structural Systems] Number of Jobs Started","[Arts] Number of Jobs Started","[Mathematical Sciences] Number of Jobs Started","[Computer and Computation Research] Number of Jobs Started","[Chemical, Thermal Systems] Number of Jobs Started","[Physics] Number of Jobs Started","[Atmospheric Sciences] Number of Jobs Started" +"2016 Q4",44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +"2017 Q1",13464,389,212,3,802,6,19,139,16,0,25,28,0,0,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Year-reference.csv index 6839ed4c2c..ce14d4f8a5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/started_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Started" -2016,56209 -2017,15104 +Year,"[Social and Economic Science] Number of Jobs Started","[Chemistry] Number of Jobs Started","[Microelectronic Information Processing Systems] Number of Jobs Started","[Earth Sciences] Number of Jobs Started","[Polar Programs] Number of Jobs Started","[Astronomical Sciences] Number of Jobs Started","[Design and Manufacturing Systems] Number of Jobs Started","[Environmental Biology] Number of Jobs Started","[Electrical and Communication Systems] Number of Jobs Started","[Materials Research] Number of Jobs Started","[Molecular Biosciences] Number of Jobs Started","[Mechanical and Structural Systems] Number of Jobs Started","[Arts] Number of Jobs Started","[Mathematical Sciences] Number of Jobs Started","[Computer and Computation Research] Number of Jobs Started","[Chemical, Thermal Systems] Number of Jobs Started","[Physics] Number of Jobs Started","[Atmospheric Sciences] Number of Jobs Started" +2016,44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +2017,13464,389,212,3,802,6,19,139,16,0,25,28,0,0,0,0,0,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Day-reference.csv index a41e9b4624..eca476acb0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Submitted" -Unknown,64416 +"Social and Economic Science",52367 +Chemistry,6952 +"Microelectronic Information Processing Systems",2624 +"Polar Programs",848 +"Earth Sciences",748 +"Design and Manufacturing Systems",317 +"Environmental Biology",123 +"Molecular Biosciences",100 +"Mechanical and Structural Systems",92 +"Astronomical Sciences",71 +"Mathematical Sciences",61 +"Electrical and Communication Systems",39 +Arts,31 +"Computer and Computation Research",20 +"Materials Research",20 +Physics,3 +"Atmospheric Sciences",0 +"Chemical, Thermal Systems",0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Month-reference.csv index 3a550146dc..c45f45bf15 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Submitted" -Unknown,69243 +"Social and Economic Science",55774 +Chemistry,6968 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",849 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",164 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Quarter-reference.csv index 3a550146dc..c45f45bf15 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Submitted" -Unknown,69243 +"Social and Economic Science",55774 +Chemistry,6968 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",849 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",164 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Year-reference.csv index 3a550146dc..c45f45bf15 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Number of Jobs Submitted" -Unknown,69243 +"Social and Economic Science",55774 +Chemistry,6968 +"Microelectronic Information Processing Systems",2667 +"Earth Sciences",1029 +"Polar Programs",849 +"Astronomical Sciences",793 +"Design and Manufacturing Systems",317 +"Environmental Biology",164 +"Electrical and Communication Systems",161 +"Materials Research",153 +"Molecular Biosciences",118 +"Mechanical and Structural Systems",92 +Arts,66 +"Mathematical Sciences",65 +"Computer and Computation Research",20 +"Chemical, Thermal Systems",3 +Physics,3 +"Atmospheric Sciences",1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Day-reference.csv index 675a43f3c6..600a9c5507 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Number of Jobs Submitted" -2016-12-22,1 -2016-12-23,1 -2016-12-24,0 -2016-12-25,1 -2016-12-26,5 -2016-12-27,18 -2016-12-28,379 -2016-12-29,1206 -2016-12-30,25660 -2016-12-31,24111 -2017-01-01,13034 +Day,"[Social and Economic Science] Number of Jobs Submitted","[Chemistry] Number of Jobs Submitted","[Microelectronic Information Processing Systems] Number of Jobs Submitted","[Polar Programs] Number of Jobs Submitted","[Earth Sciences] Number of Jobs Submitted","[Design and Manufacturing Systems] Number of Jobs Submitted","[Environmental Biology] Number of Jobs Submitted","[Molecular Biosciences] Number of Jobs Submitted","[Mechanical and Structural Systems] Number of Jobs Submitted","[Astronomical Sciences] Number of Jobs Submitted","[Mathematical Sciences] Number of Jobs Submitted","[Electrical and Communication Systems] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Computer and Computation Research] Number of Jobs Submitted","[Materials Research] Number of Jobs Submitted","[Physics] Number of Jobs Submitted","[Atmospheric Sciences] Number of Jobs Submitted","[Chemical, Thermal Systems] Number of Jobs Submitted" +2016-12-22,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-25,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0 +2016-12-27,1,10,0,0,0,0,0,1,0,5,1,0,0,0,0,0,0,0 +2016-12-28,0,13,195,0,1,147,0,0,0,0,20,0,0,0,0,3,0,0 +2016-12-29,206,32,781,1,1,88,0,50,4,5,0,5,11,5,17,0,0,0 +2016-12-30,20182,3805,684,68,736,17,50,19,32,20,2,10,19,15,1,0,0,0 +2016-12-31,20444,2703,752,40,7,46,9,4,28,34,33,8,1,0,2,0,0,0 +2017-01-01,11534,388,212,739,3,19,64,25,28,6,0,16,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Month-reference.csv index 91bbece69e..506d5d7680 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Number of Jobs Submitted" -2016-12,56209 -2017-01,13034 +Month,"[Social and Economic Science] Number of Jobs Submitted","[Chemistry] Number of Jobs Submitted","[Microelectronic Information Processing Systems] Number of Jobs Submitted","[Earth Sciences] Number of Jobs Submitted","[Polar Programs] Number of Jobs Submitted","[Astronomical Sciences] Number of Jobs Submitted","[Design and Manufacturing Systems] Number of Jobs Submitted","[Environmental Biology] Number of Jobs Submitted","[Electrical and Communication Systems] Number of Jobs Submitted","[Materials Research] Number of Jobs Submitted","[Molecular Biosciences] Number of Jobs Submitted","[Mechanical and Structural Systems] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Mathematical Sciences] Number of Jobs Submitted","[Computer and Computation Research] Number of Jobs Submitted","[Chemical, Thermal Systems] Number of Jobs Submitted","[Physics] Number of Jobs Submitted","[Atmospheric Sciences] Number of Jobs Submitted" +2016-12,44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +2017-01,11534,388,212,3,739,6,19,64,16,0,25,28,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Quarter-reference.csv index 99ad997e88..d6fb52911d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Number of Jobs Submitted" -"2016 Q4",56209 -"2017 Q1",13034 +Quarter,"[Social and Economic Science] Number of Jobs Submitted","[Chemistry] Number of Jobs Submitted","[Microelectronic Information Processing Systems] Number of Jobs Submitted","[Earth Sciences] Number of Jobs Submitted","[Polar Programs] Number of Jobs Submitted","[Astronomical Sciences] Number of Jobs Submitted","[Design and Manufacturing Systems] Number of Jobs Submitted","[Environmental Biology] Number of Jobs Submitted","[Electrical and Communication Systems] Number of Jobs Submitted","[Materials Research] Number of Jobs Submitted","[Molecular Biosciences] Number of Jobs Submitted","[Mechanical and Structural Systems] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Mathematical Sciences] Number of Jobs Submitted","[Computer and Computation Research] Number of Jobs Submitted","[Chemical, Thermal Systems] Number of Jobs Submitted","[Physics] Number of Jobs Submitted","[Atmospheric Sciences] Number of Jobs Submitted" +"2016 Q4",44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +"2017 Q1",11534,388,212,3,739,6,19,64,16,0,25,28,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Year-reference.csv index 324b9bca42..0b28e486e3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/submitted_job_count/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Number of Jobs Submitted" -2016,56209 -2017,13034 +Year,"[Social and Economic Science] Number of Jobs Submitted","[Chemistry] Number of Jobs Submitted","[Microelectronic Information Processing Systems] Number of Jobs Submitted","[Earth Sciences] Number of Jobs Submitted","[Polar Programs] Number of Jobs Submitted","[Astronomical Sciences] Number of Jobs Submitted","[Design and Manufacturing Systems] Number of Jobs Submitted","[Environmental Biology] Number of Jobs Submitted","[Electrical and Communication Systems] Number of Jobs Submitted","[Materials Research] Number of Jobs Submitted","[Molecular Biosciences] Number of Jobs Submitted","[Mechanical and Structural Systems] Number of Jobs Submitted","[Arts] Number of Jobs Submitted","[Mathematical Sciences] Number of Jobs Submitted","[Computer and Computation Research] Number of Jobs Submitted","[Chemical, Thermal Systems] Number of Jobs Submitted","[Physics] Number of Jobs Submitted","[Atmospheric Sciences] Number of Jobs Submitted" +2016,44240,6580,2455,1026,110,787,298,100,145,153,93,64,66,65,20,3,3,1 +2017,11534,388,212,3,739,6,19,64,16,0,25,28,0,0,0,0,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Day-reference.csv index 46831917e9..f16a9d0ae9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"CPU Hours: Total" -Unknown,840555.8369 +Chemistry,188505.5578 +"Electrical and Communication Systems",168887.4169 +"Social and Economic Science",163292.7964 +"Microelectronic Information Processing Systems",74399.4261 +"Materials Research",51837.5633 +"Mathematical Sciences",40095.7789 +"Astronomical Sciences",35860.4519 +"Polar Programs",21267.5019 +"Design and Manufacturing Systems",20616.3914 +"Molecular Biosciences",20608.9078 +"Mechanical and Structural Systems",14222.7461 +"Chemical, Thermal Systems",13105.9733 +Arts,12416.7611 +"Earth Sciences",10786.1722 +Physics,1588.9133 +"Environmental Biology",1518.1478 +"Atmospheric Sciences",1444.4889 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Month-reference.csv index 46831917e9..f16a9d0ae9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"CPU Hours: Total" -Unknown,840555.8369 +Chemistry,188505.5578 +"Electrical and Communication Systems",168887.4169 +"Social and Economic Science",163292.7964 +"Microelectronic Information Processing Systems",74399.4261 +"Materials Research",51837.5633 +"Mathematical Sciences",40095.7789 +"Astronomical Sciences",35860.4519 +"Polar Programs",21267.5019 +"Design and Manufacturing Systems",20616.3914 +"Molecular Biosciences",20608.9078 +"Mechanical and Structural Systems",14222.7461 +"Chemical, Thermal Systems",13105.9733 +Arts,12416.7611 +"Earth Sciences",10786.1722 +Physics,1588.9133 +"Environmental Biology",1518.1478 +"Atmospheric Sciences",1444.4889 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Quarter-reference.csv index 46831917e9..f16a9d0ae9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"CPU Hours: Total" -Unknown,840555.8369 +Chemistry,188505.5578 +"Electrical and Communication Systems",168887.4169 +"Social and Economic Science",163292.7964 +"Microelectronic Information Processing Systems",74399.4261 +"Materials Research",51837.5633 +"Mathematical Sciences",40095.7789 +"Astronomical Sciences",35860.4519 +"Polar Programs",21267.5019 +"Design and Manufacturing Systems",20616.3914 +"Molecular Biosciences",20608.9078 +"Mechanical and Structural Systems",14222.7461 +"Chemical, Thermal Systems",13105.9733 +Arts,12416.7611 +"Earth Sciences",10786.1722 +Physics,1588.9133 +"Environmental Biology",1518.1478 +"Atmospheric Sciences",1444.4889 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Year-reference.csv index 46831917e9..f16a9d0ae9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"CPU Hours: Total" -Unknown,840555.8369 +Chemistry,188505.5578 +"Electrical and Communication Systems",168887.4169 +"Social and Economic Science",163292.7964 +"Microelectronic Information Processing Systems",74399.4261 +"Materials Research",51837.5633 +"Mathematical Sciences",40095.7789 +"Astronomical Sciences",35860.4519 +"Polar Programs",21267.5019 +"Design and Manufacturing Systems",20616.3914 +"Molecular Biosciences",20608.9078 +"Mechanical and Structural Systems",14222.7461 +"Chemical, Thermal Systems",13105.9733 +Arts,12416.7611 +"Earth Sciences",10786.1722 +Physics,1588.9133 +"Environmental Biology",1518.1478 +"Atmospheric Sciences",1444.4889 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Day-reference.csv index 125f61df4f..7fa78d72f7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] CPU Hours: Total" -2016-12-22,404.2567 -2016-12-23,584.6036 -2016-12-24,600.0000 -2016-12-25,778.2700 -2016-12-26,2256.3333 -2016-12-27,15553.1447 -2016-12-28,81988.7103 -2016-12-29,171261.7833 -2016-12-30,275119.2672 -2016-12-31,222229.6297 -2017-01-01,69779.8381 +Day,"[Chemistry] CPU Hours: Total","[Electrical and Communication Systems] CPU Hours: Total","[Social and Economic Science] CPU Hours: Total","[Microelectronic Information Processing Systems] CPU Hours: Total","[Materials Research] CPU Hours: Total","[Mathematical Sciences] CPU Hours: Total","[Astronomical Sciences] CPU Hours: Total","[Polar Programs] CPU Hours: Total","[Design and Manufacturing Systems] CPU Hours: Total","[Molecular Biosciences] CPU Hours: Total","[Mechanical and Structural Systems] CPU Hours: Total","[Chemical, Thermal Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Earth Sciences] CPU Hours: Total","[Physics] CPU Hours: Total","[Environmental Biology] CPU Hours: Total","[Atmospheric Sciences] CPU Hours: Total","[Computer and Computation Research] CPU Hours: Total" +2016-12-22,203.3000,0,0,0,0,0,0,0,0,200.9567,0,0,0,0,0,0,0,0 +2016-12-23,288.0000,0,0,0,0,0,8.6036,0,0,288.0000,0,0,0,0,0,0,0,0 +2016-12-24,288.0000,0,0,0,0,0,24.0000,0,0,288.0000,0,0,0,0,0,0,0,0 +2016-12-25,466.2700,0,0,0,0,0,24.0000,0,0,288.0000,0,0,0,0,0,0,0,0 +2016-12-26,1728.0000,0,0,0,0,216.3333,24.0000,0,0,288.0000,0,0,0,0,0,0,0,0 +2016-12-27,2293.7600,3739.4133,3.2167,0,4298.8089,1924.7214,1964.5622,0,0,1328.6622,0,0,0,0,0,0,0,0 +2016-12-28,39422.3022,21931.9200,24.0000,1304.6303,6587.9644,2671.1944,4285.3467,0,1962.8444,3523.0667,0,0,0,94.0111,181.4300,0,0,0 +2016-12-29,55290.2700,51398.0422,1901.3108,13933.2064,17862.8422,10260.0844,7035.1161,758.9889,3901.6422,4315.9531,1643.9111,0,516.0911,532.0042,864.0000,0,1038.2222,10.0983 +2016-12-30,56377.7367,53688.2303,63888.1919,24424.9989,18930.7533,7995.6400,10377.4728,1068.1136,5473.3125,4131.6792,9238.5464,7404.4267,6971.0514,3598.5506,543.4833,522.1678,402.8000,82.1119 +2016-12-31,25351.0100,30521.7450,88804.5933,22589.8486,4157.1944,12068.8131,8561.7150,358.6408,6235.8008,3273.0428,3313.1372,5701.5467,4629.6697,6528.7675,0,125.4733,0,8.6314 +2017-01-01,6796.9089,7608.0661,8671.4836,12146.7419,0,4958.9922,3555.6356,19081.7586,3042.7914,2683.5472,27.1514,0,299.9489,32.8389,0,870.5067,3.4667,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Month-reference.csv index 938ffe7f27..518e3f5047 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] CPU Hours: Total" -2016-12,770775.9989 -2017-01,69779.8381 +Month,"[Chemistry] CPU Hours: Total","[Electrical and Communication Systems] CPU Hours: Total","[Social and Economic Science] CPU Hours: Total","[Microelectronic Information Processing Systems] CPU Hours: Total","[Materials Research] CPU Hours: Total","[Mathematical Sciences] CPU Hours: Total","[Astronomical Sciences] CPU Hours: Total","[Polar Programs] CPU Hours: Total","[Design and Manufacturing Systems] CPU Hours: Total","[Molecular Biosciences] CPU Hours: Total","[Mechanical and Structural Systems] CPU Hours: Total","[Chemical, Thermal Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Earth Sciences] CPU Hours: Total","[Physics] CPU Hours: Total","[Environmental Biology] CPU Hours: Total","[Atmospheric Sciences] CPU Hours: Total","[Computer and Computation Research] CPU Hours: Total" +2016-12,181708.6489,161279.3508,154621.3128,62252.6842,51837.5633,35136.7867,32304.8164,2185.7433,17573.6000,17925.3606,14195.5947,13105.9733,12116.8122,10753.3333,1588.9133,647.6411,1441.0222,100.8417 +2017-01,6796.9089,7608.0661,8671.4836,12146.7419,0,4958.9922,3555.6356,19081.7586,3042.7914,2683.5472,27.1514,0,299.9489,32.8389,0,870.5067,3.4667,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Quarter-reference.csv index 5a3e4b79bd..15269c15e3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] CPU Hours: Total" -"2016 Q4",770775.9989 -"2017 Q1",69779.8381 +Quarter,"[Chemistry] CPU Hours: Total","[Electrical and Communication Systems] CPU Hours: Total","[Social and Economic Science] CPU Hours: Total","[Microelectronic Information Processing Systems] CPU Hours: Total","[Materials Research] CPU Hours: Total","[Mathematical Sciences] CPU Hours: Total","[Astronomical Sciences] CPU Hours: Total","[Polar Programs] CPU Hours: Total","[Design and Manufacturing Systems] CPU Hours: Total","[Molecular Biosciences] CPU Hours: Total","[Mechanical and Structural Systems] CPU Hours: Total","[Chemical, Thermal Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Earth Sciences] CPU Hours: Total","[Physics] CPU Hours: Total","[Environmental Biology] CPU Hours: Total","[Atmospheric Sciences] CPU Hours: Total","[Computer and Computation Research] CPU Hours: Total" +"2016 Q4",181708.6489,161279.3508,154621.3128,62252.6842,51837.5633,35136.7867,32304.8164,2185.7433,17573.6000,17925.3606,14195.5947,13105.9733,12116.8122,10753.3333,1588.9133,647.6411,1441.0222,100.8417 +"2017 Q1",6796.9089,7608.0661,8671.4836,12146.7419,0,4958.9922,3555.6356,19081.7586,3042.7914,2683.5472,27.1514,0,299.9489,32.8389,0,870.5067,3.4667,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Year-reference.csv index 13bc757211..a900372bd6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_cpu_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] CPU Hours: Total" -2016,770775.9989 -2017,69779.8381 +Year,"[Chemistry] CPU Hours: Total","[Electrical and Communication Systems] CPU Hours: Total","[Social and Economic Science] CPU Hours: Total","[Microelectronic Information Processing Systems] CPU Hours: Total","[Materials Research] CPU Hours: Total","[Mathematical Sciences] CPU Hours: Total","[Astronomical Sciences] CPU Hours: Total","[Polar Programs] CPU Hours: Total","[Design and Manufacturing Systems] CPU Hours: Total","[Molecular Biosciences] CPU Hours: Total","[Mechanical and Structural Systems] CPU Hours: Total","[Chemical, Thermal Systems] CPU Hours: Total","[Arts] CPU Hours: Total","[Earth Sciences] CPU Hours: Total","[Physics] CPU Hours: Total","[Environmental Biology] CPU Hours: Total","[Atmospheric Sciences] CPU Hours: Total","[Computer and Computation Research] CPU Hours: Total" +2016,181708.6489,161279.3508,154621.3128,62252.6842,51837.5633,35136.7867,32304.8164,2185.7433,17573.6000,17925.3606,14195.5947,13105.9733,12116.8122,10753.3333,1588.9133,647.6411,1441.0222,100.8417 +2017,6796.9089,7608.0661,8671.4836,12146.7419,0,4958.9922,3555.6356,19081.7586,3042.7914,2683.5472,27.1514,0,299.9489,32.8389,0,870.5067,3.4667,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Day-reference.csv index 86216f14aa..8cc26509db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Node Hours: Total" -Unknown,156303.7475 +"Microelectronic Information Processing Systems",67903.0519 +"Social and Economic Science",16956.7717 +"Design and Manufacturing Systems",15812.9842 +"Electrical and Communication Systems",14769.1036 +Chemistry,12905.5581 +"Earth Sciences",8764.5286 +"Materials Research",3900.2250 +"Astronomical Sciences",3409.0411 +"Mathematical Sciences",3278.7342 +"Molecular Biosciences",3012.1539 +"Polar Programs",1829.6058 +Arts,1140.0328 +"Chemical, Thermal Systems",1092.1644 +"Mechanical and Structural Systems",965.4461 +"Atmospheric Sciences",180.5611 +"Environmental Biology",150.5339 +Physics,132.4094 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Month-reference.csv index 86216f14aa..8cc26509db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Node Hours: Total" -Unknown,156303.7475 +"Microelectronic Information Processing Systems",67903.0519 +"Social and Economic Science",16956.7717 +"Design and Manufacturing Systems",15812.9842 +"Electrical and Communication Systems",14769.1036 +Chemistry,12905.5581 +"Earth Sciences",8764.5286 +"Materials Research",3900.2250 +"Astronomical Sciences",3409.0411 +"Mathematical Sciences",3278.7342 +"Molecular Biosciences",3012.1539 +"Polar Programs",1829.6058 +Arts,1140.0328 +"Chemical, Thermal Systems",1092.1644 +"Mechanical and Structural Systems",965.4461 +"Atmospheric Sciences",180.5611 +"Environmental Biology",150.5339 +Physics,132.4094 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Quarter-reference.csv index 86216f14aa..8cc26509db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Node Hours: Total" -Unknown,156303.7475 +"Microelectronic Information Processing Systems",67903.0519 +"Social and Economic Science",16956.7717 +"Design and Manufacturing Systems",15812.9842 +"Electrical and Communication Systems",14769.1036 +Chemistry,12905.5581 +"Earth Sciences",8764.5286 +"Materials Research",3900.2250 +"Astronomical Sciences",3409.0411 +"Mathematical Sciences",3278.7342 +"Molecular Biosciences",3012.1539 +"Polar Programs",1829.6058 +Arts,1140.0328 +"Chemical, Thermal Systems",1092.1644 +"Mechanical and Structural Systems",965.4461 +"Atmospheric Sciences",180.5611 +"Environmental Biology",150.5339 +Physics,132.4094 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Year-reference.csv index 86216f14aa..8cc26509db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Node Hours: Total" -Unknown,156303.7475 +"Microelectronic Information Processing Systems",67903.0519 +"Social and Economic Science",16956.7717 +"Design and Manufacturing Systems",15812.9842 +"Electrical and Communication Systems",14769.1036 +Chemistry,12905.5581 +"Earth Sciences",8764.5286 +"Materials Research",3900.2250 +"Astronomical Sciences",3409.0411 +"Mathematical Sciences",3278.7342 +"Molecular Biosciences",3012.1539 +"Polar Programs",1829.6058 +Arts,1140.0328 +"Chemical, Thermal Systems",1092.1644 +"Mechanical and Structural Systems",965.4461 +"Atmospheric Sciences",180.5611 +"Environmental Biology",150.5339 +Physics,132.4094 +"Computer and Computation Research",100.8417 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Day-reference.csv index 3b10be7759..b2166ddadf 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Node Hours: Total" -2016-12-22,33.6881 -2016-12-23,56.6036 -2016-12-24,72.0000 -2016-12-25,80.5078 -2016-12-26,157.5208 -2016-12-27,1206.3922 -2016-12-28,8614.6167 -2016-12-29,28528.4969 -2016-12-30,52308.5600 -2016-12-31,47388.7967 -2017-01-01,17856.5647 +Day,"[Microelectronic Information Processing Systems] Node Hours: Total","[Social and Economic Science] Node Hours: Total","[Design and Manufacturing Systems] Node Hours: Total","[Electrical and Communication Systems] Node Hours: Total","[Chemistry] Node Hours: Total","[Earth Sciences] Node Hours: Total","[Materials Research] Node Hours: Total","[Astronomical Sciences] Node Hours: Total","[Mathematical Sciences] Node Hours: Total","[Molecular Biosciences] Node Hours: Total","[Polar Programs] Node Hours: Total","[Arts] Node Hours: Total","[Chemical, Thermal Systems] Node Hours: Total","[Mechanical and Structural Systems] Node Hours: Total","[Atmospheric Sciences] Node Hours: Total","[Environmental Biology] Node Hours: Total","[Physics] Node Hours: Total","[Computer and Computation Research] Node Hours: Total" +2016-12-22,0,0,0,0,16.9417,0,0,0,0,16.7464,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,24.0000,0,0,8.6036,0,24.0000,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,24.0000,0,0,24.0000,0,24.0000,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,32.5078,0,0,24.0000,0,24.0000,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,96.0000,0,0,24.0000,13.5208,24.0000,0,0,0,0,0,0,0,0 +2016-12-27,0,3.2167,0,311.6178,115.3094,0,331.1156,176.2814,124.7214,144.1300,0,0,0,0,0,0,0,0 +2016-12-28,996.9861,24.0000,1962.8444,1827.6600,2303.1100,4.7006,502.6856,364.6683,196.4592,416.3833,0,0,0,0,0,0,15.1192,0 +2016-12-29,12752.0031,328.7961,3901.6422,4306.5756,3405.4136,34.4008,1333.3297,628.8497,717.7553,719.3708,37.9494,47.7900,0,102.7444,129.7778,0,72.0000,10.0983 +2016-12-30,22090.4917,6961.6367,5473.3125,4527.5222,3909.1153,3097.4789,1436.3486,1130.3533,557.8294,889.9586,156.1053,629.4331,617.0356,602.9381,50.3500,51.2486,45.2903,82.1119 +2016-12-31,20759.5203,8689.9142,3060.8175,3155.4297,2322.6839,5622.7144,296.7456,739.6997,1136.6033,403.8781,43.8078,430.1536,475.1289,232.6122,0,10.4561,0,8.6314 +2017-01-01,11304.0508,949.2081,1414.3675,640.2983,656.4764,5.2339,0,288.5850,531.8447,325.6867,1591.7433,32.6561,0,27.1514,0.4333,88.8292,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Month-reference.csv index 8f08ba20e1..3049a2e72f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Node Hours: Total" -2016-12,138447.1828 -2017-01,17856.5647 +Month,"[Microelectronic Information Processing Systems] Node Hours: Total","[Social and Economic Science] Node Hours: Total","[Design and Manufacturing Systems] Node Hours: Total","[Electrical and Communication Systems] Node Hours: Total","[Chemistry] Node Hours: Total","[Earth Sciences] Node Hours: Total","[Materials Research] Node Hours: Total","[Astronomical Sciences] Node Hours: Total","[Mathematical Sciences] Node Hours: Total","[Molecular Biosciences] Node Hours: Total","[Polar Programs] Node Hours: Total","[Arts] Node Hours: Total","[Chemical, Thermal Systems] Node Hours: Total","[Mechanical and Structural Systems] Node Hours: Total","[Atmospheric Sciences] Node Hours: Total","[Environmental Biology] Node Hours: Total","[Physics] Node Hours: Total","[Computer and Computation Research] Node Hours: Total" +2016-12,56599.0011,16007.5636,14398.6167,14128.8053,12249.0817,8759.2947,3900.2250,3120.4561,2746.8894,2686.4672,237.8625,1107.3767,1092.1644,938.2947,180.1278,61.7047,132.4094,100.8417 +2017-01,11304.0508,949.2081,1414.3675,640.2983,656.4764,5.2339,0,288.5850,531.8447,325.6867,1591.7433,32.6561,0,27.1514,0.4333,88.8292,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Quarter-reference.csv index d71bcb7a6f..9bc3a88835 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Node Hours: Total" -"2016 Q4",138447.1828 -"2017 Q1",17856.5647 +Quarter,"[Microelectronic Information Processing Systems] Node Hours: Total","[Social and Economic Science] Node Hours: Total","[Design and Manufacturing Systems] Node Hours: Total","[Electrical and Communication Systems] Node Hours: Total","[Chemistry] Node Hours: Total","[Earth Sciences] Node Hours: Total","[Materials Research] Node Hours: Total","[Astronomical Sciences] Node Hours: Total","[Mathematical Sciences] Node Hours: Total","[Molecular Biosciences] Node Hours: Total","[Polar Programs] Node Hours: Total","[Arts] Node Hours: Total","[Chemical, Thermal Systems] Node Hours: Total","[Mechanical and Structural Systems] Node Hours: Total","[Atmospheric Sciences] Node Hours: Total","[Environmental Biology] Node Hours: Total","[Physics] Node Hours: Total","[Computer and Computation Research] Node Hours: Total" +"2016 Q4",56599.0011,16007.5636,14398.6167,14128.8053,12249.0817,8759.2947,3900.2250,3120.4561,2746.8894,2686.4672,237.8625,1107.3767,1092.1644,938.2947,180.1278,61.7047,132.4094,100.8417 +"2017 Q1",11304.0508,949.2081,1414.3675,640.2983,656.4764,5.2339,0,288.5850,531.8447,325.6867,1591.7433,32.6561,0,27.1514,0.4333,88.8292,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Year-reference.csv index 59f0dce832..5425ace7a3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_node_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Node Hours: Total" -2016,138447.1828 -2017,17856.5647 +Year,"[Microelectronic Information Processing Systems] Node Hours: Total","[Social and Economic Science] Node Hours: Total","[Design and Manufacturing Systems] Node Hours: Total","[Electrical and Communication Systems] Node Hours: Total","[Chemistry] Node Hours: Total","[Earth Sciences] Node Hours: Total","[Materials Research] Node Hours: Total","[Astronomical Sciences] Node Hours: Total","[Mathematical Sciences] Node Hours: Total","[Molecular Biosciences] Node Hours: Total","[Polar Programs] Node Hours: Total","[Arts] Node Hours: Total","[Chemical, Thermal Systems] Node Hours: Total","[Mechanical and Structural Systems] Node Hours: Total","[Atmospheric Sciences] Node Hours: Total","[Environmental Biology] Node Hours: Total","[Physics] Node Hours: Total","[Computer and Computation Research] Node Hours: Total" +2016,56599.0011,16007.5636,14398.6167,14128.8053,12249.0817,8759.2947,3900.2250,3120.4561,2746.8894,2686.4672,237.8625,1107.3767,1092.1644,938.2947,180.1278,61.7047,132.4094,100.8417 +2017,11304.0508,949.2081,1414.3675,640.2983,656.4764,5.2339,0,288.5850,531.8447,325.6867,1591.7433,32.6561,0,27.1514,0.4333,88.8292,0,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Day-reference.csv index b7395ddf2a..5954f2b27c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Total" -Unknown,306345.3608 +"Astronomical Sciences",163661.6308 +"Social and Economic Science",114914.2053 +"Molecular Biosciences",5260.9664 +"Materials Research",5142.3756 +"Electrical and Communication Systems",4694.7817 +"Polar Programs",4174.1489 +"Earth Sciences",3927.8758 +"Environmental Biology",3030.4719 +"Microelectronic Information Processing Systems",552.4364 +Chemistry,443.1639 +Arts,321.4447 +"Mathematical Sciences",85.0647 +"Atmospheric Sciences",62.0436 +"Design and Manufacturing Systems",37.0503 +"Chemical, Thermal Systems",20.0331 +Physics,11.1744 +"Computer and Computation Research",6.4781 +"Mechanical and Structural Systems",0.0153 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Month-reference.csv index b7395ddf2a..5954f2b27c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Total" -Unknown,306345.3608 +"Astronomical Sciences",163661.6308 +"Social and Economic Science",114914.2053 +"Molecular Biosciences",5260.9664 +"Materials Research",5142.3756 +"Electrical and Communication Systems",4694.7817 +"Polar Programs",4174.1489 +"Earth Sciences",3927.8758 +"Environmental Biology",3030.4719 +"Microelectronic Information Processing Systems",552.4364 +Chemistry,443.1639 +Arts,321.4447 +"Mathematical Sciences",85.0647 +"Atmospheric Sciences",62.0436 +"Design and Manufacturing Systems",37.0503 +"Chemical, Thermal Systems",20.0331 +Physics,11.1744 +"Computer and Computation Research",6.4781 +"Mechanical and Structural Systems",0.0153 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Quarter-reference.csv index b7395ddf2a..5954f2b27c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Total" -Unknown,306345.3608 +"Astronomical Sciences",163661.6308 +"Social and Economic Science",114914.2053 +"Molecular Biosciences",5260.9664 +"Materials Research",5142.3756 +"Electrical and Communication Systems",4694.7817 +"Polar Programs",4174.1489 +"Earth Sciences",3927.8758 +"Environmental Biology",3030.4719 +"Microelectronic Information Processing Systems",552.4364 +Chemistry,443.1639 +Arts,321.4447 +"Mathematical Sciences",85.0647 +"Atmospheric Sciences",62.0436 +"Design and Manufacturing Systems",37.0503 +"Chemical, Thermal Systems",20.0331 +Physics,11.1744 +"Computer and Computation Research",6.4781 +"Mechanical and Structural Systems",0.0153 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Year-reference.csv index b7395ddf2a..5954f2b27c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wait Hours: Total" -Unknown,306345.3608 +"Astronomical Sciences",163661.6308 +"Social and Economic Science",114914.2053 +"Molecular Biosciences",5260.9664 +"Materials Research",5142.3756 +"Electrical and Communication Systems",4694.7817 +"Polar Programs",4174.1489 +"Earth Sciences",3927.8758 +"Environmental Biology",3030.4719 +"Microelectronic Information Processing Systems",552.4364 +Chemistry,443.1639 +Arts,321.4447 +"Mathematical Sciences",85.0647 +"Atmospheric Sciences",62.0436 +"Design and Manufacturing Systems",37.0503 +"Chemical, Thermal Systems",20.0331 +Physics,11.1744 +"Computer and Computation Research",6.4781 +"Mechanical and Structural Systems",0.0153 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Day-reference.csv index 54e53d35fd..fe78a0613d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wait Hours: Total" -2016-12-22,9.3325 -2016-12-23,9.5964 -2016-12-24,0.0000 -2016-12-25,110.8856 -2016-12-26,0.0033 -2016-12-27,1978.2519 -2016-12-28,3598.3319 -2016-12-29,6101.8714 -2016-12-30,195282.2372 -2016-12-31,73421.2575 -2017-01-01,25833.5931 +Day,"[Astronomical Sciences] Wait Hours: Total","[Social and Economic Science] Wait Hours: Total","[Molecular Biosciences] Wait Hours: Total","[Materials Research] Wait Hours: Total","[Electrical and Communication Systems] Wait Hours: Total","[Polar Programs] Wait Hours: Total","[Earth Sciences] Wait Hours: Total","[Environmental Biology] Wait Hours: Total","[Microelectronic Information Processing Systems] Wait Hours: Total","[Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Mathematical Sciences] Wait Hours: Total","[Atmospheric Sciences] Wait Hours: Total","[Design and Manufacturing Systems] Wait Hours: Total","[Chemical, Thermal Systems] Wait Hours: Total","[Physics] Wait Hours: Total","[Computer and Computation Research] Wait Hours: Total","[Mechanical and Structural Systems] Wait Hours: Total" +2016-12-22,0,0,0.0003,0,0,0,0,0,0,9.3322,0,0,0,0,0,0,0,0 +2016-12-23,9.5964,0,0.0000,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0 +2016-12-24,0.0000,0,0.0000,0,0,0,0,0,0,0.0000,0,0,0,0,0,0,0,0 +2016-12-25,0.0000,0,0.0000,0,0,0,0,0,0,110.8856,0,0,0,0,0,0,0,0 +2016-12-26,0.0000,0,0.0000,0,0,0,0,0,0,0.0000,0,0.0033,0,0,0,0,0,0 +2016-12-27,76.0889,0.0000,1418.2278,172.7719,311.1344,0,0,0,0,0.0289,0,0.0000,0,0,0,0,0,0 +2016-12-28,36.8761,0.0000,1403.6350,723.1878,1296.2100,0,0.0003,0,7.9897,42.4492,0,66.2319,0,10.5775,0,11.1744,0,0 +2016-12-29,2716.5128,1974.4419,627.0644,302.4828,344.6783,0.0017,0.0000,0,34.0669,45.4447,9.5847,17.8439,25.7286,3.9286,0,0.0000,0.0894,0.0025 +2016-12-30,160712.0214,28026.7236,403.8189,2269.2967,61.4669,117.6186,1857.8492,1170.3947,223.7064,98.0067,311.8600,0.7789,0.0000,2.2686,20.0331,0.0000,6.3886,0.0050 +2016-12-31,103.2292,65081.0511,1406.9853,1674.6364,2650.9153,0.8378,2070.0261,33.5839,279.1428,100.6989,0.0000,0.2067,0,19.9411,0.0000,0,0.0000,0.0031 +2017-01-01,7.3061,19831.9886,1.2347,0,30.3767,4055.6908,0.0003,1826.4933,7.5306,36.3178,0.0000,0.0000,36.3150,0.3344,0,0,0,0.0047 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Month-reference.csv index db56865c2e..e037730709 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wait Hours: Total" -2016-12,280511.7678 -2017-01,25833.5931 +Month,"[Astronomical Sciences] Wait Hours: Total","[Social and Economic Science] Wait Hours: Total","[Molecular Biosciences] Wait Hours: Total","[Materials Research] Wait Hours: Total","[Electrical and Communication Systems] Wait Hours: Total","[Polar Programs] Wait Hours: Total","[Earth Sciences] Wait Hours: Total","[Environmental Biology] Wait Hours: Total","[Microelectronic Information Processing Systems] Wait Hours: Total","[Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Mathematical Sciences] Wait Hours: Total","[Atmospheric Sciences] Wait Hours: Total","[Design and Manufacturing Systems] Wait Hours: Total","[Chemical, Thermal Systems] Wait Hours: Total","[Physics] Wait Hours: Total","[Computer and Computation Research] Wait Hours: Total","[Mechanical and Structural Systems] Wait Hours: Total" +2016-12,163654.3247,95082.2167,5259.7317,5142.3756,4664.4050,118.4581,3927.8756,1203.9786,544.9058,406.8461,321.4447,85.0647,25.7286,36.7158,20.0331,11.1744,6.4781,0.0106 +2017-01,7.3061,19831.9886,1.2347,0,30.3767,4055.6908,0.0003,1826.4933,7.5306,36.3178,0.0000,0.0000,36.3150,0.3344,0,0,0,0.0047 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Quarter-reference.csv index 30e6a979e4..5659a691e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wait Hours: Total" -"2016 Q4",280511.7678 -"2017 Q1",25833.5931 +Quarter,"[Astronomical Sciences] Wait Hours: Total","[Social and Economic Science] Wait Hours: Total","[Molecular Biosciences] Wait Hours: Total","[Materials Research] Wait Hours: Total","[Electrical and Communication Systems] Wait Hours: Total","[Polar Programs] Wait Hours: Total","[Earth Sciences] Wait Hours: Total","[Environmental Biology] Wait Hours: Total","[Microelectronic Information Processing Systems] Wait Hours: Total","[Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Mathematical Sciences] Wait Hours: Total","[Atmospheric Sciences] Wait Hours: Total","[Design and Manufacturing Systems] Wait Hours: Total","[Chemical, Thermal Systems] Wait Hours: Total","[Physics] Wait Hours: Total","[Computer and Computation Research] Wait Hours: Total","[Mechanical and Structural Systems] Wait Hours: Total" +"2016 Q4",163654.3247,95082.2167,5259.7317,5142.3756,4664.4050,118.4581,3927.8756,1203.9786,544.9058,406.8461,321.4447,85.0647,25.7286,36.7158,20.0331,11.1744,6.4781,0.0106 +"2017 Q1",7.3061,19831.9886,1.2347,0,30.3767,4055.6908,0.0003,1826.4933,7.5306,36.3178,0.0000,0.0000,36.3150,0.3344,0,0,0,0.0047 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Year-reference.csv index 06f63ed981..584ebc5295 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_waitduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wait Hours: Total" -2016,280511.7678 -2017,25833.5931 +Year,"[Astronomical Sciences] Wait Hours: Total","[Social and Economic Science] Wait Hours: Total","[Molecular Biosciences] Wait Hours: Total","[Materials Research] Wait Hours: Total","[Electrical and Communication Systems] Wait Hours: Total","[Polar Programs] Wait Hours: Total","[Earth Sciences] Wait Hours: Total","[Environmental Biology] Wait Hours: Total","[Microelectronic Information Processing Systems] Wait Hours: Total","[Chemistry] Wait Hours: Total","[Arts] Wait Hours: Total","[Mathematical Sciences] Wait Hours: Total","[Atmospheric Sciences] Wait Hours: Total","[Design and Manufacturing Systems] Wait Hours: Total","[Chemical, Thermal Systems] Wait Hours: Total","[Physics] Wait Hours: Total","[Computer and Computation Research] Wait Hours: Total","[Mechanical and Structural Systems] Wait Hours: Total" +2016,163654.3247,95082.2167,5259.7317,5142.3756,4664.4050,118.4581,3927.8756,1203.9786,544.9058,406.8461,321.4447,85.0647,25.7286,36.7158,20.0331,11.1744,6.4781,0.0106 +2017,7.3061,19831.9886,1.2347,0,30.3767,4055.6908,0.0003,1826.4933,7.5306,36.3178,0.0000,0.0000,36.3150,0.3344,0,0,0,0.0047 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Day-reference.csv index f2bc70711b..fe6cd4704b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Total" -Unknown,127976.8064 +"Microelectronic Information Processing Systems",67900.9675 +"Social and Economic Science",16630.3481 +"Design and Manufacturing Systems",15583.5300 +"Earth Sciences",8728.2631 +Chemistry,4490.7597 +"Mathematical Sciences",3278.7342 +"Electrical and Communication Systems",2668.5789 +"Molecular Biosciences",2171.8622 +"Polar Programs",1779.2567 +"Astronomical Sciences",1661.7608 +"Materials Research",1401.0014 +Arts,1140.0328 +"Mechanical and Structural Systems",207.8861 +Physics,132.4094 +"Computer and Computation Research",100.8417 +"Chemical, Thermal Systems",46.3125 +"Environmental Biology",45.2333 +"Atmospheric Sciences",9.0281 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Month-reference.csv index f2bc70711b..fe6cd4704b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Total" -Unknown,127976.8064 +"Microelectronic Information Processing Systems",67900.9675 +"Social and Economic Science",16630.3481 +"Design and Manufacturing Systems",15583.5300 +"Earth Sciences",8728.2631 +Chemistry,4490.7597 +"Mathematical Sciences",3278.7342 +"Electrical and Communication Systems",2668.5789 +"Molecular Biosciences",2171.8622 +"Polar Programs",1779.2567 +"Astronomical Sciences",1661.7608 +"Materials Research",1401.0014 +Arts,1140.0328 +"Mechanical and Structural Systems",207.8861 +Physics,132.4094 +"Computer and Computation Research",100.8417 +"Chemical, Thermal Systems",46.3125 +"Environmental Biology",45.2333 +"Atmospheric Sciences",9.0281 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Quarter-reference.csv index f2bc70711b..fe6cd4704b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Total" -Unknown,127976.8064 +"Microelectronic Information Processing Systems",67900.9675 +"Social and Economic Science",16630.3481 +"Design and Manufacturing Systems",15583.5300 +"Earth Sciences",8728.2631 +Chemistry,4490.7597 +"Mathematical Sciences",3278.7342 +"Electrical and Communication Systems",2668.5789 +"Molecular Biosciences",2171.8622 +"Polar Programs",1779.2567 +"Astronomical Sciences",1661.7608 +"Materials Research",1401.0014 +Arts,1140.0328 +"Mechanical and Structural Systems",207.8861 +Physics,132.4094 +"Computer and Computation Research",100.8417 +"Chemical, Thermal Systems",46.3125 +"Environmental Biology",45.2333 +"Atmospheric Sciences",9.0281 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Year-reference.csv index f2bc70711b..fe6cd4704b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Wall Hours: Total" -Unknown,127976.8064 +"Microelectronic Information Processing Systems",67900.9675 +"Social and Economic Science",16630.3481 +"Design and Manufacturing Systems",15583.5300 +"Earth Sciences",8728.2631 +Chemistry,4490.7597 +"Mathematical Sciences",3278.7342 +"Electrical and Communication Systems",2668.5789 +"Molecular Biosciences",2171.8622 +"Polar Programs",1779.2567 +"Astronomical Sciences",1661.7608 +"Materials Research",1401.0014 +Arts,1140.0328 +"Mechanical and Structural Systems",207.8861 +Physics,132.4094 +"Computer and Computation Research",100.8417 +"Chemical, Thermal Systems",46.3125 +"Environmental Biology",45.2333 +"Atmospheric Sciences",9.0281 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Day-reference.csv index 7f0864aa2c..14f0421d66 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Wall Hours: Total" -2016-12-22,33.6881 -2016-12-23,56.6036 -2016-12-24,72.0000 -2016-12-25,80.5078 -2016-12-26,157.5208 -2016-12-27,534.1833 -2016-12-28,4574.1436 -2016-12-29,20504.5094 -2016-12-30,42862.5139 -2016-12-31,42322.5450 -2017-01-01,16778.5908 +Day,"[Microelectronic Information Processing Systems] Wall Hours: Total","[Social and Economic Science] Wall Hours: Total","[Design and Manufacturing Systems] Wall Hours: Total","[Earth Sciences] Wall Hours: Total","[Chemistry] Wall Hours: Total","[Mathematical Sciences] Wall Hours: Total","[Electrical and Communication Systems] Wall Hours: Total","[Molecular Biosciences] Wall Hours: Total","[Polar Programs] Wall Hours: Total","[Astronomical Sciences] Wall Hours: Total","[Materials Research] Wall Hours: Total","[Arts] Wall Hours: Total","[Mechanical and Structural Systems] Wall Hours: Total","[Physics] Wall Hours: Total","[Computer and Computation Research] Wall Hours: Total","[Chemical, Thermal Systems] Wall Hours: Total","[Environmental Biology] Wall Hours: Total","[Atmospheric Sciences] Wall Hours: Total" +2016-12-22,0,0,0,0,16.9417,0,0,16.7464,0,0,0,0,0,0,0,0,0,0 +2016-12-23,0,0,0,0,24.0000,0,0,24.0000,0,8.6036,0,0,0,0,0,0,0,0 +2016-12-24,0,0,0,0,24.0000,0,0,24.0000,0,24.0000,0,0,0,0,0,0,0,0 +2016-12-25,0,0,0,0,32.5078,0,0,24.0000,0,24.0000,0,0,0,0,0,0,0,0 +2016-12-26,0,0,0,0,96.0000,13.5208,0,24.0000,0,24.0000,0,0,0,0,0,0,0,0 +2016-12-27,0,3.2167,0,0,115.3094,124.7214,38.9522,117.5319,0,72.9606,61.4911,0,0,0,0,0,0,0 +2016-12-28,996.9861,24.0000,1962.8444,4.7006,547.1969,196.4592,228.4575,248.3833,0,180.7781,169.2183,0,0,15.1192,0,0,0,0 +2016-12-29,12752.0031,303.7458,3901.6422,34.4008,813.4011,717.7553,560.9514,551.3708,18.9747,262.0022,437.2069,47.7900,14.6778,72.0000,10.0983,0,0,6.4889 +2016-12-30,22088.4072,6707.0317,5473.3125,3094.2667,1278.2967,557.8294,661.3600,721.9308,132.1053,690.1894,546.7922,629.4331,109.4747,45.2903,82.1119,29.3436,12.8208,2.5175 +2016-12-31,20759.5203,8652.6142,2911.3158,5589.6611,952.6464,1136.6033,1052.2525,235.6647,36.4333,295.7200,186.2928,430.1536,56.5822,0,8.6314,16.9689,1.4844,0 +2017-01-01,11304.0508,939.7397,1334.4150,5.2339,590.4597,531.8447,126.6053,184.2342,1591.7433,79.5069,0,32.6561,27.1514,0,0,0,30.9281,0.0217 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Month-reference.csv index 363c43f9e7..cc39cfb575 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Wall Hours: Total" -2016-12,111198.2156 -2017-01,16778.5908 +Month,"[Microelectronic Information Processing Systems] Wall Hours: Total","[Social and Economic Science] Wall Hours: Total","[Design and Manufacturing Systems] Wall Hours: Total","[Earth Sciences] Wall Hours: Total","[Chemistry] Wall Hours: Total","[Mathematical Sciences] Wall Hours: Total","[Electrical and Communication Systems] Wall Hours: Total","[Molecular Biosciences] Wall Hours: Total","[Polar Programs] Wall Hours: Total","[Astronomical Sciences] Wall Hours: Total","[Materials Research] Wall Hours: Total","[Arts] Wall Hours: Total","[Mechanical and Structural Systems] Wall Hours: Total","[Physics] Wall Hours: Total","[Computer and Computation Research] Wall Hours: Total","[Chemical, Thermal Systems] Wall Hours: Total","[Environmental Biology] Wall Hours: Total","[Atmospheric Sciences] Wall Hours: Total" +2016-12,56596.9167,15690.6083,14249.1150,8723.0292,3900.3000,2746.8894,2541.9736,1987.6281,187.5133,1582.2539,1401.0014,1107.3767,180.7347,132.4094,100.8417,46.3125,14.3053,9.0064 +2017-01,11304.0508,939.7397,1334.4150,5.2339,590.4597,531.8447,126.6053,184.2342,1591.7433,79.5069,0,32.6561,27.1514,0,0,0,30.9281,0.0217 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Quarter-reference.csv index 7c58faaf5c..7eb2bdca54 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Wall Hours: Total" -"2016 Q4",111198.2156 -"2017 Q1",16778.5908 +Quarter,"[Microelectronic Information Processing Systems] Wall Hours: Total","[Social and Economic Science] Wall Hours: Total","[Design and Manufacturing Systems] Wall Hours: Total","[Earth Sciences] Wall Hours: Total","[Chemistry] Wall Hours: Total","[Mathematical Sciences] Wall Hours: Total","[Electrical and Communication Systems] Wall Hours: Total","[Molecular Biosciences] Wall Hours: Total","[Polar Programs] Wall Hours: Total","[Astronomical Sciences] Wall Hours: Total","[Materials Research] Wall Hours: Total","[Arts] Wall Hours: Total","[Mechanical and Structural Systems] Wall Hours: Total","[Physics] Wall Hours: Total","[Computer and Computation Research] Wall Hours: Total","[Chemical, Thermal Systems] Wall Hours: Total","[Environmental Biology] Wall Hours: Total","[Atmospheric Sciences] Wall Hours: Total" +"2016 Q4",56596.9167,15690.6083,14249.1150,8723.0292,3900.3000,2746.8894,2541.9736,1987.6281,187.5133,1582.2539,1401.0014,1107.3767,180.7347,132.4094,100.8417,46.3125,14.3053,9.0064 +"2017 Q1",11304.0508,939.7397,1334.4150,5.2339,590.4597,531.8447,126.6053,184.2342,1591.7433,79.5069,0,32.6561,27.1514,0,0,0,30.9281,0.0217 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Year-reference.csv index 8f0f42af8f..345a66caca 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/total_wallduration_hours/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Wall Hours: Total" -2016,111198.2156 -2017,16778.5908 +Year,"[Microelectronic Information Processing Systems] Wall Hours: Total","[Social and Economic Science] Wall Hours: Total","[Design and Manufacturing Systems] Wall Hours: Total","[Earth Sciences] Wall Hours: Total","[Chemistry] Wall Hours: Total","[Mathematical Sciences] Wall Hours: Total","[Electrical and Communication Systems] Wall Hours: Total","[Molecular Biosciences] Wall Hours: Total","[Polar Programs] Wall Hours: Total","[Astronomical Sciences] Wall Hours: Total","[Materials Research] Wall Hours: Total","[Arts] Wall Hours: Total","[Mechanical and Structural Systems] Wall Hours: Total","[Physics] Wall Hours: Total","[Computer and Computation Research] Wall Hours: Total","[Chemical, Thermal Systems] Wall Hours: Total","[Environmental Biology] Wall Hours: Total","[Atmospheric Sciences] Wall Hours: Total" +2016,56596.9167,15690.6083,14249.1150,8723.0292,3900.3000,2746.8894,2541.9736,1987.6281,187.5133,1582.2539,1401.0014,1107.3767,180.7347,132.4094,100.8417,46.3125,14.3053,9.0064 +2017,11304.0508,939.7397,1334.4150,5.2339,590.4597,531.8447,126.6053,184.2342,1591.7433,79.5069,0,32.6561,27.1514,0,0,0,30.9281,0.0217 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Day-reference.csv index 7d05e0ca17..4d58a8d550 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Day-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Screwdriver Utilization (%)" -Unknown,15.919618124 +"Electrical and Communication Systems",7.996563302 +"Microelectronic Information Processing Systems",7.045400200 +Chemistry,4.462726273 +"Social and Economic Science",3.092666598 +"Design and Manufacturing Systems",1.952309791 +"Mathematical Sciences",1.898474379 +"Materials Research",1.636286721 +"Mechanical and Structural Systems",1.346850957 +"Chemical, Thermal Systems",1.241095960 +"Astronomical Sciences",1.131958710 +"Molecular Biosciences",0.975800558 +"Polar Programs",0.671322662 +Arts,0.587914825 +"Earth Sciences",0.510708912 +Physics,0.150465278 +"Environmental Biology",0.143763994 +"Atmospheric Sciences",0.136788721 +"Computer and Computation Research",0.009549400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Month-reference.csv index 7d05e0ca17..4d58a8d550 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Month-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Screwdriver Utilization (%)" -Unknown,15.919618124 +"Electrical and Communication Systems",7.996563302 +"Microelectronic Information Processing Systems",7.045400200 +Chemistry,4.462726273 +"Social and Economic Science",3.092666598 +"Design and Manufacturing Systems",1.952309791 +"Mathematical Sciences",1.898474379 +"Materials Research",1.636286721 +"Mechanical and Structural Systems",1.346850957 +"Chemical, Thermal Systems",1.241095960 +"Astronomical Sciences",1.131958710 +"Molecular Biosciences",0.975800558 +"Polar Programs",0.671322662 +Arts,0.587914825 +"Earth Sciences",0.510708912 +Physics,0.150465278 +"Environmental Biology",0.143763994 +"Atmospheric Sciences",0.136788721 +"Computer and Computation Research",0.009549400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Quarter-reference.csv index 7d05e0ca17..4d58a8d550 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Screwdriver Utilization (%)" -Unknown,15.919618124 +"Electrical and Communication Systems",7.996563302 +"Microelectronic Information Processing Systems",7.045400200 +Chemistry,4.462726273 +"Social and Economic Science",3.092666598 +"Design and Manufacturing Systems",1.952309791 +"Mathematical Sciences",1.898474379 +"Materials Research",1.636286721 +"Mechanical and Structural Systems",1.346850957 +"Chemical, Thermal Systems",1.241095960 +"Astronomical Sciences",1.131958710 +"Molecular Biosciences",0.975800558 +"Polar Programs",0.671322662 +Arts,0.587914825 +"Earth Sciences",0.510708912 +Physics,0.150465278 +"Environmental Biology",0.143763994 +"Atmospheric Sciences",0.136788721 +"Computer and Computation Research",0.009549400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Year-reference.csv index 7d05e0ca17..4d58a8d550 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/aggregate-Year-reference.csv @@ -6,5 +6,22 @@ start,end 2016-12-22,2017-01-01 --------- Department,"Screwdriver Utilization (%)" -Unknown,15.919618124 +"Electrical and Communication Systems",7.996563302 +"Microelectronic Information Processing Systems",7.045400200 +Chemistry,4.462726273 +"Social and Economic Science",3.092666598 +"Design and Manufacturing Systems",1.952309791 +"Mathematical Sciences",1.898474379 +"Materials Research",1.636286721 +"Mechanical and Structural Systems",1.346850957 +"Chemical, Thermal Systems",1.241095960 +"Astronomical Sciences",1.131958710 +"Molecular Biosciences",0.975800558 +"Polar Programs",0.671322662 +Arts,0.587914825 +"Earth Sciences",0.510708912 +Physics,0.150465278 +"Environmental Biology",0.143763994 +"Atmospheric Sciences",0.136788721 +"Computer and Computation Research",0.009549400 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Day-reference.csv index a51a353c09..a3737a691b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Day-reference.csv @@ -5,16 +5,16 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Day,"[Unknown] Screwdriver Utilization (%)" -2016-12-22,0.210550347 -2016-12-23,0.304481047 -2016-12-24,0.312500000 -2016-12-25,0.405348958 -2016-12-26,0.783449074 -2016-12-27,3.240238484 -2016-12-28,17.080981308 -2016-12-29,35.679538194 -2016-12-30,57.316514005 -2016-12-31,46.297839525 -2017-01-01,14.537466262 +Day,"[Electrical and Communication Systems] Screwdriver Utilization (%)","[Microelectronic Information Processing Systems] Screwdriver Utilization (%)","[Chemistry] Screwdriver Utilization (%)","[Social and Economic Science] Screwdriver Utilization (%)","[Design and Manufacturing Systems] Screwdriver Utilization (%)","[Mathematical Sciences] Screwdriver Utilization (%)","[Materials Research] Screwdriver Utilization (%)","[Mechanical and Structural Systems] Screwdriver Utilization (%)","[Chemical, Thermal Systems] Screwdriver Utilization (%)","[Astronomical Sciences] Screwdriver Utilization (%)","[Molecular Biosciences] Screwdriver Utilization (%)","[Polar Programs] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Earth Sciences] Screwdriver Utilization (%)","[Physics] Screwdriver Utilization (%)","[Environmental Biology] Screwdriver Utilization (%)","[Atmospheric Sciences] Screwdriver Utilization (%)","[Computer and Computation Research] Screwdriver Utilization (%)" +2016-12-22,0,0,0.211770833,0,0,0,0,0,0,0,0.209329861,0,0,0,0,0,0,0 +2016-12-23,0,0,0.300000000,0,0,0,0,0,0,0.008962095,0.300000000,0,0,0,0,0,0,0 +2016-12-24,0,0,0.300000000,0,0,0,0,0,0,0.025000000,0.300000000,0,0,0,0,0,0,0 +2016-12-25,0,0,0.485697917,0,0,0,0,0,0,0.025000000,0.300000000,0,0,0,0,0,0,0 +2016-12-26,0,0,1.800000000,0,0,0.225347222,0,0,0,0.025000000,0.300000000,0,0,0,0,0,0,0 +2016-12-27,3.895222222,0,1.194666667,0.003350694,0,1.002459057,4.477925926,0,0,0.682139660,0.692011574,0,0,0,0,0,0,0 +2016-12-28,22.845750000,1.358989873,13.688299383,0.025000000,2.044629630,1.391247106,3.431231481,0,0,1.487967593,1.834930556,0,0,0.097928241,0.188989583,0,0,0 +2016-12-29,26.769813657,14.513756655,19.198010417,0.495133030,4.064210648,5.343793981,6.202375772,1.712407407,0,2.442748650,2.247892216,0.790613426,0.268797454,0.277085503,0.900000000,0,1.081481481,0.010519097 +2016-12-30,27.962619936,25.442707176,14.681702257,13.310039988,5.701367188,4.164395833,6.573178241,9.623485822,7.712944444,3.603289159,2.151916233,0.556309172,3.630755932,1.874245081,0.566128472,0.543924769,0.419583333,0.085533275 +2016-12-31,15.896742188,23.531092303,6.601825521,18.500956944,6.495625868,6.285840133,2.165205440,3.451184606,5.939111111,4.459226563,1.704709780,0.124528067,2.411286314,6.800799479,0,0.130701389,0,0.008991030 +2017-01-01,3.962534433,12.652856192,1.770028356,1.806559086,3.169574363,2.582808449,0,0.028282697,0,1.851893519,1.397680845,9.938415943,0.156223380,0.034207176,0,0.906777778,0.003611111,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Month-reference.csv index d2e035ee8c..c0e30db76f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Month-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Month,"[Unknown] Screwdriver Utilization (%)" -2016-12,5.179946229 -2017-01,0.468950525 +Month,"[Electrical and Communication Systems] Screwdriver Utilization (%)","[Microelectronic Information Processing Systems] Screwdriver Utilization (%)","[Chemistry] Screwdriver Utilization (%)","[Social and Economic Science] Screwdriver Utilization (%)","[Design and Manufacturing Systems] Screwdriver Utilization (%)","[Mathematical Sciences] Screwdriver Utilization (%)","[Materials Research] Screwdriver Utilization (%)","[Mechanical and Structural Systems] Screwdriver Utilization (%)","[Chemical, Thermal Systems] Screwdriver Utilization (%)","[Astronomical Sciences] Screwdriver Utilization (%)","[Molecular Biosciences] Screwdriver Utilization (%)","[Polar Programs] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Earth Sciences] Screwdriver Utilization (%)","[Physics] Screwdriver Utilization (%)","[Environmental Biology] Screwdriver Utilization (%)","[Atmospheric Sciences] Screwdriver Utilization (%)","[Computer and Computation Research] Screwdriver Utilization (%)" +2016-12,2.709666513,2.091824065,1.526450343,1.039121726,0.590510753,0.590335797,0.580617869,0.477002511,0.440388889,0.361837101,0.301165332,0.024481892,0.203575474,0.180667563,0.053390905,0.021762134,0.048421446,0.003388497 +2017-01,0.127823691,0.408156651,0.057097689,0.058276100,0.102244334,0.083316402,0,0.000912345,0,0.059738501,0.045086479,0.320594063,0.005039464,0.001103457,0,0.029250896,0.000116487,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Quarter-reference.csv index ce2c11a428..34e43c0e1d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Quarter-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Quarter,"[Unknown] Screwdriver Utilization (%)" -"2016 Q4",1.745416664 -"2017 Q1",0.161527403 +Quarter,"[Electrical and Communication Systems] Screwdriver Utilization (%)","[Microelectronic Information Processing Systems] Screwdriver Utilization (%)","[Chemistry] Screwdriver Utilization (%)","[Social and Economic Science] Screwdriver Utilization (%)","[Design and Manufacturing Systems] Screwdriver Utilization (%)","[Mathematical Sciences] Screwdriver Utilization (%)","[Materials Research] Screwdriver Utilization (%)","[Mechanical and Structural Systems] Screwdriver Utilization (%)","[Chemical, Thermal Systems] Screwdriver Utilization (%)","[Astronomical Sciences] Screwdriver Utilization (%)","[Molecular Biosciences] Screwdriver Utilization (%)","[Polar Programs] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Earth Sciences] Screwdriver Utilization (%)","[Physics] Screwdriver Utilization (%)","[Environmental Biology] Screwdriver Utilization (%)","[Atmospheric Sciences] Screwdriver Utilization (%)","[Computer and Computation Research] Screwdriver Utilization (%)" +"2016 Q4",0.913039803,0.704853761,0.514347398,0.350138842,0.198976449,0.198917497,0.195642978,0.160729107,0.148391908,0.121923371,0.101479623,0.008249333,0.068596084,0.060877114,0.017990414,0.007332893,0.016315922,0.001141776 +"2017 Q1",0.044028160,0.140587291,0.019666982,0.020072879,0.035217493,0.028697872,0,0.000314252,0,0.020576595,0.015529787,0.110426844,0.001735815,0.000380080,0,0.010075309,0.000040123,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Year-reference.csv index 96b922419d..35e06a5779 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Jobs/parentscience/utilization/timeseries-Year-reference.csv @@ -5,7 +5,7 @@ parameters start,end 2016-12-22,2017-01-01 --------- -Year,"[Unknown] Screwdriver Utilization (%)" -2016,0.438738615 -2017,0.039828675 +Year,"[Electrical and Communication Systems] Screwdriver Utilization (%)","[Microelectronic Information Processing Systems] Screwdriver Utilization (%)","[Chemistry] Screwdriver Utilization (%)","[Social and Economic Science] Screwdriver Utilization (%)","[Design and Manufacturing Systems] Screwdriver Utilization (%)","[Mathematical Sciences] Screwdriver Utilization (%)","[Materials Research] Screwdriver Utilization (%)","[Mechanical and Structural Systems] Screwdriver Utilization (%)","[Chemical, Thermal Systems] Screwdriver Utilization (%)","[Astronomical Sciences] Screwdriver Utilization (%)","[Molecular Biosciences] Screwdriver Utilization (%)","[Polar Programs] Screwdriver Utilization (%)","[Arts] Screwdriver Utilization (%)","[Earth Sciences] Screwdriver Utilization (%)","[Physics] Screwdriver Utilization (%)","[Environmental Biology] Screwdriver Utilization (%)","[Atmospheric Sciences] Screwdriver Utilization (%)","[Computer and Computation Research] Screwdriver Utilization (%)" +2016,0.229507273,0.177176355,0.129289510,0.088013042,0.050015938,0.050001119,0.049178016,0.040401852,0.037300698,0.030647405,0.025508539,0.002073603,0.017242731,0.015302444,0.004522180,0.001843241,0.004101270,0.000287004 +2017,0.010856259,0.034665359,0.004849393,0.004949477,0.008683765,0.007076188,0,0.000077487,0,0.005073681,0.003829263,0.027228537,0.000428009,0.000093718,0,0.002484323,0.000009893,0 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/user_admin/input/create_users.json b/tests/artifacts/xdmod-test-artifacts/xdmod/user_admin/input/create_users.json index 30a95f2c4b..62011c06a4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/user_admin/input/create_users.json +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/user_admin/input/create_users.json @@ -7,6 +7,7 @@ "usr": [] }, "long_name": "Auk, Great", + "institution": 1, "output": "create_user-cd.one-center" } ], @@ -18,6 +19,7 @@ "usr": [] }, "long_name": "Auk, Little", + "institution": 1, "output": "create_user-cs.one-center" } ], @@ -28,6 +30,7 @@ "pi": [] }, "long_name": "Flycatcher, Taiga", + "institution": 1, "output": "create_user-pi" } ], @@ -38,6 +41,7 @@ "usr": [] }, "long_name": "Honey-buzzard", + "institution": 1, "output": "create_user-normal_user" } ], @@ -48,6 +52,7 @@ "dev": [] }, "long_name": "Albatross, Black-browed", + "institution": 1, "output": "test.only_feature_acls", "expected_success": false } @@ -59,6 +64,7 @@ "mgr": [] }, "long_name": "Albatross, Yellow-nosed", + "institution": 1, "output": "test.only_feature_acls", "expected_success": false } @@ -71,6 +77,7 @@ "dev": [] }, "long_name": "Amherst's, Lady", + "institution": 1, "output": "test.only_feature_acls", "expected_success": false } @@ -83,6 +90,7 @@ "dev": [] }, "long_name": "Honey-buzzard", + "institution": 1, "output": "create_user-usr_dev" } ], @@ -94,6 +102,7 @@ "mgr": [] }, "long_name": "Honey-buzzard", + "institution": 1, "output": "create_user-usr_mgr" } ], @@ -106,6 +115,7 @@ "dev": [] }, "long_name": "Honey-buzzard", + "institution": 1, "output": "create_user-usr_mgr_dev" } ]