Commit: fffc7c1358cfd8df15355d7c4b4fbc7bff229f4a - mist (git)

MIST (Media Integration Standard Toolkit)

Commit MetaInfo

• Revision: fffc7c1358cfd8df15355d7c4b4fbc7bff229f4a (tree)
• Time: 2003-09-05 21:02:36
• Author: Daisuke Deguchi <ddeguchi@nago...>
• Commiter: Daisuke Deguchi

Log Message

属性を追加

Change Summary

• add: build/Makefile
• add: build/makeinclude
• add: build/matrix_test.dsp
• add: build/matrix_test.vcproj
• add: build/mist.dsw
• add: build/mist.sln
• delete: matrix.h => mist/matrix.h
• delete: matrix_et.h => mist/matrix_et.h
• delete: mist.h => mist/mist.h
• add: test/Makefile
• add: test/matrix_test.cpp
• delete: {config => mist/config}/mist_alloc.h
• delete: {config => mist/config}/mist_conf.h
• delete: {operator => mist/operator}/operator_array.h
• delete: {operator => mist/operator}/operator_array1.h
• delete: {operator => mist/operator}/operator_array2.h
• delete: {operator => mist/operator}/operator_array3.h
• delete: {operator => mist/operator}/operator_matrix.h

Incremental Difference

--- /dev/null
+++ b/build/Makefile
@@ -0,0 +1,16 @@
+include ./makeinclude
+
+
+DIRS = ../test
+
+all: makeinclude
+	for dir in $(DIRS); do\
+		echo "=== making $$dir ===";\
+		( cd $$dir; $(MAKE) $(MFLAGS) ) || break;\
+	done
+
+clean:
+	for dir in $(DIRS); do\
+		echo "=== cleaning $$dir ===";\
+		( cd $$dir; $(MAKE) $(MFLAGS) clean ) || break;\
+	done
\ No newline at end of file

--- /dev/null
+++ b/build/makeinclude
@@ -0,0 +1,29 @@
+CC  = gcc
+CXX = g++
+
+INCLUDE = -I../ -I/usr/local/include -I/usr/X11R6/include
+LDLIBS = -L../lib -L/usr/local/lib -L/usr/X11R6/lib
+
+CFLGS = -Wall -O2
+CXXFLGS = -Wall -O2
+IMGLIBS = -ljpeg -lpng -ltiff
+LIBS = -lpthread -lz -lXext -lX11 -lm -lGL
+
+
+# Be quiet when building...
+.SILENT:
+
+# Build commands and filename extensions...
+.SUFFIXES:	.c .cpp .cxx .h .o
+
+.c.o:
+	echo Compiling $<...
+	$(CC) -I.. $(CFLAGS) -c $<
+
+.cxx.o:
+	echo Compiling $<...
+	$(CXX) $(CFLAGS) -c $< $(INCLUDE)
+
+.cpp.o:
+	echo Compiling $<...
+	$(CXX) $(CFLAGS) -c $< $(INCLUDE)
\ No newline at end of file

--- /dev/null
+++ b/build/matrix_test.dsp
@@ -0,0 +1,112 @@
+# Microsoft Developer Studio Project File - Name="matrix_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** 編集しないでください **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=matrix_test - Win32 Debug
+!MESSAGE これは有効なﾒｲｸﾌｧｲﾙではありません。 このﾌﾟﾛｼﾞｪｸﾄをﾋﾞﾙﾄﾞするためには NMAKE を使用してください。
+!MESSAGE [ﾒｲｸﾌｧｲﾙのｴｸｽﾎﾟｰﾄ] ｺﾏﾝﾄﾞを使用して実行してください
+!MESSAGE 
+!MESSAGE NMAKE /f "matrix_test.mak".
+!MESSAGE 
+!MESSAGE NMAKE の実行時に構成を指定できます
+!MESSAGE ｺﾏﾝﾄﾞ ﾗｲﾝ上でﾏｸﾛの設定を定義します。例:
+!MESSAGE 
+!MESSAGE NMAKE /f "matrix_test.mak" CFG="matrix_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE 選択可能なﾋﾞﾙﾄﾞ ﾓｰﾄﾞ:
+!MESSAGE 
+!MESSAGE "matrix_test - Win32 Release" ("Win32 (x86) Console Application" 用)
+!MESSAGE "matrix_test - Win32 Debug" ("Win32 (x86) Console Application" 用)
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "matrix_test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x411 /d "NDEBUG"
+# ADD RSC /l 0x411 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "matrix_test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "matrix_test___Win32_Debug"
+# PROP BASE Intermediate_Dir "matrix_test___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "matrix_test___Win32_Debug"
+# PROP Intermediate_Dir "matrix_test___Win32_Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x411 /d "_DEBUG"
+# ADD RSC /l 0x411 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "matrix_test - Win32 Release"
+# Name "matrix_test - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=\mist\test\matrix_test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=\mist\mist\matrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=\mist\mist\matrix_et.h
+# End Source File
+# Begin Source File
+
+SOURCE=\mist\mist\mist.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

--- /dev/null
+++ b/build/matrix_test.vcproj
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="matrix_test"
+	ProjectGUID="{5B87E451-7196-400B-9898-D276C6418B72}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/matrix_test.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/matrix_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/matrix_test.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="ソース ファイル"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\test\matrix_test.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="ヘッダー ファイル"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\mist\matrix.h">
+			</File>
+			<File
+				RelativePath="..\mist\matrix_et.h">
+			</File>
+			<File
+				RelativePath="..\mist\mist.h">
+			</File>
+			<File
+				RelativePath="..\mist\config\mist_alloc.h">
+			</File>
+			<File
+				RelativePath="..\mist\config\mist_conf.h">
+			</File>
+			<File
+				RelativePath="..\mist\operator\operator_array.h">
+			</File>
+			<File
+				RelativePath="..\mist\operator\operator_array1.h">
+			</File>
+			<File
+				RelativePath="..\mist\operator\operator_array2.h">
+			</File>
+			<File
+				RelativePath="..\mist\operator\operator_array3.h">
+			</File>
+			<File
+				RelativePath="..\mist\operator\operator_matrix.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="リソース ファイル"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

--- /dev/null
+++ b/build/mist.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# 警告: このﾜｰｸｽﾍﾟｰｽ ﾌｧｲﾙ を編集または削除しないでください!
+
+###############################################################################
+
+Project: "matrix_test"=.\matrix_test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

--- /dev/null
+++ b/build/mist.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matrix_test", "matrix_test.vcproj", "{5B87E451-7196-400B-9898-D276C6418B72}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{5B87E451-7196-400B-9898-D276C6418B72}.Debug.ActiveCfg = Debug|Win32
+		{5B87E451-7196-400B-9898-D276C6418B72}.Debug.Build.0 = Debug|Win32
+		{5B87E451-7196-400B-9898-D276C6418B72}.Release.ActiveCfg = Release|Win32
+		{5B87E451-7196-400B-9898-D276C6418B72}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,19 @@
+include ../build/makeinclude
+
+
+ALL = \
+	matrix_test \
+
+
+all: $(ALL)
+	 
+matrix_test : matrix_test.o
+	$(CXX) $(CXXFLAGS) -o $@ matrix_test.o $(LIBS) $(LDLIBS)
+
+clean:
+	for binary in $(ALL); do\
+		echo "=== deleting $$binary ===";\
+		( cd ./; rm -f $$binary ) || break;\
+	done
+	rm -f ./*.o
+	rm -f ./*~

--- /dev/null
+++ b/test/matrix_test.cpp
@@ -0,0 +1,159 @@
+#include <iostream>
+
+#include <mist/mist.h>
+#include <mist/matrix.h>
+#include <mist/matrix_et.h>
+
+#ifndef WIN32
+#include <ctime>
+#else
+#include <windows.h>
+#include <mmsystem.h>
+#pragma comment ( lib, "winmm.lib" )
+#endif
+
+class timer
+{
+public:
+	timer( )
+	{
+#ifndef WIN32
+		_start_time = std::clock( );
+#else
+		_start_time = timeGetTime( );
+#endif
+	} // postcondition: elapsed()==0
+
+	void restart( )
+	{
+#ifndef WIN32
+		_start_time = std::clock( );
+#else
+		_start_time = timeGetTime( );
+#endif
+	} // post: elapsed()==0
+
+	double elapsed( ) const                  // return elapsed time in seconds
+	{
+#ifndef WIN32
+		return( double(std::clock( ) - _start_time) / CLOCKS_PER_SEC );
+#else
+		return( double(timeGetTime( ) - _start_time) / 1000.0 );
+#endif
+	}
+
+private:
+#ifndef WIN32
+	std::clock_t _start_time;
+#else
+	DWORD _start_time;
+#endif
+}; // timer
+
+
+/*
+int main( )
+{
+	using namespace std;
+
+	cout << "transpose( mat1 + mat2 * mat3 + mat4 )" << endl << endl;
+
+	mist::matrix< double > mat1( 100, 100 );
+	mist::matrix< double > mat2( 100, 100 );
+	mist::matrix< double > mat3( 100, 100 );
+	mist::matrix< double > mat4( 100, 100 );
+	mist::matrix< double > mat( 100, 100 );
+	mist::matrix< double > dmy;
+
+	// transpose( mat1 + mat2 * mat3 + mat4 )
+	long i, j, k, l, loop = 1000;
+	{
+		timer t;
+		double tmp;
+		for( l = 0 ; l < loop ; l++ )
+		{
+			for( i = 0 ; i < mat.cols( ) ; i++ )
+			{
+				for( j = 0 ; j < mat.rows( ) ; j++ )
+				{
+					tmp = 0.0;
+					for( k = 0 ; k < mat3.rows( ) ; k++ )
+					{
+						tmp += mat2( i, k ) * mat3( k, j );
+					}
+					mat( j, i ) = mat1( i, j ) + tmp + mat4( i, j );
+				}
+			}
+			dmy = mat;
+		}
+		cout << "< In the case of Non Expression Template >" << endl;
+		cout << "Calculation Time: " << t.elapsed( ) << " (sec)" << endl;
+	}
+
+	{
+		timer t;
+		for( i = 0 ; i < loop ; i++ )
+		{
+			mat = ( mat1 + mat2 * mat3 + mat4 ).t( );
+		}
+		cout << "< In the case of Expression Template >" << endl;
+		cout << "Calculation Time: " << t.elapsed( ) << " (sec)" << endl;
+	}
+
+	return( 0 );
+}
+
+
+/*/
+
+int main( )
+{
+	using namespace std;
+
+	cout << "transpose( mat1 + mat2 * mat3 + mat4 )" << endl << endl;
+
+	mist::matrix< double > mat1( 3, 3 );
+	mist::matrix< double > mat2( 3, 3 );
+	mist::matrix< double > mat3( 3, 3 );
+	mist::matrix< double > mat4( 3, 3 );
+	mist::matrix< double > mat( 3, 3, 1.0 );
+
+	mat1( 0, 0 ) = 1;
+	mat1( 0, 1 ) = 2;
+	mat1( 0, 2 ) = 3;
+	mat1( 1, 0 ) = 4;
+	mat1( 1, 1 ) = 5;
+	mat1( 1, 2 ) = 6;
+	mat1( 2, 0 ) = 7;
+	mat1( 2, 1 ) = 8;
+	mat1( 2, 2 ) = 9;
+
+	mat2 = mat3 = mat4 = mat1;
+	long i, j, k;
+	double tmp;
+
+	for( i = 0 ; i < mat.rows( ) ; i++ )
+	{
+		for( j = 0 ; j < mat.cols( ) ; j++ )
+		{
+			tmp = 0.0;
+			for( k = 0 ; k < mat3.rows( ) ; k++ )
+			{
+				tmp += mat2( i, k ) * mat3( k, j );
+			}
+			mat( j, i ) = mat1( i, j ) + tmp + mat4( i, j );
+		}
+	}
+
+	cout << "< In the case of Non Expression Template >" << endl;
+	cout << mat << endl << endl;
+
+
+	cout << "< In the case of Expression Template >" << endl;
+	mat = ( mat1 + mat2 * mat3 + mat4 ).t( );
+	cout << mat << endl << endl << endl;
+
+	return( 0 );
+}
+
+//*/