Permalink
Browse files

Fixed Isomap data model and bugs.

  • Loading branch information...
1 parent cc2cf09 commit af2aec63635a266d54805f542066fe18850597c7 @lvdmaaten lvdmaaten committed Nov 2, 2011
Showing with 247 additions and 54 deletions.
  1. BIN DerivedData/Divvy/Index/Divvy.hmap
  2. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb
  3. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb-shm
  4. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb-wal
  5. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-dir
  6. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-file
  7. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-res
  8. BIN DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-sym
  9. BIN ...Divvy/Index/PrecompiledHeaders/Divvy_Prefix-anaslepmqyypkphflzubsreeydwf_ast/Divvy_Prefix.pch.pth
  10. +31 −0 ...ecompiledHeaders/Divvy_Prefix-anaslepmqyypkphflzubsreeydwf_ast/Divvy_Prefix.pch.pth.hash-criteria
  11. BIN ...Divvy/Index/PrecompiledHeaders/Divvy_Prefix-eavnzjdcuchwxzfljdggbeowvcvb_ast/Divvy_Prefix.pch.pth
  12. +28 −0 ...ecompiledHeaders/Divvy_Prefix-eavnzjdcuchwxzfljdggbeowvcvb_ast/Divvy_Prefix.pch.pth.hash-criteria
  13. BIN ...Divvy/Index/PrecompiledHeaders/Divvy_Prefix-ebbdtrmhldwfjweaxzgwsitrkibz_ast/Divvy_Prefix.pch.pth
  14. +32 −0 ...ecompiledHeaders/Divvy_Prefix-ebbdtrmhldwfjweaxzgwsitrkibz_ast/Divvy_Prefix.pch.pth.hash-criteria
  15. BIN ...Divvy/Index/PrecompiledHeaders/Divvy_Prefix-fojrdnrezwyrfvawnypjgdajojwj_ast/Divvy_Prefix.pch.pth
  16. +31 −0 ...ecompiledHeaders/Divvy_Prefix-fojrdnrezwyrfvawnypjgdajojwj_ast/Divvy_Prefix.pch.pth.hash-criteria
  17. BIN ...Divvy/Index/PrecompiledHeaders/Divvy_Prefix-gldozzdovqplcodjzwmqncsfrxuw_ast/Divvy_Prefix.pch.pth
  18. +28 −0 ...ecompiledHeaders/Divvy_Prefix-gldozzdovqplcodjzwmqncsfrxuw_ast/Divvy_Prefix.pch.pth.hash-criteria
  19. BIN DerivedData/Divvy/Logs/Debug/148A0636-875F-41FC-B21B-5D7C1A6CBB21.xcactivitylog
  20. BIN DerivedData/Divvy/Logs/Debug/47000699-11BD-482E-8CEF-7E12FC0C1BE5.xcactivitylog
  21. BIN DerivedData/Divvy/Logs/Debug/69C402CB-0908-4D61-9CAC-582EBA2E2CD2.xcactivitylog
  22. BIN DerivedData/Divvy/Logs/Debug/Cache.db
  23. BIN DerivedData/Divvy/Logs/Debug/E6D309B4-E05C-4A28-B4FB-CD9B218B9CF4.xcactivitylog
  24. BIN DerivedData/Divvy/Logs/Debug/ECD4CC1F-3C8A-48F8-BA1F-62E699AB973A.xcactivitylog
  25. BIN DerivedData/Divvy/Logs/Debug/F282827B-51D6-419F-BC31-EA9848624A87.xcactivitylog
  26. BIN DerivedData/Divvy/Logs/Issues/05D419E2-3E21-4CA2-A62C-08E031E81290.xcactivitylog
  27. BIN DerivedData/Divvy/Logs/Issues/149B999D-2826-4AD0-AA10-5A8BD3926240.xcactivitylog
  28. BIN DerivedData/Divvy/Logs/Issues/1FBBE5AB-6CC0-4FC6-8663-C0985ECF3FD7.xcactivitylog
  29. BIN DerivedData/Divvy/Logs/Issues/2BC3D912-7669-4CEA-8B13-54BDB2917917.xcactivitylog
  30. BIN DerivedData/Divvy/Logs/Issues/3836382B-7424-4982-98CA-F5EF53F69048.xcactivitylog
  31. BIN DerivedData/Divvy/Logs/Issues/383856AA-5C78-4D4C-9B97-71F60B126B6D.xcactivitylog
  32. BIN DerivedData/Divvy/Logs/Issues/477DBB4C-05EC-414C-BD5E-4EA9F2C8D7AA.xcactivitylog
  33. BIN DerivedData/Divvy/Logs/Issues/A224A09B-85B0-4174-96F5-5281EFA5FE2E.xcactivitylog
  34. BIN DerivedData/Divvy/Logs/Issues/B401E26D-6052-47BA-A4DE-F172F31ECE7C.xcactivitylog
  35. BIN DerivedData/Divvy/Logs/Issues/C8EE8BD2-5546-4A54-81C1-D6E97865E124.xcactivitylog
  36. BIN DerivedData/Divvy/Logs/Issues/Cache.db
  37. BIN DerivedData/Divvy/Logs/Issues/E9DAB43E-1952-470C-9101-9D514A311E74.xcactivitylog
  38. BIN DerivedData/Divvy/Logs/Issues/FBEA8094-FFEB-4527-B3BD-56D26752A542.xcactivitylog
  39. +4 −1 Plugins/Reducers/Isomap/DivvyIsomap.xcdatamodel/.xccurrentversion → DerivedData/Divvy/info.plist
  40. +30 −2 Divvy.xcodeproj/project.pbxproj
  41. +5 −3 Plugins/Reducers/Isomap/DivvyIsomap.h
  42. +6 −0 Plugins/Reducers/Isomap/DivvyIsomap.mm
  43. +13 −2 Plugins/Reducers/Isomap/DivvyIsomap.xcdatamodeld/DivvyIsomap.xcdatamodel/contents
  44. +39 −46 Plugins/Reducers/Isomap/DivvyIsomap.xib
  45. BIN Plugins/Reducers/TSNE/DivvyTSNE.xcdatamodel/elements
  46. BIN Plugins/Reducers/TSNE/DivvyTSNE.xcdatamodel/layout
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,31 @@
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
+x86_64-apple-darwin11.2.0
+-x
+objective-c++
+-arch
+x86_64
+-fmessage-length=0
+-fdiagnostics-print-source-range-info
+-fdiagnostics-show-category=id
+-fdiagnostics-parseable-fixits
+-fpascal-strings
+-O0
+-isysroot
+/Developer/SDKs/MacOSX10.7.sdk
+-fasm-blocks
+-mmacosx-version-min=10.6
+-gdwarf-2
+-fvisibility-inlines-hidden
+-DIBOutlet=__attribute__((iboutlet))
+-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))
+-DIBAction=void)__attribute__((ibaction)
+-iquote
+-iquote
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
+-ferror-limit=10
+-working-directory=/Users/laurens/divvy
+-Xclang
+-detailed-preprocessing-record
+SDK_PRODUCT_BUILD_VERSION=11C63
@@ -0,0 +1,28 @@
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
+x86_64-apple-darwin11.2.0
+-x
+c++
+-arch
+x86_64
+-fmessage-length=0
+-fdiagnostics-print-source-range-info
+-fdiagnostics-show-category=id
+-fdiagnostics-parseable-fixits
+-fpascal-strings
+-O0
+-isysroot
+/Developer/SDKs/MacOSX10.7.sdk
+-fasm-blocks
+-mmacosx-version-min=10.6
+-gdwarf-2
+-fvisibility-inlines-hidden
+-iquote
+-iquote
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
+-ferror-limit=10
+-working-directory=/Users/laurens/divvy
+-Xclang
+-detailed-preprocessing-record
+SDK_PRODUCT_BUILD_VERSION=11C63
@@ -0,0 +1,32 @@
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
+x86_64-apple-darwin11.2.0
+-x
+objective-c
+-arch
+x86_64
+-fmessage-length=0
+-fdiagnostics-print-source-range-info
+-fdiagnostics-show-category=id
+-fdiagnostics-parseable-fixits
+-std=gnu99
+-fpascal-strings
+-O0
+-isysroot
+/Developer/SDKs/MacOSX10.7.sdk
+-fasm-blocks
+-mmacosx-version-min=10.6
+-gdwarf-2
+-fvisibility=hidden
+-DIBOutlet=__attribute__((iboutlet))
+-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))
+-DIBAction=void)__attribute__((ibaction)
+-iquote
+-iquote
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
+-ferror-limit=10
+-working-directory=/Users/laurens/divvy
+-Xclang
+-detailed-preprocessing-record
+SDK_PRODUCT_BUILD_VERSION=11C63
@@ -0,0 +1,31 @@
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
+x86_64-apple-darwin11.2.0
+-x
+objective-c
+-arch
+x86_64
+-fmessage-length=0
+-fdiagnostics-print-source-range-info
+-fdiagnostics-show-category=id
+-fdiagnostics-parseable-fixits
+-std=gnu99
+-fpascal-strings
+-O0
+-isysroot
+/Developer/SDKs/MacOSX10.7.sdk
+-fasm-blocks
+-mmacosx-version-min=10.6
+-gdwarf-2
+-DIBOutlet=__attribute__((iboutlet))
+-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))
+-DIBAction=void)__attribute__((ibaction)
+-iquote
+-iquote
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
+-ferror-limit=10
+-working-directory=/Users/laurens/divvy
+-Xclang
+-detailed-preprocessing-record
+SDK_PRODUCT_BUILD_VERSION=11C63
@@ -0,0 +1,28 @@
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
+x86_64-apple-darwin11.2.0
+-x
+c
+-arch
+x86_64
+-fmessage-length=0
+-fdiagnostics-print-source-range-info
+-fdiagnostics-show-category=id
+-fdiagnostics-parseable-fixits
+-std=gnu99
+-fpascal-strings
+-O0
+-isysroot
+/Developer/SDKs/MacOSX10.7.sdk
+-fasm-blocks
+-mmacosx-version-min=10.6
+-gdwarf-2
+-iquote
+-iquote
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
+-ferror-limit=10
+-working-directory=/Users/laurens/divvy
+-Xclang
+-detailed-preprocessing-record
+SDK_PRODUCT_BUILD_VERSION=11C63
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
-<dict/>
+<dict>
+ <key>WorkspacePath</key>
+ <string>/Users/laurens/divvy/Divvy.xcodeproj</string>
+</dict>
</plist>
@@ -26,6 +26,7 @@
0D86ADEE1428990F00877901 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D77DF783118636A2009C1946 /* Accelerate.framework */; };
0D86ADEF1428990F00877901 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D730D27713B5297E00E01F31 /* Cocoa.framework */; };
0D86AE011428BC5A00877901 /* DivvyIsomap.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0D86AE001428BC5A00877901 /* DivvyIsomap.xib */; };
+ 0D8F0C111461ABBD007E3376 /* DivvyIsomap.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0D8F0C0F1461ABBD007E3376 /* DivvyIsomap.xcdatamodeld */; };
0D9C419E13FD00D700E59675 /* tsne.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C419D13FD00D700E59675 /* tsne.c */; };
0D9C41A113FD00E900E59675 /* DivvyTSNE.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C41A013FD00E900E59675 /* DivvyTSNE.m */; };
0D9C41A413FD00F800E59675 /* DivvyTSNEController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C41A313FD00F800E59675 /* DivvyTSNEController.m */; };
@@ -121,6 +122,13 @@
remoteGlobalIDString = 0D55DC5C13FA9FCA000ADAFB;
remoteInfo = DivvyPCA;
};
+ 0DC7D5741461AB52001D57BF /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 0D86ADE51428990F00877901;
+ remoteInfo = DivvyIsomap;
+ };
D704B6A913E088B1002692E9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -227,10 +235,10 @@
0D86ADFA14289A7400877901 /* isomap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isomap.h; sourceTree = "<group>"; };
0D86ADFB1428A47C00877901 /* dijkstra.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dijkstra.cpp; sourceTree = "<group>"; };
0D86ADFD1428A4DD00877901 /* fibheap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fibheap.h; sourceTree = "<group>"; };
- 0D86ADFE1428BC1F00877901 /* DivvyIsomap.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = DivvyIsomap.xcdatamodel; sourceTree = "<group>"; };
0D86AE001428BC5A00877901 /* DivvyIsomap.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DivvyIsomap.xib; sourceTree = "<group>"; };
0D86AE021428BEF600877901 /* DivvyIsomapController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DivvyIsomapController.h; sourceTree = "<group>"; };
0D86AE031428BEF600877901 /* DivvyIsomapController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DivvyIsomapController.m; sourceTree = "<group>"; };
+ 0D8F0C101461ABBD007E3376 /* DivvyIsomap.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = DivvyIsomap.xcdatamodel; sourceTree = "<group>"; };
0D9C419113FD007100E59675 /* DivvyTSNE.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DivvyTSNE.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
0D9C419213FD007100E59675 /* DivvyTSNE-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "DivvyTSNE-Info.plist"; sourceTree = "<group>"; };
0D9C419C13FD00D700E59675 /* tsne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tsne.h; sourceTree = "<group>"; };
@@ -516,11 +524,11 @@
0D86AE021428BEF600877901 /* DivvyIsomapController.h */,
0D86AE031428BEF600877901 /* DivvyIsomapController.m */,
0D86ADF814289A4F00877901 /* isomap.cpp */,
+ 0D8F0C0F1461ABBD007E3376 /* DivvyIsomap.xcdatamodeld */,
0D86ADFA14289A7400877901 /* isomap.h */,
D792E57B14292A4F0084626A /* DivvyIsomap.plist */,
0D86ADFB1428A47C00877901 /* dijkstra.cpp */,
0D86ADFD1428A4DD00877901 /* fibheap.h */,
- 0D86ADFE1428BC1F00877901 /* DivvyIsomap.xcdatamodel */,
0D86AE001428BC5A00877901 /* DivvyIsomap.xib */,
);
path = Isomap;
@@ -924,6 +932,7 @@
D7A24DA813F3225C001AD337 /* PBXTargetDependency */,
D7A24DAA13F3225C001AD337 /* PBXTargetDependency */,
0D55DCAD13FAA0D2000ADAFB /* PBXTargetDependency */,
+ 0DC7D5751461AB52001D57BF /* PBXTargetDependency */,
D751AC9D13FD7E780089FAAE /* PBXTargetDependency */,
D7A250F81402F7E2001AD337 /* PBXTargetDependency */,
D792E59A14292C1E0084626A /* PBXTargetDependency */,
@@ -1238,6 +1247,7 @@
0D2312AB143B5E82009DD6DD /* isomap.h in Sources */,
0D2312AD143B5E82009DD6DD /* dijkstra.cpp in Sources */,
0D2312AE143B5E82009DD6DD /* fibheap.h in Sources */,
+ 0D8F0C111461ABBD007E3376 /* DivvyIsomap.xcdatamodeld in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1362,6 +1372,11 @@
target = 0D55DC5C13FA9FCA000ADAFB /* DivvyPCA */;
targetProxy = 0D55DCAC13FAA0D2000ADAFB /* PBXContainerItemProxy */;
};
+ 0DC7D5751461AB52001D57BF /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 0D86ADE51428990F00877901 /* DivvyIsomap */;
+ targetProxy = 0DC7D5741461AB52001D57BF /* PBXContainerItemProxy */;
+ };
D704B6AA13E088B1002692E9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D704B6A013E08871002692E9 /* DivvyScatterPlot */;
@@ -2142,6 +2157,19 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
+
+/* Begin XCVersionGroup section */
+ 0D8F0C0F1461ABBD007E3376 /* DivvyIsomap.xcdatamodeld */ = {
+ isa = XCVersionGroup;
+ children = (
+ 0D8F0C101461ABBD007E3376 /* DivvyIsomap.xcdatamodel */,
+ );
+ currentVersion = 0D8F0C101461ABBD007E3376 /* DivvyIsomap.xcdatamodel */;
+ path = DivvyIsomap.xcdatamodeld;
+ sourceTree = "<group>";
+ versionGroupType = wrapper.xcdatamodel;
+ };
+/* End XCVersionGroup section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
}
@@ -6,15 +6,17 @@
// Copyright 2011 Delft University of Technology. All rights reserved.
//
-#import <CoreData/CoreData.h>
+#import <Cocoa/Cocoa.h>
#import "DivvyReducer.h"
-@interface DivvyIsomap : NSManagedObject
+
+@interface DivvyIsomap : NSManagedObject <DivvyReducer>
@property (nonatomic, retain) NSString *reducerID;
@property (nonatomic, retain) NSString *name;
-@property (nonatomic, retain) NSNumber *k;
+@property (nonatomic, retain) NSNumber *d;
+@property (nonatomic, retain) NSNumber *k;
@end
@@ -18,6 +18,8 @@ @implementation DivvyIsomap
@dynamic reducerID;
@dynamic name;
+@dynamic d;
+
@dynamic k;
@@ -28,6 +30,10 @@ - (void) awakeFromInsert {
self.reducerID = [[NSProcessInfo processInfo] globallyUniqueString];
}
+- (void) calculateD:(DivvyDataset *)dataset {
+ // Isomap always stays with its default of 2
+}
+
- (void) reduceDataset:(DivvyDataset *)dataset
reducedData:(NSData *)reducedData {
@@ -1,4 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model name="DivvyIsomap" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="872" systemVersion="11C74" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
- <elements/>
+<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="872" systemVersion="11C74" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+ <entity name="Isomap" representedClassName="DivvyIsomap" syncable="YES">
+ <attribute name="d" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+ <attribute name="k" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+ <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+ <attribute name="reducerID" optional="YES" attributeType="String" syncable="YES"/>
+ </entity>
+ <configuration name="DivvyIsomap">
+ <memberEntity name="Isomap"/>
+ </configuration>
+ <elements>
+ <element name="Isomap" positionX="160" positionY="192" width="128" height="105"/>
+ </elements>
</model>
Oops, something went wrong.

0 comments on commit af2aec6

Please sign in to comment.