Changeset 12931
- Timestamp:
- 09/02/15 13:16:18 (9 years ago)
- Location:
- branches/crossvalidation-2434
- Files:
-
- 17 deleted
- 81 edited
- 21 copied
-
. (modified) (view diffs)
-
HeuristicLab 3.3 Services.sln (modified) (view diffs)
-
HeuristicLab 3.3.sln (modified) (view diffs)
-
HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASAMainLoop.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Administrator/3.3/HiveRoles.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/Manager/TaskManager.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive.Slave/3.3/app.config (modified) (view diffs)
-
HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs (modified) (view diffs)
-
HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs (modified) (view diffs)
-
HeuristicLab.Core (modified) (view diffs)
-
HeuristicLab.Core/3.3/Collections/ItemDictionary.cs (modified) (view diffs)
-
HeuristicLab.DataPreprocessing.Views (modified) (view diffs)
-
HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs (modified) (view diffs)
-
HeuristicLab.DataPreprocessing/3.4 (modified) (view diffs)
-
HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs (modified) (view diffs)
-
HeuristicLab.DataPreprocessing/3.4/Interfaces/IStatisticsLogic.cs (modified) (view diffs)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (view diffs)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (view diffs)
-
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs) (view diffs)
-
HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs (modified) (view diffs)
-
HeuristicLab.Problems.ArtificialAnt (modified) (view diffs)
-
HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs (modified) (view diffs)
-
HeuristicLab.Problems.GeneticProgramming (copied) (copied from trunk/sources/HeuristicLab.Problems.GeneticProgramming) (view diffs)
-
HeuristicLab.Problems.GeneticProgramming.Views (copied) (copied from trunk/sources/HeuristicLab.Problems.GeneticProgramming.Views) (view diffs)
-
HeuristicLab.Problems.GrammaticalEvolution (modified) (view diffs)
-
HeuristicLab.Problems.GrammaticalEvolution/3.3/ArtificialAnt/GEArtificialAntProblem.cs (modified) (view diffs)
-
HeuristicLab.Problems.GrammaticalEvolution/3.3/Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs (modified) (view diffs)
-
HeuristicLab.Problems.GrammaticalEvolution/3.4 (copied) (copied from trunk/sources/HeuristicLab.Problems.GrammaticalEvolution/3.4) (view diffs)
-
HeuristicLab.Problems.LawnMower (modified) (view diffs)
-
HeuristicLab.Problems.LawnMower.Views/3.3/HeuristicLab.Problems.LawnMower.Views-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Problems.LawnMower/3.3/HeuristicLab.Problems.LawnMower-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Problems.LawnMower/3.3/Problem.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Convert.cs (deleted)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Daos (copied) (copied from trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Data (copied) (copied from trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Data) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Exceptions (deleted)
-
HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs (deleted)
-
HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/ITransactionManager.cs (deleted)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IGenericDao.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IGenericDao.cs) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs (deleted)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IPersistenceManager.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IPersistenceManager.cs) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Manager (copied) (copied from trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Manager) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Migrate to Filestream.sql (deleted)
-
HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql (modified) (view diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs (deleted)
-
HeuristicLab.Services.Hive.JanitorService/3.3/HeuristicLab.Services.Hive.JanitorService-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Convert.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/Converter.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Converter.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/DataTransfer/SlaveStatistics.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/DataTransfer/Statistics.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/DataTransfer/Task.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/DataTransfer/UserStatistics.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/HiveDao.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/HiveRoles.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/HiveService.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/Interfaces/IOptimizedHiveDao.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Interfaces/IStatisticsGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IStatisticsGenerator.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/PerformanceLogger.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/PerformanceLogger.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Properties/Settings.settings (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs) (view diffs)
-
HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (view diffs)
-
HeuristicLab.Services.Hive/3.3/Settings.cs (deleted)
-
HeuristicLab.Services.Hive/3.3/app.config (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Maintenance (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp.Maintenance) (view diffs)
-
HeuristicLab.Services.WebApp.Statistics (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp.Statistics) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/HeuristicLab.Services.WebApp.Status-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/Status.cs (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js (modified) (view diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/status.js (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3 (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj.user (deleted)
-
HeuristicLab.Services.WebApp/3.3/Plugin.cs (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/PluginManager.cs (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/app.css (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/app.js (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/helper.js (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/libs/angularjs/fittext (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/libs/angularjs/fittext) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login/login.cshtml (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.cshtml (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/pluginsExceptionCtrl.js (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/pluginsExceptionCtrl.js) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/shared/filter/filters.js (modified) (view diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml (modified) (view diffs)
-
Installers/HiveJanitorServiceInstaller.nsi (modified) (view diffs)
-
branches/crossvalidation-2434
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Core
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Core (added) merged: 12907
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.DataPreprocessing.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.DataPreprocessing.Views (added) merged: 12889
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.DataPreprocessing/3.4
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.DataPreprocessing/3.4 (added) merged: 12889
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 12897,12900-12901,12904,12921
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Problems.ArtificialAnt
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.ArtificialAnt (added) merged: 12895-12896,12898,12900-12901,12903,12905,12916
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Problems.GrammaticalEvolution
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.GrammaticalEvolution (added) merged: 12915-12916
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Problems.LawnMower
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.LawnMower merged: 12899-12902,12906,12916
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3
- Property svn:ignore
-
old new 1 1 Bin 2 HeuristicLab.Services.WebApp-3.3.csproj.user
-
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.
